Update perl-actions/install-with-cpanm version in CI
[openssl.git] / crypto / pem / pem_all.c
index c2bf6eb9097b181f48ff0b779aec82e329f41334..222af64397b4df6a0d0feb1e74503bcc2a9322ab 100644 (file)
-/* crypto/pem/pem_all.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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 acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS 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 AUTHOR OR 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * 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
  */
 
-#include <stdio.h>
-#undef SSLEAY_MACROS
-#include "cryptlib.h"
-#include "bio.h"
-#include "evp.h"
-#include "x509.h"
-#include "pkcs7.h"
-#include "pem.h"
-
-#ifndef NO_FP_API
-/* The X509 functions */
-X509 *PEM_read_X509(FILE *fp, X509 **x, int (*cb)())
-       {
-       return((X509 *)PEM_ASN1_read((char *(*)())d2i_X509,
-               PEM_STRING_X509,fp,(char **)x,cb));
-       }
-#endif
-
-X509 *PEM_read_bio_X509(BIO *bp, X509 **x, int (*cb)())
-       {
-       return((X509 *)PEM_ASN1_read_bio((char *(*)())d2i_X509,
-               PEM_STRING_X509,bp,(char **)x,cb));
-       }
-
-#ifndef NO_FP_API
-int PEM_write_X509(FILE *fp, X509 *x)
-       {
-       return(PEM_ASN1_write((int (*)())i2d_X509,PEM_STRING_X509,fp,
-               (char *)x, NULL,NULL,0,NULL));
-       }
-#endif
-
-int PEM_write_bio_X509(BIO *bp, X509 *x)
-       {
-       return(PEM_ASN1_write_bio((int (*)())i2d_X509,PEM_STRING_X509,bp,
-               (char *)x, NULL,NULL,0,NULL));
-       }
-
-#ifndef NO_FP_API
-/* The X509_REQ functions */
-X509_REQ *PEM_read_X509_REQ(FILE *fp, X509_REQ **x, int (*cb)())
-       {
-       return((X509_REQ *)PEM_ASN1_read((char *(*)())d2i_X509_REQ,
-               PEM_STRING_X509_REQ,fp,(char **)x,cb));
-       }
-#endif
-
-X509_REQ *PEM_read_bio_X509_REQ(BIO *bp, X509_REQ **x, int (*cb)())
-       {
-       return((X509_REQ *)PEM_ASN1_read_bio((char *(*)())d2i_X509_REQ,
-               PEM_STRING_X509_REQ,bp,(char **)x,cb));
-       }
-
-#ifndef NO_FP_API
-int PEM_write_X509_REQ(FILE *fp, X509_REQ *x)
-       {
-       return(PEM_ASN1_write((int (*)())i2d_X509_REQ,PEM_STRING_X509_REQ,fp,
-               (char *)x, NULL,NULL,0,NULL));
-       }
-#endif
-
-int PEM_write_bio_X509_REQ(BIO *bp, X509_REQ *x)
-       {
-       return(PEM_ASN1_write_bio((int (*)())i2d_X509_REQ,PEM_STRING_X509_REQ,
-               bp,(char *)x, NULL,NULL,0,NULL));
-       }
-
-#ifndef NO_FP_API
-/* The X509_CRL functions */
-X509_CRL *PEM_read_X509_CRL(FILE *fp, X509_CRL **x, int (*cb)())
-       {
-       return((X509_CRL *)PEM_ASN1_read((char *(*)())d2i_X509_CRL,
-               PEM_STRING_X509_CRL,fp,(char **)x,cb));
-       }
-#endif
-
-X509_CRL *PEM_read_bio_X509_CRL(BIO *bp, X509_CRL **x, int (*cb)())
-       {
-       return((X509_CRL *)PEM_ASN1_read_bio((char *(*)())d2i_X509_CRL,
-               PEM_STRING_X509_CRL,bp,(char **)x,cb));
-       }
-
-#ifndef NO_FP_API
-int PEM_write_X509_CRL(FILE *fp, X509_CRL *x)
-       {
-       return(PEM_ASN1_write((int (*)())i2d_X509_CRL,PEM_STRING_X509_CRL,fp,
-               (char *)x, NULL,NULL,0,NULL));
-       }
-#endif
-
-int PEM_write_bio_X509_CRL(BIO *bp, X509_CRL *x)
-       {
-       return(PEM_ASN1_write_bio((int (*)())i2d_X509_CRL,PEM_STRING_X509_CRL,
-               bp,(char *)x, NULL,NULL,0,NULL));
-       }
-
-#ifndef NO_RSA
-#ifndef NO_FP_API
-/* The RSAPrivateKey functions */
-RSA *PEM_read_RSAPrivateKey(FILE *fp, RSA **x, int (*cb)())
-       {
-       return((RSA *)PEM_ASN1_read((char *(*)())d2i_RSAPrivateKey,
-               PEM_STRING_RSA,fp,(char **)x,cb));
-       }
-
-RSA *PEM_read_RSAPublicKey(FILE *fp, RSA **x, int (*cb)())
-       {
-       return((RSA *)PEM_ASN1_read((char *(*)())d2i_RSAPublicKey,
-               PEM_STRING_RSA_PUBLIC,fp,(char **)x,cb));
-       }
-#endif
-
-RSA *PEM_read_bio_RSAPrivateKey(BIO *bp, RSA **x, int (*cb)())
-       {
-       return((RSA *)PEM_ASN1_read_bio((char *(*)())d2i_RSAPrivateKey,
-               PEM_STRING_RSA,bp,(char **)x,cb));
-       }
-
-RSA *PEM_read_bio_RSAPublicKey(BIO *bp, RSA **x, int (*cb)())
-       {
-       return((RSA *)PEM_ASN1_read_bio((char *(*)())d2i_RSAPublicKey,
-               PEM_STRING_RSA_PUBLIC,bp,(char **)x,cb));
-       }
-
-#ifndef NO_FP_API
-int PEM_write_RSAPrivateKey(FILE *fp, RSA *x, EVP_CIPHER *enc,
-            unsigned char *kstr, int klen, int (*cb)())
-       {
-       return(PEM_ASN1_write((int (*)())i2d_RSAPrivateKey,PEM_STRING_RSA,fp,
-               (char *)x,enc,kstr,klen,cb));
-       }
-
-int PEM_write_RSAPublicKey(FILE *fp, RSA *x)
-       {
-       return(PEM_ASN1_write((int (*)())i2d_RSAPublicKey,
-               PEM_STRING_RSA_PUBLIC,fp,
-               (char *)x,NULL,NULL,0,NULL));
-       }
-#endif
-
-int PEM_write_bio_RSAPrivateKey(BIO *bp, RSA *x, const EVP_CIPHER *enc,
-            unsigned char *kstr, int klen, int (*cb)())
-       {
-       return(PEM_ASN1_write_bio((int (*)())i2d_RSAPrivateKey,PEM_STRING_RSA,
-               bp,(char *)x,enc,kstr,klen,cb));
-       }
-
-int PEM_write_bio_RSAPublicKey(BIO *bp, RSA *x)
-       {
-       return(PEM_ASN1_write_bio((int (*)())i2d_RSAPublicKey,
-               PEM_STRING_RSA_PUBLIC,
-               bp,(char *)x,NULL,NULL,0,NULL));
-       }
-#endif /* !NO_RSA */
-
-#ifndef NO_DSA
-#ifndef NO_FP_API
-/* The DSAPrivateKey functions */
-DSA *PEM_read_DSAPrivateKey(FILE *fp, DSA **x, int (*cb)())
-       {
-       return((DSA *)PEM_ASN1_read((char *(*)())d2i_DSAPrivateKey,
-               PEM_STRING_DSA,fp,(char **)x,cb));
-       }
-#endif
-
-DSA *PEM_read_bio_DSAPrivateKey(BIO *bp, DSA **x, int (*cb)())
-       {
-       return((DSA *)PEM_ASN1_read_bio((char *(*)())d2i_DSAPrivateKey,
-               PEM_STRING_DSA,bp,(char **)x,cb));
-       }
-
-#ifndef NO_FP_API
-int PEM_write_DSAPrivateKey(FILE *fp, DSA *x, const EVP_CIPHER *enc,
-            unsigned char *kstr, int klen, int (*cb)())
-       {
-       return(PEM_ASN1_write((int (*)())i2d_DSAPrivateKey,PEM_STRING_DSA,fp,
-               (char *)x,enc,kstr,klen,cb));
-       }
-#endif
-
-int PEM_write_bio_DSAPrivateKey(BIO *bp, DSA *x, const EVP_CIPHER *enc,
-            unsigned char *kstr, int klen, int (*cb)())
-       {
-       return(PEM_ASN1_write_bio((int (*)())i2d_DSAPrivateKey,PEM_STRING_DSA,
-               bp,(char *)x,enc,kstr,klen,cb));
-       }
-#endif
-
-#ifndef NO_FP_API
-/* The PrivateKey functions */
-EVP_PKEY *PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, int (*cb)())
-       {
-       return((EVP_PKEY *)PEM_ASN1_read((char *(*)())d2i_PrivateKey,
-               PEM_STRING_EVP_PKEY,fp,(char **)x,cb));
-       }
-#endif
-
-EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, int (*cb)())
-       {
-       return((EVP_PKEY *)PEM_ASN1_read_bio((char *(*)())d2i_PrivateKey,
-               PEM_STRING_EVP_PKEY,bp,(char **)x,cb));
-       }
-
-#ifndef NO_FP_API
-int PEM_write_PrivateKey(FILE *fp, EVP_PKEY *x, EVP_CIPHER *enc,
-            unsigned char *kstr, int klen, int (*cb)())
-       {
-       return(PEM_ASN1_write((int (*)())i2d_PrivateKey,
-               ((x->type == EVP_PKEY_DSA)?PEM_STRING_DSA:PEM_STRING_RSA),
-               fp,(char *)x,enc,kstr,klen,cb));
-       }
-#endif
-
-int PEM_write_bio_PrivateKey(BIO *bp, EVP_PKEY *x, EVP_CIPHER *enc,
-            unsigned char *kstr, int klen, int (*cb)())
-       {
-       return(PEM_ASN1_write_bio((int (*)())i2d_PrivateKey,
-               ((x->type == EVP_PKEY_DSA)?PEM_STRING_DSA:PEM_STRING_RSA),
-               bp,(char *)x,enc,kstr,klen,cb));
-       }
-
-#ifndef NO_FP_API
-/* The PKCS7 functions */
-PKCS7 *PEM_read_PKCS7(FILE *fp, PKCS7 **x, int (*cb)())
-       {
-       return((PKCS7 *)PEM_ASN1_read((char *(*)())d2i_PKCS7,
-               PEM_STRING_PKCS7,fp,(char **)x,cb));
-       }
-#endif
-
-PKCS7 *PEM_read_bio_PKCS7(BIO *bp, PKCS7 **x, int (*cb)())
-       {
-       return((PKCS7 *)PEM_ASN1_read_bio((char *(*)())d2i_PKCS7,
-               PEM_STRING_PKCS7,bp,(char **)x,cb));
-       }
-
-#ifndef NO_FP_API
-int PEM_write_PKCS7(FILE *fp, PKCS7 *x)
-       {
-       return(PEM_ASN1_write((int (*)())i2d_PKCS7,PEM_STRING_PKCS7,fp,
-               (char *)x, NULL,NULL,0,NULL));
-       }
-#endif
-
-int PEM_write_bio_PKCS7(BIO *bp, PKCS7 *x)
-       {
-       return(PEM_ASN1_write_bio((int (*)())i2d_PKCS7,PEM_STRING_PKCS7,bp,
-               (char *)x, NULL,NULL,0,NULL));
-       }
-
-#ifndef NO_DH
-#ifndef NO_FP_API
-/* The DHparams functions */
-DH *PEM_read_DHparams(FILE *fp, DH **x, int (*cb)())
-       {
-       return((DH *)PEM_ASN1_read((char *(*)())d2i_DHparams,
-               PEM_STRING_DHPARAMS,fp,(char **)x,cb));
-       }
-#endif
-
-DH *PEM_read_bio_DHparams(BIO *bp, DH **x, int (*cb)())
-       {
-       return((DH *)PEM_ASN1_read_bio((char *(*)())d2i_DHparams,
-               PEM_STRING_DHPARAMS,bp,(char **)x,cb));
-       }
-
-#ifndef NO_FP_API
-int PEM_write_DHparams(FILE *fp, DH *x)
-       {
-       return(PEM_ASN1_write((int (*)())i2d_DHparams,PEM_STRING_DHPARAMS,fp,
-               (char *)x, NULL,NULL,0,NULL));
-       }
-#endif
-
-int PEM_write_bio_DHparams(BIO *bp, DH *x)
-       {
-       return(PEM_ASN1_write_bio((int (*)())i2d_DHparams,PEM_STRING_DHPARAMS,
-               bp,(char *)x, NULL,NULL,0,NULL));
-       }
-#endif
-
-#ifndef NO_DSA
-#ifndef NO_FP_API
-/* The DSAparams functions */
-DSA *PEM_read_DSAparams(FILE *fp, DSA **x, int (*cb)())
-       {
-       return((DSA *)PEM_ASN1_read((char *(*)())d2i_DSAparams,
-               PEM_STRING_DSAPARAMS,fp,(char **)x,cb));
-       }
-#endif
-
-DSA *PEM_read_bio_DSAparams(BIO *bp, DSA **x, int (*cb)())
-       {
-       return((DSA *)PEM_ASN1_read_bio((char *(*)())d2i_DSAparams,
-               PEM_STRING_DSAPARAMS,bp,(char **)x,cb));
-       }
-
-#ifndef NO_FP_API
-int PEM_write_DSAparams(FILE *fp, DSA *x)
-       {
-       return(PEM_ASN1_write((int (*)())i2d_DSAparams,PEM_STRING_DSAPARAMS,fp,
-               (char *)x, NULL,NULL,0,NULL));
-       }
-#endif
-
-int PEM_write_bio_DSAparams(BIO *bp, DSA *x)
-       {
-       return(PEM_ASN1_write_bio((int (*)())i2d_DSAparams,PEM_STRING_DSAPARAMS,
-               bp,(char *)x, NULL,NULL,0,NULL));
-       }
-#endif
-
-/* The Netscape Certificate sequence functions */
-
-#ifndef NO_FP_API
-NETSCAPE_CERT_SEQUENCE *PEM_read_NETSCAPE_CERT_SEQUENCE(FILE *fp,
-            NETSCAPE_CERT_SEQUENCE **x, int (*cb)())
-       {
-       return((NETSCAPE_CERT_SEQUENCE *)
-               PEM_ASN1_read((char *(*)())d2i_NETSCAPE_CERT_SEQUENCE,
-               PEM_STRING_X509,fp,(char **)x,cb));
-       }
-#endif
-
-NETSCAPE_CERT_SEQUENCE *PEM_read_bio_NETSCAPE_CERT_SEQUENCE(BIO *bp,
-            NETSCAPE_CERT_SEQUENCE **x, int (*cb)())
-       {
-       return((NETSCAPE_CERT_SEQUENCE *)
-               PEM_ASN1_read_bio((char *(*)())d2i_NETSCAPE_CERT_SEQUENCE,
-               PEM_STRING_X509,bp,(char **)x,cb));
-       }
-
-#ifndef NO_FP_API
-int PEM_write_NETSCAPE_CERT_SEQUENCE(FILE *fp, NETSCAPE_CERT_SEQUENCE *x)
-       {
-       return(PEM_ASN1_write((int (*)())i2d_NETSCAPE_CERT_SEQUENCE,
-               PEM_STRING_X509,fp, (char *)x, NULL,NULL,0,NULL));
-       }
-#endif
-
-int PEM_write_bio_NETSCAPE_CERT_SEQUENCE(BIO *bp, NETSCAPE_CERT_SEQUENCE *x)
-       {
-       return(PEM_ASN1_write_bio((int (*)())i2d_NETSCAPE_CERT_SEQUENCE,
-               PEM_STRING_X509,bp, (char *)x, NULL,NULL,0,NULL));
-       }
+/*
+ * DSA low level APIs are deprecated for public use, but still ok for
+ * internal use.
+ */
+#include "internal/deprecated.h"
 
