Prepare to provide EVP_PKEY_security_bits()

This also provides a pkey_security_bits member to the PKEY ASN.1 methods
and a corresponding setter EVP_PKEY_asn1_set_security_bits().

ok beck jsing

1 files changed, 8 insertions, 1 deletions

diff --git a/src/lib/libcrypto/dh/dh_ameth.c b/src/lib/libcrypto/dh/dh_ameth.c
index 0df7fbc739..3701946cef 100644
--- a/src/lib/libcrypto/dh/dh_ameth.c
+++ b/src/lib/libcrypto/dh/dh_ameth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_ameth.c,v 1.23 2022/01/20 11:00:34 inoguchi Exp $ */
+/* $OpenBSD: dh_ameth.c,v 1.24 2022/06/27 12:36:05 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -398,6 +398,12 @@ dh_bits(const EVP_PKEY *pkey)
 }
 
 static int
+dh_security_bits(const EVP_PKEY *pkey)
+{
+        return DH_security_bits(pkey->pkey.dh);
+}
+
+static int
 dh_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
 {
         if (BN_cmp(a->pkey.dh->p, b->pkey.dh->p) ||
@@ -512,6 +518,7 @@ const EVP_PKEY_ASN1_METHOD dh_asn1_meth = {
 
         .pkey_size = int_dh_size,
         .pkey_bits = dh_bits,
+        .pkey_security_bits = dh_security_bits,
 
         .param_decode = dh_param_decode,
         .param_encode = dh_param_encode,