Make rcu_thread_key context-aware
[openssl.git] / crypto / dh / dh_ameth.c
index d19b8e9961b4913e690c550c42ec213caf75ebf8..80e1612256be21525aa5072020e9c59f8317c874 100644 (file)
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project 2006.
- */
-/* ====================================================================
- * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
+/*
+ * Copyright 2006-2022 The OpenSSL Project Authors. All Rights Reserved.
  *
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * 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 <stdio.h>
-#include "cryptlib.h"
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
-#include <openssl/dh.h>
 #include <openssl/bn.h>
-#include "asn1_locl.h"
+#include <openssl/core_names.h>
+#include <openssl/param_build.h>
+#include "internal/ffc.h"
+#include "internal/cryptlib.h"
+#include "crypto/asn1.h"
+#include "crypto/dh.h"
+#include "crypto/evp.h"
+#include "dh_local.h"
+
+/*
+ * i2d/d2i like DH parameter functions which use the appropriate routine for
+ * PKCS#3 DH or X9.42 DH.
+ */
 
-extern const EVP_PKEY_ASN1_METHOD dhx_asn1_meth;
+static DH *d2i_dhp(const EVP_PKEY *pkey, const unsigned char **pp,
+                   long length)
+{
+    DH *dh = NULL;
+    int is_dhx = (pkey->ameth == &ossl_dhx_asn1_meth);
 
-/* i2d/d2i like DH parameter functions which use the appropriate routine
- * for PKCS#3 DH or X9.42 DH.
- */
+    if (is_dhx)
+        dh = d2i_DHxparams(NULL, pp, length);
+    else
+        dh = d2i_DHparams(NULL, pp, length);
 
-static DH * d2i_dhp(const EVP_PKEY *pkey, const unsigned char **pp, long length)
-       {
-       if (pkey->ameth == &dhx_asn1_meth)
-               return d2i_DHxparams(NULL, pp, length);
-       return d2i_DHparams(NULL, pp, length);
-       }
+    return dh;
+}
 
 static int i2d_dhp(const EVP_PKEY *pkey, const DH *a, unsigned char **pp)
-       {
-       if (pkey->ameth == &dhx_asn1_meth)
-               return i2d_DHxparams(a, pp);
-       return i2d_DHparams(a, pp);
-       }
+{
+    if (pkey->ameth == &ossl_dhx_asn1_meth)
+        return i2d_DHxparams(a, pp);
+    return i2d_DHparams(a, pp);
+}
 
 static void int_dh_free(EVP_PKEY *pkey)
