diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-03-10 19:09:27 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@akamai.com> | 2015-03-11 09:29:37 -0400 |
| commit | 10bf4fc2c3da332a54247da1f3c0dcb44944f7ff (patch) | |
| tree | c2f597e901f98829266ec4045492195cefdd958c /crypto/ec | |
| parent | ac5a110621ca48f0bebd5b4d76d081de403da29e (diff) | |
Merge OPENSSL_NO_EC{DH,DSA} into OPENSSL_NO_EC
Suggested by John Foley <foleyj@cisco.com>.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/ec')
| -rw-r--r-- | crypto/ec/ec_pmeth.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crypto/ec/ec_pmeth.c b/crypto/ec/ec_pmeth.c index 0437dcff60..d789e7e916 100644 --- a/crypto/ec/ec_pmeth.c +++ b/crypto/ec/ec_pmeth.c @@ -203,7 +203,7 @@ static int pkey_ec_verify(EVP_PKEY_CTX *ctx, return ret; } -#ifndef OPENSSL_NO_ECDH +#ifndef OPENSSL_NO_EC static int pkey_ec_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen) { @@ -302,7 +302,7 @@ static int pkey_ec_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) EC_GROUP_set_asn1_flag(dctx->gen_group, p1); return 1; -#ifndef OPENSSL_NO_ECDH +#ifndef OPENSSL_NO_EC case EVP_PKEY_CTRL_EC_ECDH_COFACTOR: if (p1 == -2) { if (dctx->cofactor_mode != -1) @@ -519,12 +519,11 @@ const EVP_PKEY_METHOD ec_pkey_meth = { 0, 0, 0, -#ifndef OPENSSL_NO_ECDH +#ifndef OPENSSL_NO_EC pkey_ec_kdf_derive, #else 0, #endif - pkey_ec_ctrl, pkey_ec_ctrl_str }; |