+#include <stdio.h>
+#include "internal/cryptlib.h"
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pkcs7.h>
+#include <openssl/pem.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
+#include <openssl/dh.h>
+#include "pem_local.h"
+
+static RSA *pkey_get_rsa(EVP_PKEY *key, RSA **rsa);
+#ifndef OPENSSL_NO_DSA
+static DSA *pkey_get_dsa(EVP_PKEY *key, DSA **dsa);
+#endif
+
+#ifndef OPENSSL_NO_EC
+static EC_KEY *pkey_get_eckey(EVP_PKEY *key, EC_KEY **eckey);
+#endif
+
+IMPLEMENT_PEM_rw(X509_REQ, X509_REQ, PEM_STRING_X509_REQ, X509_REQ)
+
+IMPLEMENT_PEM_write(X509_REQ_NEW, X509_REQ, PEM_STRING_X509_REQ_OLD, X509_REQ)
+IMPLEMENT_PEM_rw(X509_CRL, X509_CRL, PEM_STRING_X509_CRL, X509_CRL)
+IMPLEMENT_PEM_rw(X509_PUBKEY, X509_PUBKEY, PEM_STRING_PUBLIC, X509_PUBKEY)
+IMPLEMENT_PEM_rw(PKCS7, PKCS7, PEM_STRING_PKCS7, PKCS7)
+
+IMPLEMENT_PEM_rw(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE,
+                 PEM_STRING_X509, NETSCAPE_CERT_SEQUENCE)
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+/*
+ * We treat RSA or DSA private keys as a special case. For private keys we
+ * read in an EVP_PKEY structure with PEM_read_bio_PrivateKey() and extract
+ * the relevant private key: this means can handle "traditional" and PKCS#8
+ * formats transparently.
+ */
+static RSA *pkey_get_rsa(EVP_PKEY *key, RSA **rsa)
+{
+    RSA *rtmp;
+    if (!key)
+        return NULL;
+    rtmp = EVP_PKEY_get1_RSA(key);
+    EVP_PKEY_free(key);
+    if (!rtmp)
+        return NULL;
+    if (rsa) {
+        RSA_free(*rsa);
+        *rsa = rtmp;
+    }
+    return rtmp;
+}
+
+RSA *PEM_read_bio_RSAPrivateKey(BIO *bp, RSA **rsa, pem_password_cb *cb,
+                                void *u)
+{
+    EVP_PKEY *pktmp;
+    pktmp = PEM_read_bio_PrivateKey(bp, NULL, cb, u);
+    return pkey_get_rsa(pktmp, rsa);
+}
+
+# ifndef OPENSSL_NO_STDIO
+
+RSA *PEM_read_RSAPrivateKey(FILE *fp, RSA **rsa, pem_password_cb *cb, void *u)
+{
+    EVP_PKEY *pktmp;
+    pktmp = PEM_read_PrivateKey(fp, NULL, cb, u);
+    return pkey_get_rsa(pktmp, rsa);
+}
+
+# endif
+
+IMPLEMENT_PEM_write_cb(RSAPrivateKey, RSA, PEM_STRING_RSA, RSAPrivateKey)
+IMPLEMENT_PEM_rw(RSAPublicKey, RSA, PEM_STRING_RSA_PUBLIC, RSAPublicKey)
+IMPLEMENT_PEM_rw(RSA_PUBKEY, RSA, PEM_STRING_PUBLIC, RSA_PUBKEY)
+#endif
+#ifndef OPENSSL_NO_DSA
+static DSA *pkey_get_dsa(EVP_PKEY *key, DSA **dsa)
+{
+    DSA *dtmp;
+    if (!key)
+        return NULL;
+    dtmp = EVP_PKEY_get1_DSA(key);
+    EVP_PKEY_free(key);
+    if (!dtmp)
+        return NULL;
+    if (dsa) {
+        DSA_free(*dsa);
+        *dsa = dtmp;
+    }
+    return dtmp;
+}
+
+DSA *PEM_read_bio_DSAPrivateKey(BIO *bp, DSA **dsa, pem_password_cb *cb,
+                                void *u)
+{
+    EVP_PKEY *pktmp;
+    pktmp = PEM_read_bio_PrivateKey(bp, NULL, cb, u);
+    return pkey_get_dsa(pktmp, dsa); /* will free pktmp */
+}
+
+IMPLEMENT_PEM_write_cb(DSAPrivateKey, DSA, PEM_STRING_DSA, DSAPrivateKey)
+IMPLEMENT_PEM_rw(DSA_PUBKEY, DSA, PEM_STRING_PUBLIC, DSA_PUBKEY)
+# ifndef OPENSSL_NO_STDIO
+DSA *PEM_read_DSAPrivateKey(FILE *fp, DSA **dsa, pem_password_cb *cb, void *u)
+{
+    EVP_PKEY *pktmp;
+    pktmp = PEM_read_PrivateKey(fp, NULL, cb, u);
+    return pkey_get_dsa(pktmp, dsa); /* will free pktmp */
+}
+
+# endif
+
+IMPLEMENT_PEM_rw(DSAparams, DSA, PEM_STRING_DSAPARAMS, DSAparams)
+#endif
+
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+# ifndef OPENSSL_NO_EC
+static EC_KEY *pkey_get_eckey(EVP_PKEY *key, EC_KEY **eckey)
+{
+    EC_KEY *dtmp;
+    if (!key)
+        return NULL;
+    dtmp = EVP_PKEY_get1_EC_KEY(key);
+    EVP_PKEY_free(key);
+    if (!dtmp)
+        return NULL;
+    if (eckey) {
+        EC_KEY_free(*eckey);
+        *eckey = dtmp;
+    }
+    return dtmp;
+}
+
+EC_KEY *PEM_read_bio_ECPrivateKey(BIO *bp, EC_KEY **key, pem_password_cb *cb,
+                                  void *u)
+{
+    EVP_PKEY *pktmp;
+    pktmp = PEM_read_bio_PrivateKey(bp, NULL, cb, u);
+    return pkey_get_eckey(pktmp, key); /* will free pktmp */
+}
+
+IMPLEMENT_PEM_rw(ECPKParameters, EC_GROUP, PEM_STRING_ECPARAMETERS,
+                 ECPKParameters)
+
+
+IMPLEMENT_PEM_write_cb(ECPrivateKey, EC_KEY, PEM_STRING_ECPRIVATEKEY,
+                       ECPrivateKey)
+IMPLEMENT_PEM_rw(EC_PUBKEY, EC_KEY, PEM_STRING_PUBLIC, EC_PUBKEY)
+#  ifndef OPENSSL_NO_STDIO
+EC_KEY *PEM_read_ECPrivateKey(FILE *fp, EC_KEY **eckey, pem_password_cb *cb,
+                              void *u)
+{
+    EVP_PKEY *pktmp;
+    pktmp = PEM_read_PrivateKey(fp, NULL, cb, u);
+    return pkey_get_eckey(pktmp, eckey); /* will free pktmp */
+}
+#  endif
+# endif /* !OPENSSL_NO_EC */
+#endif /* !OPENSSL_NO_DEPRECATED_3_0 */
+
+#ifndef OPENSSL_NO_DH
+
+IMPLEMENT_PEM_write(DHparams, DH, PEM_STRING_DHPARAMS, DHparams)
+IMPLEMENT_PEM_write(DHxparams, DH, PEM_STRING_DHXPARAMS, DHxparams)
+
+/* Transparently read in PKCS#3 or X9.42 DH parameters */
+
+DH *PEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u)
+{
+    char *nm = NULL;
+    const unsigned char *p = NULL;
+    unsigned char *data = NULL;
+    long len;
+    DH *ret = NULL;
+
+    if (!PEM_bytes_read_bio(&data, &len, &nm, PEM_STRING_DHPARAMS, bp, cb, u))
+        return NULL;
+    p = data;
+
+    if (strcmp(nm, PEM_STRING_DHXPARAMS) == 0)
+        ret = d2i_DHxparams(x, &p, len);
+    else
+        ret = d2i_DHparams(x, &p, len);
+
+    if (ret == NULL)
+        ERR_raise(ERR_LIB_PEM, ERR_R_ASN1_LIB);
+    OPENSSL_free(nm);
+    OPENSSL_free(data);
+    return ret;
+}
+
+# ifndef OPENSSL_NO_STDIO
+DH *PEM_read_DHparams(FILE *fp, DH **x, pem_password_cb *cb, void *u)
+{
+    BIO *b;
+    DH *ret;
+
+    if ((b = BIO_new(BIO_s_file())) == NULL) {
+        ERR_raise(ERR_LIB_PEM, ERR_R_BUF_LIB);
+        return 0;
+    }
+    BIO_set_fp(b, fp, BIO_NOCLOSE);
+    ret = PEM_read_bio_DHparams(b, x, cb, u);
+    BIO_free(b);
+    return ret;
+}
+# endif
+
+#endif
+IMPLEMENT_PEM_provided_write(PUBKEY, EVP_PKEY, pkey, PEM_STRING_PUBLIC, PUBKEY)