-       {
-       DH_free(pkey->pkey.dh);
-       }
-
-static int dh_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
-       {
-       const unsigned char *p, *pm;
-       int pklen, pmlen;
-       int ptype;
-       void *pval;
-       ASN1_STRING *pstr;
-       X509_ALGOR *palg;
-       ASN1_INTEGER *public_key = NULL;
-
-       DH *dh = NULL;
-
-       if (!X509_PUBKEY_get0_param(NULL, &p, &pklen, &palg, pubkey))
-               return 0;
-       X509_ALGOR_get0(NULL, &ptype, &pval, palg);
-
-       if (ptype != V_ASN1_SEQUENCE)
-               {
-               DHerr(DH_F_DH_PUB_DECODE, DH_R_PARAMETER_ENCODING_ERROR);
-               goto err;
-               }
-
-       pstr = pval;    
-       pm = pstr->data;
-       pmlen = pstr->length;
-
-       if (!(dh = d2i_dhp(pkey, &pm, pmlen)))
-               {
-               DHerr(DH_F_DH_PUB_DECODE, DH_R_DECODE_ERROR);
-               goto err;
-               }
-
-       if (!(public_key=d2i_ASN1_INTEGER(NULL, &p, pklen)))
-               {
-               DHerr(DH_F_DH_PUB_DECODE, DH_R_DECODE_ERROR);
-               goto err;
-               }
-
-       /* We have parameters now set public key */
-       if (!(dh->pub_key = ASN1_INTEGER_to_BN(public_key, NULL)))
-               {
-               DHerr(DH_F_DH_PUB_DECODE, DH_R_BN_DECODE_ERROR);
-               goto err;
-               }
-
-       ASN1_INTEGER_free(public_key);
-       EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, dh);
-       return 1;
-
-       err:
-       if (public_key)
-               ASN1_INTEGER_free(public_key);
-       if (dh)
-               DH_free(dh);
-       return 0;
-
-       }
-
-static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
-       {
-       DH *dh;
-       void *pval = NULL;
-       int ptype;
-       unsigned char *penc = NULL;
-       int penclen;
-       ASN1_STRING *str;
-       ASN1_INTEGER *pub_key = NULL;
-
-       dh=pkey->pkey.dh;
-
-       str = ASN1_STRING_new();
-       str->length = i2d_dhp(pkey, dh, &str->data);
-       if (str->length <= 0)
-               {
-               DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
-               goto err;
-               }
-       pval = str;
-       ptype = V_ASN1_SEQUENCE;
-
-       pub_key = BN_to_ASN1_INTEGER(dh->pub_key, NULL);
-       if (!pub_key)
-               goto err;
-
-       penclen = i2d_ASN1_INTEGER(pub_key, &penc);
-
-       ASN1_INTEGER_free(pub_key);
-
-       if (penclen <= 0)
-               {
-               DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
-               goto err;
-               }
-
-       if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(pkey->ameth->pkey_id),
-                               ptype, pval, penc, penclen))
-               return 1;
-
-       err:
-       if (penc)
-               OPENSSL_free(penc);
-       if (pval)
-               ASN1_STRING_free(pval);
-
-       return 0;
-       }
-
-
-/* PKCS#8 DH is defined in PKCS#11 of all places. It is similar to DH in
- * that the AlgorithmIdentifier contains the paramaters, the private key
- * is explcitly included and the pubkey must be recalculated.
- */
-       
-static int dh_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
-       {
-       const unsigned char *p, *pm;
-       int pklen, pmlen;
-       int ptype;
-       void *pval;
-       ASN1_STRING *pstr;
-       X509_ALGOR *palg;
-       ASN1_INTEGER *privkey = NULL;
-
-       DH *dh = NULL;
-
-       if (!PKCS8_pkey_get0(NULL, &p, &pklen, &palg, p8))
-               return 0;
-
-       X509_ALGOR_get0(NULL, &ptype, &pval, palg);
-
-       if (ptype != V_ASN1_SEQUENCE)
-                       goto decerr;
-
-       if (!(privkey=d2i_ASN1_INTEGER(NULL, &p, pklen)))
-               goto decerr;
-
-
-       pstr = pval;    
-       pm = pstr->data;
-       pmlen = pstr->length;
-       if (!(dh = d2i_dhp(pkey, &pm, pmlen)))
-               goto decerr;
-       /* We have parameters now set private key */
-       if (!(dh->priv_key = ASN1_INTEGER_to_BN(privkey, NULL)))
-               {
-               DHerr(DH_F_DH_PRIV_DECODE,DH_R_BN_ERROR);
-               goto dherr;
-               }
-       /* Calculate public key */
-       if (!DH_generate_key(dh))
-               goto dherr;
-
-       EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, dh);
-
-       ASN1_INTEGER_free(privkey);
-
-       return 1;
-
-       decerr:
-       DHerr(DH_F_DH_PRIV_DECODE, EVP_R_DECODE_ERROR);
-       dherr:
-       DH_free(dh);
-       return 0;
-       }
-
-static int dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
 {
-       ASN1_STRING *params = NULL;
-       ASN1_INTEGER *prkey = NULL;
-       unsigned char *dp = NULL;
-       int dplen;
-
-       params = ASN1_STRING_new();
-
-       if (!params)
-               {
-               DHerr(DH_F_DH_PRIV_ENCODE,ERR_R_MALLOC_FAILURE);
-               goto err;
-               }
-
-       params->length = i2d_dhp(pkey, pkey->pkey.dh, &params->data);
-       if (params->length <= 0)
-               {
-               DHerr(DH_F_DH_PRIV_ENCODE,ERR_R_MALLOC_FAILURE);
-               goto err;
-               }
-       params->type = V_ASN1_SEQUENCE;
-
-       /* Get private key into integer */
-       prkey = BN_to_ASN1_INTEGER(pkey->pkey.dh->priv_key, NULL);
+    DH_free(pkey->pkey.dh);
+}
 
