1 files changed, 94 insertions, 386 deletions

diff --git a/src/lib/libcrypto/pem/pem_all.c b/src/lib/libcrypto/pem/pem_all.c
index d1cda7aabe..e72b7134ce 100644
--- a/src/lib/libcrypto/pem/pem_all.c
+++ b/src/lib/libcrypto/pem/pem_all.c
@@ -59,430 +59,138 @@
 #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(fp,x,cb)
-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(bp,x,cb)
-BIO *bp;
-X509 **x;
-int (*cb)();
-        {
-        return((X509 *)PEM_ASN1_read_bio((char *(*)())d2i_X509,
-                PEM_STRING_X509,bp,(char **)x,cb));
-        }
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pkcs7.h>
+#include <openssl/pem.h>
 
-#ifndef NO_FP_API
-int PEM_write_X509(fp,x)
-FILE *fp;
-X509 *x;
-        {
-        return(PEM_ASN1_write((int (*)())i2d_X509,PEM_STRING_X509,fp,
-                (char *)x, NULL,NULL,0,NULL));
-        }
+#ifndef OPENSSL_NO_RSA
+static RSA *pkey_get_rsa(EVP_PKEY *key, RSA **rsa);
 #endif
-
-int PEM_write_bio_X509(bp,x)
-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(fp,x,cb)
-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));
-        }
+#ifndef OPENSSL_NO_DSA
+static DSA *pkey_get_dsa(EVP_PKEY *key, DSA **dsa);
 #endif
 
-X509_REQ *PEM_read_bio_X509_REQ(bp,x,cb)
-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));
-        }
+IMPLEMENT_PEM_rw(X509_REQ, X509_REQ, PEM_STRING_X509_REQ, X509_REQ)
 
-#ifndef NO_FP_API
-int PEM_write_X509_REQ(fp,x)
-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
+IMPLEMENT_PEM_write(X509_REQ_NEW, X509_REQ, PEM_STRING_X509_REQ_OLD, X509_REQ)
 
-int PEM_write_bio_X509_REQ(bp,x)
-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));
-        }
+IMPLEMENT_PEM_rw(X509_CRL, X509_CRL, PEM_STRING_X509_CRL, X509_CRL)
 
-#ifndef NO_FP_API
-/* The X509_CRL functions */
-X509_CRL *PEM_read_X509_CRL(fp,x,cb)
-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
+IMPLEMENT_PEM_rw(PKCS7, PKCS7, PEM_STRING_PKCS7, PKCS7)
 
-X509_CRL *PEM_read_bio_X509_CRL(bp,x,cb)
-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));
-        }
+IMPLEMENT_PEM_rw(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE,
+                                        PEM_STRING_X509, NETSCAPE_CERT_SEQUENCE)
 
-#ifndef NO_FP_API
-int PEM_write_X509_CRL(fp,x)
-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(bp,x)
-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(fp,x,cb)
-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(fp,x,cb)
-FILE *fp;
-RSA **x;
-int (*cb)();
-        {
-        return((RSA *)PEM_ASN1_read((char *(*)())d2i_RSAPublicKey,
-                PEM_STRING_RSA_PUBLIC,fp,(char **)x,cb));
-        }
-#endif
+#ifndef OPENSSL_NO_RSA
 
-RSA *PEM_read_bio_RSAPrivateKey(bp,x,cb)
-BIO *bp;
-RSA **x;
-int (*cb)();
-        {
-        return((RSA *)PEM_ASN1_read_bio((char *(*)())d2i_RSAPrivateKey,
-                PEM_STRING_RSA,bp,(char **)x,cb));
-        }
+/* 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.
+ */
 
-RSA *PEM_read_bio_RSAPublicKey(bp,x,cb)
-BIO *bp;
-RSA **x;
-int (*cb)();
-        {
-        return((RSA *)PEM_ASN1_read_bio((char *(*)())d2i_RSAPublicKey,
-                PEM_STRING_RSA_PUBLIC,bp,(char **)x,cb));
+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;
+}
 
-#ifndef NO_FP_API
-int PEM_write_RSAPrivateKey(fp,x,enc,kstr,klen,cb)
-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));
-        }
+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);
+}
 
-int PEM_write_RSAPublicKey(fp,x)
-FILE *fp;
-RSA *x;
-        {
-        return(PEM_ASN1_write((int (*)())i2d_RSAPublicKey,
-                PEM_STRING_RSA_PUBLIC,fp,
-                (char *)x,NULL,NULL,0,NULL));
-        }
-#endif
+#ifndef OPENSSL_NO_FP_API
 
-int PEM_write_bio_RSAPrivateKey(bp,x,enc,kstr,klen,cb)
-BIO *bp;
-RSA *x;
-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));
-        }
+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);
+}
 
