diff options
| author | Fedor Indutny <fedor@indutny.com> | 2015-01-11 16:08:14 +0300 |
|---|---|---|
| committer | Fedor Indutny <fedor@indutny.com> | 2015-01-12 21:31:08 +0300 |
| commit | eebdf7ac85b36223833330ff7f1057591dcbe651 (patch) | |
| tree | 04791df2d3c585dc456b9ff853c62e42c57c3372 /deps/openssl/openssl/crypto/ec/ec_pmeth.c | |
| parent | c8676cb3613259c0cfcf88049be652987dccc769 (diff) | |
| download | android-node-v8-eebdf7ac85b36223833330ff7f1057591dcbe651.tar.gz android-node-v8-eebdf7ac85b36223833330ff7f1057591dcbe651.tar.bz2 android-node-v8-eebdf7ac85b36223833330ff7f1057591dcbe651.zip | |
deps: update openssl to 1.0.1k
PR-URL: https://github.com/iojs/io.js/pull/289
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/openssl/openssl/crypto/ec/ec_pmeth.c')
| -rw-r--r-- | deps/openssl/openssl/crypto/ec/ec_pmeth.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/deps/openssl/openssl/crypto/ec/ec_pmeth.c b/deps/openssl/openssl/crypto/ec/ec_pmeth.c index 66ee397d86..b62b532cf8 100644 --- a/deps/openssl/openssl/crypto/ec/ec_pmeth.c +++ b/deps/openssl/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 |