-       if (!prkey)
-               {
-               DHerr(DH_F_DH_PRIV_ENCODE,DH_R_BN_ERROR);
-               goto err;
-               }
+static int dh_pub_decode(EVP_PKEY *pkey, const X509_PUBKEY *pubkey)
+{
+    const unsigned char *p, *pm;
+    int pklen, pmlen;
+    int ptype;
+    const void *pval;
+    const ASN1_STRING *pstr;
+    X509_ALGOR *palg;
+    ASN1_INTEGER *public_key = NULL;
+
+    DH *dh = NULL;
+
+    if (!X509_PUBKEY_get0_param(NULL, &p, &pklen, &palg, pubkey))
+        return 0;
+    X509_ALGOR_get0(NULL, &ptype, &pval, palg);
+
+    if (ptype != V_ASN1_SEQUENCE) {
+        ERR_raise(ERR_LIB_DH, DH_R_PARAMETER_ENCODING_ERROR);
+        goto err;
+    }
+
+    pstr = pval;
+    pm = pstr->data;
+    pmlen = pstr->length;
+
+    if ((dh = d2i_dhp(pkey, &pm, pmlen)) == NULL) {
+        ERR_raise(ERR_LIB_DH, DH_R_DECODE_ERROR);
+        goto err;
+    }
+
+    if ((public_key = d2i_ASN1_INTEGER(NULL, &p, pklen)) == NULL) {
+        ERR_raise(ERR_LIB_DH, DH_R_DECODE_ERROR);
+        goto err;
+    }
+
+    /* We have parameters now set public key */
+    if ((dh->pub_key = ASN1_INTEGER_to_BN(public_key, NULL)) == NULL) {
+        ERR_raise(ERR_LIB_DH, DH_R_BN_DECODE_ERROR);
+        goto err;
+    }
+
+    ASN1_INTEGER_free(public_key);
+    EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, dh);
+    return 1;
+
+ err:
+    ASN1_INTEGER_free(public_key);
+    DH_free(dh);
+    return 0;
+}
 
-       dplen = i2d_ASN1_INTEGER(prkey, &dp);
+static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
+{
+    DH *dh;
+    int ptype;
+    unsigned char *penc = NULL;
+    int penclen;
+    ASN1_STRING *str;
+    ASN1_INTEGER *pub_key = NULL;
+
+    dh = pkey->pkey.dh;
+
+    str = ASN1_STRING_new();
+    if (str == NULL) {
+        ERR_raise(ERR_LIB_DH, ERR_R_ASN1_LIB);
+        goto err;
+    }
+    str->length = i2d_dhp(pkey, dh, &str->data);
+    if (str->length <= 0) {
+        ERR_raise(ERR_LIB_DH, ERR_R_ASN1_LIB);
+        goto err;
+    }
+    ptype = V_ASN1_SEQUENCE;
+
+    pub_key = BN_to_ASN1_INTEGER(dh->pub_key, NULL);
+    if (pub_key == NULL)
+        goto err;
+
+    penclen = i2d_ASN1_INTEGER(pub_key, &penc);
+
+    ASN1_INTEGER_free(pub_key);
+
+    if (penclen <= 0) {
+        ERR_raise(ERR_LIB_DH, ERR_R_ASN1_LIB);
+        goto err;
+    }
+
+    if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(pkey->ameth->pkey_id),
+                               ptype, str, penc, penclen))
+        return 1;
+
+ err:
+    OPENSSL_free(penc);
+    ASN1_STRING_free(str);
+
+    return 0;
+}
 
-       ASN1_INTEGER_free(prkey);
+/*
+ * PKCS#8 DH is defined in PKCS#11 of all places. It is similar to DH in that
+ * the AlgorithmIdentifier contains the parameters, the private key is
+ * explicitly included and the pubkey must be recalculated.
+ */
 
-       if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(pkey->ameth->pkey_id), 0,
-                               V_ASN1_SEQUENCE, params, dp, dplen))
-               goto err;
+static int dh_priv_decode(EVP_PKEY *pkey, const PKCS8_PRIV_KEY_INFO *p8)
+{
+    int ret = 0;
+    DH *dh = ossl_dh_key_from_pkcs8(p8, NULL, NULL);
 
-       return 1;
+    if (dh != NULL) {
+        ret = 1;
+        EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, dh);
+    }
 
-err:
-       if (dp != NULL)
-               OPENSSL_free(dp);
-       if (params != NULL)
-               ASN1_STRING_free(params);
-       if (prkey != NULL)
-               ASN1_INTEGER_free(prkey);
-       return 0;
+    return ret;
 }
 
