diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-02-22 17:28:17 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-02-24 10:44:15 +0100 |
| commit | 76e48c9d6667391189e22d674b2b3b8161ab9442 (patch) | |
| tree | b5c769287c5aba4a7013deb544d067555d317d1d /crypto | |
| parent | 10315851d0230646947213ac148747bc64c56798 (diff) | |
Deprecated EVP_PKEY_CTX_get0_dh_kdf_ukm() and EVP_PKEY_CTX_get0_ecdh_kdf_ukm()
The functions are not needed and require returning octet ptr parameters
from providers that would like to support them which complicates provider
implementations.
Fixes #12985
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14279)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/evp/dh_ctrl.c | 4 | ||||
| -rw-r--r-- | crypto/evp/ec_ctrl.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/crypto/evp/dh_ctrl.c b/crypto/evp/dh_ctrl.c index abb724f72b..7eb0a8ee48 100644 --- a/crypto/evp/dh_ctrl.c +++ b/crypto/evp/dh_ctrl.c @@ -7,6 +7,8 @@ * https://www.openssl.org/source/license.html */ +#include "internal/deprecated.h" + #include <stdio.h> #include <string.h> #include <openssl/core_names.h> @@ -322,6 +324,7 @@ int EVP_PKEY_CTX_set0_dh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char *ukm, int len) return ret; } +#ifndef OPENSSL_NO_DEPRECATED_3_0 int EVP_PKEY_CTX_get0_dh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char **pukm) { int ret; @@ -348,3 +351,4 @@ int EVP_PKEY_CTX_get0_dh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char **pukm) return (int)ukmlen; } +#endif diff --git a/crypto/evp/ec_ctrl.c b/crypto/evp/ec_ctrl.c index 17f1a8f288..ff0c55d023 100644 --- a/crypto/evp/ec_ctrl.c +++ b/crypto/evp/ec_ctrl.c @@ -243,6 +243,7 @@ int EVP_PKEY_CTX_set0_ecdh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char *ukm, int le return ret; } +#ifndef OPENSSL_NO_DEPRECATED_3_0 int EVP_PKEY_CTX_get0_ecdh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char **pukm) { size_t ukmlen; @@ -283,6 +284,7 @@ int EVP_PKEY_CTX_get0_ecdh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char **pukm) return ret; } +#endif #ifndef FIPS_MODULE /* |