-int PEM_write_bio_RSAPublicKey(bp,x)
-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(fp,x,cb)
-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(bp,x,cb)
-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(fp,x,enc,kstr,klen,cb)
-FILE *fp;
-DSA *x;
-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
+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)
 
-int PEM_write_bio_DSAPrivateKey(bp,x,enc,kstr,klen,cb)
-BIO *bp;
-DSA *x;
-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(fp,x,cb)
-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
+#ifndef OPENSSL_NO_DSA
 
-EVP_PKEY *PEM_read_bio_PrivateKey(bp,x,cb)
-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));
+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;
+}
 
-#ifndef NO_FP_API
-int PEM_write_PrivateKey(fp,x,enc,kstr,klen,cb)
-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
+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);
+}
 
-int PEM_write_bio_PrivateKey(bp,x,enc,kstr,klen,cb)
-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));
-        }
+IMPLEMENT_PEM_write_cb(DSAPrivateKey, DSA, PEM_STRING_DSA, DSAPrivateKey)
+IMPLEMENT_PEM_rw(DSA_PUBKEY, DSA, PEM_STRING_PUBLIC, DSA_PUBKEY)
 
-#ifndef NO_FP_API
-/* The PKCS7 functions */
-PKCS7 *PEM_read_PKCS7(fp,x,cb)
-FILE *fp;
-PKCS7 **x;
-int (*cb)();
-        {
-        return((PKCS7 *)PEM_ASN1_read((char *(*)())d2i_PKCS7,
-                PEM_STRING_PKCS7,fp,(char **)x,cb));
-        }
-#endif
+#ifndef OPENSSL_NO_FP_API
 
-PKCS7 *PEM_read_bio_PKCS7(bp,x,cb)
-BIO *bp;
-PKCS7 **x;
-int (*cb)();
-        {
-        return((PKCS7 *)PEM_ASN1_read_bio((char *(*)())d2i_PKCS7,
-                PEM_STRING_PKCS7,bp,(char **)x,cb));
-        }
+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);
+}
 
-#ifndef NO_FP_API
-int PEM_write_PKCS7(fp,x)
-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(bp,x)
-BIO *bp;
-PKCS7 *x;
-        {
-        return(PEM_ASN1_write_bio((int (*)())i2d_PKCS7,PEM_STRING_PKCS7,bp,
-                (char *)x, NULL,NULL,0,NULL));
-        }
+IMPLEMENT_PEM_rw(DSAparams, DSA, PEM_STRING_DSAPARAMS, DSAparams)
 
-#ifndef NO_DH
-#ifndef NO_FP_API
-/* The DHparams functions */
-DH *PEM_read_DHparams(fp,x,cb)
-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(bp,x,cb)
-BIO *bp;
-DH **x;
-int (*cb)();
-        {
-        return((DH *)PEM_ASN1_read_bio((char *(*)())d2i_DHparams,
-                PEM_STRING_DHPARAMS,bp,(char **)x,cb));
-        }
+#ifndef OPENSSL_NO_DH
 
-#ifndef NO_FP_API
-int PEM_write_DHparams(fp,x)
-FILE *fp;
-DH *x;
-        {
-        return(PEM_ASN1_write((int (*)())i2d_DHparams,PEM_STRING_DHPARAMS,fp,
-                (char *)x, NULL,NULL,0,NULL));
-        }
-#endif
+IMPLEMENT_PEM_rw(DHparams, DH, PEM_STRING_DHPARAMS, DHparams)
 
-int PEM_write_bio_DHparams(bp,x)
-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(fp,x,cb)
-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(bp,x,cb)
-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(fp,x)
-FILE *fp;
-DSA *x;
-        {
-        return(PEM_ASN1_write((int (*)())i2d_DSAparams,PEM_STRING_DSAPARAMS,fp,
-                (char *)x, NULL,NULL,0,NULL));
-        }
-#endif
+/* The PrivateKey case is not that straightforward.
+ *   IMPLEMENT_PEM_rw_cb(PrivateKey, EVP_PKEY, PEM_STRING_EVP_PKEY, PrivateKey)
+ * does not work, RSA and DSA keys have specific strings.
+ * (When reading, parameter PEM_STRING_EVP_PKEY is a wildcard for anything
+ * appropriate.)
+ */
+IMPLEMENT_PEM_write_cb(PrivateKey, EVP_PKEY, ((x->type == EVP_PKEY_DSA)?PEM_STRING_DSA:PEM_STRING_RSA), PrivateKey)
 
-int PEM_write_bio_DSAparams(bp,x)
-BIO *bp;
-DSA *x;
-        {
-        return(PEM_ASN1_write_bio((int (*)())i2d_DSAparams,PEM_STRING_DSAPARAMS,
-                bp,(char *)x, NULL,NULL,0,NULL));
-        }
-#endif
+IMPLEMENT_PEM_rw(PUBKEY, EVP_PKEY, PEM_STRING_PUBLIC, PUBKEY)