-
-static void update_buflen(const BIGNUM *b, size_t *pbuflen)
-       {
-       size_t i;
-       if (!b)
-               return;
-       if (*pbuflen < (i = (size_t)BN_num_bytes(b)))
-                       *pbuflen = i;
-       }
+static int dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
+{
+    ASN1_STRING *params = NULL;
+    ASN1_INTEGER *prkey = NULL;
+    unsigned char *dp = NULL;
+    int dplen;
+
+    params = ASN1_STRING_new();
+
+    if (params == NULL) {
+        ERR_raise(ERR_LIB_DH, ERR_R_ASN1_LIB);
+        goto err;
+    }
+
+    params->length = i2d_dhp(pkey, pkey->pkey.dh, &params->data);
+    if (params->length <= 0) {
+        ERR_raise(ERR_LIB_DH, ERR_R_ASN1_LIB);
+        goto err;
+    }
+    params->type = V_ASN1_SEQUENCE;
+
+    /* Get private key into integer */
+    prkey = BN_to_ASN1_INTEGER(pkey->pkey.dh->priv_key, NULL);
+
+    if (prkey == NULL) {
+        ERR_raise(ERR_LIB_DH, DH_R_BN_ERROR);
+        goto err;
+    }
+
+    dplen = i2d_ASN1_INTEGER(prkey, &dp);
+
+    ASN1_STRING_clear_free(prkey);
+
+    if (dplen <= 0) {
+        ERR_raise(ERR_LIB_DH, DH_R_BN_ERROR);
+        goto err;
+    }
+
+    if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(pkey->ameth->pkey_id), 0,
+                         V_ASN1_SEQUENCE, params, dp, dplen)) {
+        OPENSSL_clear_free(dp, dplen);
+        goto err;
+    }
+    return 1;
+
+ err:
+    ASN1_STRING_free(params);
+    return 0;
+}
 
 static int dh_param_decode(EVP_PKEY *pkey,
-                                       const unsigned char **pder, int derlen)
-       {
-       DH *dh;
-       if (!(dh = d2i_dhp(pkey, pder, derlen)))
-               {
-               DHerr(DH_F_DH_PARAM_DECODE, ERR_R_DH_LIB);
-               return 0;
-               }
-       EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, dh);
-       return 1;
-       }
+                           const unsigned char **pder, int derlen)
+{
+    DH *dh;
+
+    if ((dh = d2i_dhp(pkey, pder, derlen)) == NULL)
+        return 0;
+    dh->dirty_cnt++;
+    EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, dh);
+    return 1;
+}
 
 static int dh_param_encode(const EVP_PKEY *pkey, unsigned char **pder)
