diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-07-26 17:23:41 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-08-09 17:34:52 +1000 |
| commit | 831564543a706fbeff580789d02a3e2e85ae7f2a (patch) | |
| tree | 13f9f5b6b26f019935a803bbe55510fa8886cf7d /providers/implementations/exchange | |
| parent | 57e8420609b54cc9723dec2c8e770feb157ebbdc (diff) | |
| download | openssl-831564543a706fbeff580789d02a3e2e85ae7f2a.zip openssl-831564543a706fbeff580789d02a3e2e85ae7f2a.tar.gz openssl-831564543a706fbeff580789d02a3e2e85ae7f2a.tar.bz2 | |
Add libctx to ecdh_KDF_X9_63.
Code is now correctly included in the fips provider.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11884)
Diffstat (limited to 'providers/implementations/exchange')
| -rw-r--r-- | providers/implementations/exchange/ecdh_exch.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/providers/implementations/exchange/ecdh_exch.c b/providers/implementations/exchange/ecdh_exch.c index 08fb0cf..a93f67b 100644 --- a/providers/implementations/exchange/ecdh_exch.c +++ b/providers/implementations/exchange/ecdh_exch.c @@ -458,7 +458,6 @@ int ecdh_plain_derive(void *vpecdhctx, unsigned char *secret, return ret; } -#ifndef FIPS_MODULE static ossl_inline int ecdh_X9_63_kdf_derive(void *vpecdhctx, unsigned char *secret, size_t *psecretlen, size_t outlen) @@ -499,7 +498,6 @@ int ecdh_X9_63_kdf_derive(void *vpecdhctx, unsigned char *secret, OPENSSL_secure_clear_free(stmp, stmplen); return ret; } -#endif /* FIPS_MODULE */ static int ecdh_derive(void *vpecdhctx, unsigned char *secret, @@ -510,15 +508,11 @@ int ecdh_derive(void *vpecdhctx, unsigned char *secret, switch (pecdhctx->kdf_type) { case PROV_ECDH_KDF_NONE: return ecdh_plain_derive(vpecdhctx, secret, psecretlen, outlen); -#ifndef FIPS_MODULE case PROV_ECDH_KDF_X9_63: return ecdh_X9_63_kdf_derive(vpecdhctx, secret, psecretlen, outlen); - -#endif /* FIPS_MODULE */ default: break; } - return 0; } |