PROV: Add DERlib support for DSA

[openssl.git] / providers / implementations / serializers / serializer_dh.c

diff --git a/providers/implementations/serializers/serializer_dh.c b/providers/implementations/serializers/serializer_dh.c
index 313fae0e30c6b572244951cc9f8a68634bd1d27d..b2517ed947c17cbd5c0daa725a3bde15b7304420 100644 (file)
--- a/providers/implementations/serializers/serializer_dh.c
+++ b/providers/implementations/serializers/serializer_dh.c
@@ -7,6 +7,12 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

+/*
+ * DH low level APIs are deprecated for public use, but still ok for
+ * internal use.
+ */
+#include "internal/deprecated.h"
+

 #include <openssl/dh.h>
 #include <openssl/err.h>
 #include "prov/bio.h"             /* ossl_prov_bio_printf() */
 #include <openssl/dh.h>
 #include <openssl/err.h>
 #include "prov/bio.h"             /* ossl_prov_bio_printf() */


@@ -14,9 +20,19 @@
 #include "prov/providercommonerr.h" /* PROV_R_BN_ERROR */
 #include "serializer_local.h"
 
 #include "prov/providercommonerr.h" /* PROV_R_BN_ERROR */
 #include "serializer_local.h"
 

-OSSL_OP_keymgmt_importkey_fn *ossl_prov_get_dh_importkey(void)
+OSSL_OP_keymgmt_new_fn *ossl_prov_get_keymgmt_dh_new(void)
+{
+    return ossl_prov_get_keymgmt_new(dh_keymgmt_functions);
+}
+
+OSSL_OP_keymgmt_free_fn *ossl_prov_get_keymgmt_dh_free(void)
+{
+    return ossl_prov_get_keymgmt_free(dh_keymgmt_functions);
+}
+
+OSSL_OP_keymgmt_import_fn *ossl_prov_get_keymgmt_dh_import(void)

 {
 {

-    return ossl_prov_get_importkey(dh_keymgmt_functions);
+    return ossl_prov_get_keymgmt_import(dh_keymgmt_functions);

 }
 
 int ossl_prov_print_dh(BIO *out, DH *dh, enum dh_print_type type)
 }
 
 int ossl_prov_print_dh(BIO *out, DH *dh, enum dh_print_type type)


@@ -51,7 +67,7 @@ int ossl_prov_print_dh(BIO *out, DH *dh, enum dh_print_type type)
     }
 
     p = DH_get0_p(dh);
     }
 
     p = DH_get0_p(dh);

-    g = DH_get0_p(dh);
+    g = DH_get0_g(dh);

     if (p == NULL || g == NULL)
         goto null_err;
 
     if (p == NULL || g == NULL)
         goto null_err;
 


@@ -91,7 +107,7 @@ int ossl_prov_print_dh(BIO *out, DH *dh, enum dh_print_type type)
 }
 
 int ossl_prov_prepare_dh_params(const void *dh, int nid,
 }
 
 int ossl_prov_prepare_dh_params(const void *dh, int nid,

-                                ASN1_STRING **pstr, int *pstrtype)
+                                void **pstr, int *pstrtype)

 {
     ASN1_STRING *params = ASN1_STRING_new();
 
 {
     ASN1_STRING *params = ASN1_STRING_new();