-       {
-       return i2d_dhp(pkey, pkey->pkey.dh, pder);
-       }
-
-static int do_dh_print(BIO *bp, const DH *x, int indent,
-                                               ASN1_PCTX *ctx, int ptype)
-       {
-       unsigned char *m=NULL;
-       int reason=ERR_R_BUF_LIB,ret=0;
-       size_t buf_len=0;
-
-       const char *ktype = NULL;
-
-       BIGNUM *priv_key, *pub_key;
-
-       if (ptype == 2)
-               priv_key = x->priv_key;
-       else
-               priv_key = NULL;
-
-       if (ptype > 0)
-               pub_key = x->pub_key;
-       else
-               pub_key = NULL;
-
-       update_buflen(x->p, &buf_len);
-
-       if (buf_len == 0)
-               {
-               reason = ERR_R_PASSED_NULL_PARAMETER;
-               goto err;
-               }
-
-       update_buflen(x->g, &buf_len);
-       update_buflen(x->q, &buf_len);
-       update_buflen(x->j, &buf_len);
-       update_buflen(x->counter, &buf_len);
-       update_buflen(pub_key, &buf_len);
-       update_buflen(priv_key, &buf_len);
-
-       if (ptype == 2)
-               ktype = "DH Private-Key";
-       else if (ptype == 1)
-               ktype = "DH Public-Key";
-       else
-               ktype = "DH Parameters";
-
-       m= OPENSSL_malloc(buf_len+10);
-       if (m == NULL)
-               {
-               reason=ERR_R_MALLOC_FAILURE;
-               goto err;
-               }
-
-       BIO_indent(bp, indent, 128);
-       if (BIO_printf(bp,"%s: (%d bit)\n", ktype, BN_num_bits(x->p)) <= 0)
-               goto err;
-       indent += 4;
-
-       if (!ASN1_bn_print(bp,"private-key:",priv_key,m,indent)) goto err;
-       if (!ASN1_bn_print(bp,"public-key:",pub_key,m,indent)) goto err;
-
-       if (!ASN1_bn_print(bp,"prime:",x->p,m,indent)) goto err;
-       if (!ASN1_bn_print(bp,"generator:",x->g,m,indent)) goto err;
-       if (x->q && !ASN1_bn_print(bp,"subgroup order:",x->q,m,indent)) goto err;
-       if (x->j && !ASN1_bn_print(bp,"subgroup factor:",x->j,m,indent))
-               goto err;
-       if (x->seed)
-               {
-               int i;
-               BIO_indent(bp, indent, 128);
-               BIO_puts(bp, "seed:");
-               for (i=0; i < x->seedlen; i++)
-                       {
-                       if ((i%15) == 0)
-                               {
-                               if(BIO_puts(bp,"\n") <= 0
-                                  || !BIO_indent(bp,indent+4,128))
-                                   goto err;
-                               }
-                       if (BIO_printf(bp,"%02x%s", x->seed[i],
-                                       ((i+1) == x->seedlen)?"":":") <= 0)
-                               goto err;
-                       }
-               if (BIO_write(bp,"\n",1) <= 0) return(0);
-               }
-       if (x->counter && !ASN1_bn_print(bp,"counter:",x->counter,m,indent))
-               goto err;
-       if (x->length != 0)
-               {
-               BIO_indent(bp, indent, 128);
-               if (BIO_printf(bp,"recommended-private-length: %d bits\n",
-                       (int)x->length) <= 0) goto err;
-               }
-
-
-       ret=1;
-       if (0)
-               {
-err:
-               DHerr(DH_F_DO_DH_PRINT,reason);
-               }
-       if (m != NULL) OPENSSL_free(m);
-       return(ret);
-       }
+{
+    return i2d_dhp(pkey, pkey->pkey.dh, pder);
+}
+
+static int do_dh_print(BIO *bp, const DH *x, int indent, int ptype)
+{
+    int reason = ERR_R_BUF_LIB;
+    const char *ktype = NULL;
+    BIGNUM *priv_key, *pub_key;
+
+    if (ptype == 2)
+        priv_key = x->priv_key;
+    else
+        priv_key = NULL;
+
+    if (ptype > 0)
+        pub_key = x->pub_key;
+    else
+        pub_key = NULL;
+
+    if (x->params.p == NULL || (ptype == 2 && priv_key == NULL)
+            || (ptype > 0 && pub_key == NULL)) {
+        reason = ERR_R_PASSED_NULL_PARAMETER;
+        goto err;
+    }
+
+    if (ptype == 2)
+        ktype = "DH Private-Key";
+    else if (ptype == 1)
+        ktype = "DH Public-Key";
+    else
+        ktype = "DH Parameters";
+
+    if (!BIO_indent(bp, indent, 128)
+            || BIO_printf(bp, "%s: (%d bit)\n", ktype, DH_bits(x)) <= 0)
+        goto err;
+    indent += 4;
+
+    if (!ASN1_bn_print(bp, "private-key:", priv_key, NULL, indent))
+        goto err;
+    if (!ASN1_bn_print(bp, "public-key:", pub_key, NULL, indent))
+        goto err;
+
+    if (!ossl_ffc_params_print(bp, &x->params, indent))
+        goto err;
+
+    if (x->length != 0) {
+        if (!BIO_indent(bp, indent, 128)
+                || BIO_printf(bp, "recommended-private-length: %d bits\n",
+                              (int)x->length) <= 0)
+            goto err;
+    }
+
+    return 1;
+
+ err:
+    ERR_raise(ERR_LIB_DH, reason);
+    return 0;
+}
 
 static int int_dh_size(const EVP_PKEY *pkey)
-       {
-       return(DH_size(pkey->pkey.dh));
-       }
+{
+    return DH_size(pkey->pkey.dh);
+}
 
 static int dh_bits(const EVP_PKEY *pkey)
-       {
-       return BN_num_bits(pkey->pkey.dh->p);
-       }
+{
+    return DH_bits(pkey->pkey.dh);
+}
+
+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) ||
-               BN_cmp(a->pkey.dh->g,b->pkey.dh->g))
-               return 0;
-       else if (a->ameth == &dhx_asn1_meth)
-               {
-               if (BN_cmp(a->pkey.dh->q,b->pkey.dh->q))
-                       return 0;
-               }
-       return 1;
-       }
-
-static int int_dh_bn_cpy(BIGNUM **dst, const BIGNUM *src)
-       {
-       BIGNUM *a;
-       if (src)
-               {
-               a = BN_dup(src);
-               if (!a)
-                       return 0;
-               }
-       else 
-               a = NULL;
-       if (*dst)
-               BN_free(*dst);
-       *dst = a;
-       return 1;
-       }
+{
+    return ossl_ffc_params_cmp(&a->pkey.dh->params, &b->pkey.dh->params,
+                               a->ameth != &ossl_dhx_asn1_meth);
+}
 
 static int int_dh_param_copy(DH *to, const DH *from, int is_x942)
