summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorAntoine Salon <asalon@vmware.com>2018-10-16 10:54:26 -0700
committerNicola Tuveri <nic.tuv@gmail.com>2018-10-17 13:22:14 +0300
commit9453b196343db579c590130adc63d35d2ff87188 (patch)
tree592d2a68943066075620fa69b7a7c41a4d37b80a /crypto
parentffd89124bdfc9e69349492c3f15383bb35520a11 (diff)
Deprecate ECDH_KDF_X9_62()
Signed-off-by: Antoine Salon <asalon@vmware.com> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com> (Merged from https://github.com/openssl/openssl/pull/7345)
Diffstat (limited to 'crypto')
-rw-r--r--crypto/ec/ecdh_kdf.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/ec/ecdh_kdf.c b/crypto/ec/ecdh_kdf.c
index d686f9d897..c21e788078 100644
--- a/crypto/ec/ecdh_kdf.c
+++ b/crypto/ec/ecdh_kdf.c
@@ -72,6 +72,7 @@ int ecdh_KDF_X9_63(unsigned char *out, size_t outlen,
* The old name for ecdh_KDF_X9_63
* Retained for ABI compatibility
*/
+#if OPENSSL_API_COMPAT < 0x10200000L
int ECDH_KDF_X9_62(unsigned char *out, size_t outlen,
const unsigned char *Z, size_t Zlen,
const unsigned char *sinfo, size_t sinfolen,
@@ -79,3 +80,4 @@ int ECDH_KDF_X9_62(unsigned char *out, size_t outlen,
{
return ecdh_KDF_X9_63(out, outlen, Z, Zlen, sinfo, sinfolen, md);
}
+#endif