diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2015-01-10 12:26:41 -0500 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-02-28 07:16:26 -0500 |
| commit | 29d3851ef58419274f5f80a050d22b14319eff74 (patch) | |
| tree | c70cbddb9c2100abb5e0e5fdd5acaf180b89b946 /openssl/crypto/ec/ec_pmeth.c | |
| parent | a1babdda61e8cb3f8d0608d87120ba46ca91a21d (diff) | |
| download | vcxsrv-29d3851ef58419274f5f80a050d22b14319eff74.tar.gz vcxsrv-29d3851ef58419274f5f80a050d22b14319eff74.tar.bz2 vcxsrv-29d3851ef58419274f5f80a050d22b14319eff74.zip | |
Update openssl to version openssl-1.0.1k
Diffstat (limited to 'openssl/crypto/ec/ec_pmeth.c')
| -rw-r--r-- | openssl/crypto/ec/ec_pmeth.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/openssl/crypto/ec/ec_pmeth.c b/openssl/crypto/ec/ec_pmeth.c index 66ee397d8..b62b532cf 100644 --- a/openssl/crypto/ec/ec_pmeth.c +++ b/openssl/crypto/ec/ec_pmeth.c @@ -167,6 +167,7 @@ static int pkey_ec_verify(EVP_PKEY_CTX *ctx, return ret; } +#ifndef OPENSSL_NO_ECDH static int pkey_ec_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen) { int ret; @@ -200,6 +201,7 @@ static int pkey_ec_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen) *keylen = ret; return 1; } +#endif static int pkey_ec_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) { @@ -333,7 +335,11 @@ const EVP_PKEY_METHOD ec_pkey_meth = 0,0, 0, +#ifndef OPENSSL_NO_ECDH pkey_ec_derive, +#else + 0, +#endif pkey_ec_ctrl, pkey_ec_ctrl_str |