-       {
-       if (is_x942 == -1)
-               is_x942 = !!from->q;
-       if (!int_dh_bn_cpy(&to->p, from->p))
-               return 0;
-       if (!int_dh_bn_cpy(&to->g, from->g))
-               return 0;
-       if (is_x942)
-               {
-               if (!int_dh_bn_cpy(&to->q, from->q))
-                       return 0;
-               if (!int_dh_bn_cpy(&to->j, from->j))
-                       return 0;
-               if(to->seed)
-                       {
-                       OPENSSL_free(to->seed);
-                       to->seed = NULL;
-                       to->seedlen = 0;
-                       }
-               if (from->seed)
-                       {
-                       to->seed = BUF_memdup(from->seed, from->seedlen);
-                       if (!to->seed)
-                               return 0;
-                       to->seedlen = from->seedlen;
-                       }
-               }
-       else
-               to->length = from->length;
-       return 1;
-       }
-
-
-DH *DHparams_dup(DH *dh)
-       {
-       DH *ret;
-       ret = DH_new();
-       if (!ret)
-               return NULL;
-       if (!int_dh_param_copy(ret, dh, -1))
-               {
-               DH_free(ret);
-               return NULL;
-               }
-       return ret;
-       }
+{
+    if (is_x942 == -1)
+        is_x942 = (from->params.q != NULL);
+    if (!ossl_ffc_params_copy(&to->params, &from->params))
+        return 0;
+    if (!is_x942)
+        to->length = from->length;
+    to->dirty_cnt++;
+    return 1;
+}
+
+DH *DHparams_dup(const DH *dh)
+{
+    DH *ret;
+    ret = DH_new();
+    if (ret == NULL)
+        return NULL;
+    if (!int_dh_param_copy(ret, dh, -1)) {
+        DH_free(ret);
+        return NULL;
+    }
+    return ret;
+}
 
 static int dh_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
-       {
-       return int_dh_param_copy(to->pkey.dh, from->pkey.dh,
-                                from->ameth == &dhx_asn1_meth);
-       }
+{
+    if (to->pkey.dh == NULL) {
+        to->pkey.dh = DH_new();
+        if (to->pkey.dh == NULL)
+            return 0;
+    }
+    return int_dh_param_copy(to->pkey.dh, from->pkey.dh,
+                             from->ameth == &ossl_dhx_asn1_meth);
+}
 
 static int dh_missing_parameters(const EVP_PKEY *a)
-       {
-       if (!a->pkey.dh->p || !a->pkey.dh->g)
-               return 1;
-       return 0;
-       }
+{
+    return a->pkey.dh == NULL
+        || a->pkey.dh->params.p == NULL
+        || a->pkey.dh->params.g == NULL;
+}
 
 static int dh_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
-       {
-       if (dh_cmp_parameters(a, b) == 0)
-               return 0;
-       if (BN_cmp(b->pkey.dh->pub_key,a->pkey.dh->pub_key) != 0)
-               return 0;
-       else
-               return 1;
-       }
+{
+    if (dh_cmp_parameters(a, b) == 0)
+        return 0;
+    if (BN_cmp(b->pkey.dh->pub_key, a->pkey.dh->pub_key) != 0)
+        return 0;
+    else
+        return 1;
+}
 
 static int dh_param_print(BIO *bp, const EVP_PKEY *pkey, int indent,
-                                                       ASN1_PCTX *ctx)
-       {
-       return do_dh_print(bp, pkey->pkey.dh, indent, ctx, 0);
-       }
+                          ASN1_PCTX *ctx)
+{
+    return do_dh_print(bp, pkey->pkey.dh, indent, 0);
+}
 
 static int dh_public_print(BIO *bp, const EVP_PKEY *pkey, int indent,
-                                                       ASN1_PCTX *ctx)
-       {
-       return do_dh_print(bp, pkey->pkey.dh, indent, ctx, 1);
-       }
+                           ASN1_PCTX *ctx)
+{
+    return do_dh_print(bp, pkey->pkey.dh, indent, 1);
+}
 
 static int dh_private_print(BIO *bp, const EVP_PKEY *pkey, int indent,
-                                                       ASN1_PCTX *ctx)
-       {
-       return do_dh_print(bp, pkey->pkey.dh, indent, ctx, 2);
-       }
+                            ASN1_PCTX *ctx)
+{
+    return do_dh_print(bp, pkey->pkey.dh, indent, 2);
+}
 
 int DHparams_print(BIO *bp, const DH *x)
-       {
-       return do_dh_print(bp, x, 4, NULL, 0);
-       }
-
-const EVP_PKEY_ASN1_METHOD dh_asn1_meth = 
-       {
-       EVP_PKEY_DH,
-       EVP_PKEY_DH,
-       0,
-
-       "DH",
-       "OpenSSL PKCS#3 DH method",
-
-       dh_pub_decode,
-       dh_pub_encode,
-       dh_pub_cmp,
-       dh_public_print,
-
-       dh_priv_decode,
-       dh_priv_encode,
-       dh_private_print,
-
-       int_dh_size,
-       dh_bits,
-
-       dh_param_decode,
-       dh_param_encode,
-       dh_missing_parameters,
-       dh_copy_parameters,
-       dh_cmp_parameters,
-       dh_param_print,
-       0,
-
-       int_dh_free,
-       0
-       };
-
-const EVP_PKEY_ASN1_METHOD dhx_asn1_meth = 
-       {
-       EVP_PKEY_DHX,
-       EVP_PKEY_DHX,
-       0,
-
-       "X9.42 DH",
-       "OpenSSL X9.42 DH method",
-
-       dh_pub_decode,
-       dh_pub_encode,
-       dh_pub_cmp,
-       dh_public_print,
-
-       dh_priv_decode,
-       dh_priv_encode,
-       dh_private_print,
-
-       int_dh_size,
-       dh_bits,
-
-       dh_param_decode,
-       dh_param_encode,
-       dh_missing_parameters,
-       dh_copy_parameters,
-       dh_cmp_parameters,
-       dh_param_print,
-       0,
-
-       int_dh_free,
-       0
-       };
+{
+    return do_dh_print(bp, x, 4, 0);
+}
+
+static int dh_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
+{
+    DH *dh;
+    switch (op) {
+    case ASN1_PKEY_CTRL_SET1_TLS_ENCPT:
+        /* We should only be here if we have a legacy key */
+        if (!ossl_assert(evp_pkey_is_legacy(pkey)))
+            return 0;
+        dh = (DH *) evp_pkey_get0_DH_int(pkey);
+        if (dh == NULL)
+            return 0;
+        return ossl_dh_buf2key(dh, arg2, arg1);
+    case ASN1_PKEY_CTRL_GET1_TLS_ENCPT:
+        dh = (DH *) EVP_PKEY_get0_DH(pkey);
+        if (dh == NULL)
+            return 0;
+        return ossl_dh_key2buf(dh, arg2, 0, 1);
+    default:
+        return -2;
+    }
+}
+
+static int dhx_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
+{
+    switch (op) {
+    default:
+        return -2;
+    }
+
+}
+
+static int dh_pkey_public_check(const EVP_PKEY *pkey)
+{
+    DH *dh = pkey->pkey.dh;
+
+    if (dh->pub_key == NULL) {
+        ERR_raise(ERR_LIB_DH, DH_R_MISSING_PUBKEY);
+        return 0;
+    }
+
+    return DH_check_pub_key_ex(dh, dh->pub_key);
+}
+
+static int dh_pkey_param_check(const EVP_PKEY *pkey)
+{
+    DH *dh = pkey->pkey.dh;
+
+    return DH_check_ex(dh);
+}
+
+static size_t dh_pkey_dirty_cnt(const EVP_PKEY *pkey)
+{
+    return pkey->pkey.dh->dirty_cnt;
+}
+
+static int dh_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
+                             OSSL_FUNC_keymgmt_import_fn *importer,
+                             OSSL_LIB_CTX *libctx, const char *propq)
+{
+    DH *dh = from->pkey.dh;
+    OSSL_PARAM_BLD *tmpl;
+    const BIGNUM *p = DH_get0_p(dh), *g = DH_get0_g(dh), *q = DH_get0_q(dh);
+    long l = DH_get_length(dh);
+    const BIGNUM *pub_key = DH_get0_pub_key(dh);
+    const BIGNUM *priv_key = DH_get0_priv_key(dh);
+    OSSL_PARAM *params = NULL;
+    int selection = 0;
+    int rv = 0;
+
+    if (p == NULL || g == NULL)
+        return 0;
+
+    tmpl = OSSL_PARAM_BLD_new();
+    if (tmpl == NULL)
+        return 0;
+    if (!OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_P, p)
+        || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_G, g))
+        goto err;
+    if (q != NULL) {
+        if (!OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_Q, q))
+            goto err;
+    }
+    selection |= OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS;
+    if (l > 0) {
+        if (!OSSL_PARAM_BLD_push_long(tmpl, OSSL_PKEY_PARAM_DH_PRIV_LEN, l))
+            goto err;
+        selection |= OSSL_KEYMGMT_SELECT_OTHER_PARAMETERS;
+    }
+    if (pub_key != NULL) {
+        if (!OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_PUB_KEY, pub_key))
+            goto err;
+        selection |= OSSL_KEYMGMT_SELECT_PUBLIC_KEY;
+    }
+    if (priv_key != NULL) {
+        if (!OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_PRIV_KEY,
+                                    priv_key))
+            goto err;
+        selection |= OSSL_KEYMGMT_SELECT_PRIVATE_KEY;
+    }
+
+    if ((params = OSSL_PARAM_BLD_to_param(tmpl)) == NULL)
+        goto err;
+
+    /* We export, the provider imports */
+    rv = importer(to_keydata, selection, params);
+
+    OSSL_PARAM_free(params);
+err:
+    OSSL_PARAM_BLD_free(tmpl);
+    return rv;
+}
+
+static int dh_pkey_import_from_type(const OSSL_PARAM params[], void *vpctx,
+                                    int type)
+{
+    EVP_PKEY_CTX *pctx = vpctx;
+    EVP_PKEY *pkey = EVP_PKEY_CTX_get0_pkey(pctx);
+    DH *dh = ossl_dh_new_ex(pctx->libctx);
+
+    if (dh == NULL) {
+        ERR_raise(ERR_LIB_DH, ERR_R_DH_LIB);
+        return 0;
+    }
+    DH_clear_flags(dh, DH_FLAG_TYPE_MASK);
+    DH_set_flags(dh, type == EVP_PKEY_DH ? DH_FLAG_TYPE_DH : DH_FLAG_TYPE_DHX);
+
+    if (!ossl_dh_params_fromdata(dh, params)
+        || !ossl_dh_key_fromdata(dh, params, 1)
+        || !EVP_PKEY_assign(pkey, type, dh)) {
+        DH_free(dh);
+        return 0;
+    }
+    return 1;
+}
+
+static int dh_pkey_import_from(const OSSL_PARAM params[], void *vpctx)
+{
+    return dh_pkey_import_from_type(params, vpctx, EVP_PKEY_DH);
+}
+
+static int dhx_pkey_import_from(const OSSL_PARAM params[], void *vpctx)
+{
+    return dh_pkey_import_from_type(params, vpctx, EVP_PKEY_DHX);
+}
+
+static int dh_pkey_copy(EVP_PKEY *to, EVP_PKEY *from)
+{
+    DH *dh = from->pkey.dh;
+    DH *dupkey = NULL;
+    int ret;
+
+    if (dh != NULL) {
+        dupkey = ossl_dh_dup(dh, OSSL_KEYMGMT_SELECT_ALL);
+        if (dupkey == NULL)
+            return 0;
+    }
+
+    ret = EVP_PKEY_assign(to, from->type, dupkey);
+    if (!ret)
+        DH_free(dupkey);
+    return ret;
+}
 
+const EVP_PKEY_ASN1_METHOD ossl_dh_asn1_meth = {
+    EVP_PKEY_DH,
+    EVP_PKEY_DH,
+    0,
+
+    "DH",
+    "OpenSSL PKCS#3 DH method",
+
+    dh_pub_decode,
+    dh_pub_encode,
+    dh_pub_cmp,
+    dh_public_print,
+
+    dh_priv_decode,
+    dh_priv_encode,
+    dh_private_print,
+
+    int_dh_size,
+    dh_bits,
+    dh_security_bits,
+
+    dh_param_decode,
+    dh_param_encode,
+    dh_missing_parameters,
+    dh_copy_parameters,
+    dh_cmp_parameters,
+    dh_param_print,
+    0,
+
+    int_dh_free,
+    dh_pkey_ctrl,
+
+    0, 0, 0, 0, 0,
+
+    0,
+    dh_pkey_public_check,
+    dh_pkey_param_check,
+
+    0, 0, 0, 0,
+
+    dh_pkey_dirty_cnt,
+    dh_pkey_export_to,
+    dh_pkey_import_from,
+    dh_pkey_copy
+};
+
+const EVP_PKEY_ASN1_METHOD ossl_dhx_asn1_meth = {
+    EVP_PKEY_DHX,
+    EVP_PKEY_DHX,
+    0,
+
+    "X9.42 DH",
+    "OpenSSL X9.42 DH method",
+
+    dh_pub_decode,
+    dh_pub_encode,
+    dh_pub_cmp,
+    dh_public_print,
+
+    dh_priv_decode,
+    dh_priv_encode,
+    dh_private_print,
+
+    int_dh_size,
+    dh_bits,
+    dh_security_bits,
+
+    dh_param_decode,
+    dh_param_encode,
+    dh_missing_parameters,
+    dh_copy_parameters,
+    dh_cmp_parameters,
+    dh_param_print,
+    0,
+
+    int_dh_free,
+    dhx_pkey_ctrl,
+
+    0, 0, 0, 0, 0,
+
+    0,
+    dh_pkey_public_check,
+    dh_pkey_param_check,
+    0, 0, 0, 0,
+    dh_pkey_dirty_cnt,
+    dh_pkey_export_to,
+    dhx_pkey_import_from,
+    dh_pkey_copy
+};