transparently handle X9.42 DH parameters

[openssl.git] / crypto / pem / pem_info.c

diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c
index 14e0643129392b0580e6b5053b7c416c03d16ebf..1b2be527edde007bf86c894d1f3b70f75bc6117e 100644 (file)
--- a/crypto/pem/pem_info.c
+++ b/crypto/pem/pem_info.c
@@ -63,8 +63,12 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
+#ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
+#endif
+#ifndef OPENSSL_NO_DSA
 #include <openssl/dsa.h>
+#endif
 
 #ifndef OPENSSL_NO_FP_API
 STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u)
@@ -94,8 +98,8 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pe
        long len,error=0;
        int ok=0;
        STACK_OF(X509_INFO) *ret=NULL;
-       unsigned int i,raw;
-       d2i_of_void *d2i;
+       unsigned int i,raw,ptype;
+       d2i_of_void *d2i = 0;
 
        if (sk == NULL)
                {
@@ -112,6 +116,7 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pe
        for (;;)
                {
                raw=0;
+               ptype = 0;
                i=PEM_read_bio(bp,&name,&header,&data,&len);
                if (i == 0)
                        {
@@ -127,7 +132,7 @@ start:
                if (    (strcmp(name,PEM_STRING_X509) == 0) ||
                        (strcmp(name,PEM_STRING_X509_OLD) == 0))
                        {
-                       (D2I_OF(X509))d2i=d2i_X509;
+                       d2i=(D2I_OF(void))d2i_X509;
                        if (xi->x509 != NULL)
                                {
                                if (!sk_X509_INFO_push(ret,xi)) goto err;
@@ -138,7 +143,7 @@ start:
                        }
                else if ((strcmp(name,PEM_STRING_X509_TRUSTED) == 0))
                        {
-                       (D2I_OF(X509))d2i=d2i_X509_AUX;
+                       d2i=(D2I_OF(void))d2i_X509_AUX;
                        if (xi->x509 != NULL)
                                {
                                if (!sk_X509_INFO_push(ret,xi)) goto err;
@@ -149,7 +154,7 @@ start:
                        }
                else if (strcmp(name,PEM_STRING_X509_CRL) == 0)
                        {
-                       (D2I_OF(X509_CRL))d2i=d2i_X509_CRL;
+                       d2i=(D2I_OF(void))d2i_X509_CRL;
                        if (xi->crl != NULL)
                                {
                                if (!sk_X509_INFO_push(ret,xi)) goto err;
@@ -162,7 +167,6 @@ start:
 #ifndef OPENSSL_NO_RSA
                        if (strcmp(name,PEM_STRING_RSA) == 0)
                        {
-                       (D2I_OF(RSA))d2i=d2i_RSAPrivateKey;
                        if (xi->x_pkey != NULL) 
                                {
                                if (!sk_X509_INFO_push(ret,xi)) goto err;
@@ -174,10 +178,8 @@ start:
                        xi->enc_len=0;
 
                        xi->x_pkey=X509_PKEY_new();
-                       if ((xi->x_pkey->dec_pkey=EVP_PKEY_new()) == NULL)
-                               goto err;
-                       xi->x_pkey->dec_pkey->type=EVP_PKEY_RSA;
-                       pp=&(xi->x_pkey->dec_pkey->pkey.rsa);
+                       ptype=EVP_PKEY_RSA;
+                       pp=&xi->x_pkey->dec_pkey;
                        if ((int)strlen(header) > 10) /* assume encrypted */
                                raw=1;
                        }
@@ -186,7 +188,7 @@ start:
 #ifndef OPENSSL_NO_DSA
                        if (strcmp(name,PEM_STRING_DSA) == 0)
                        {
-                       (D2I_OF(RSA))d2i=d2i_DSAPrivateKey;
+                       d2i=(D2I_OF(void))d2i_DSAPrivateKey;
                        if (xi->x_pkey != NULL) 
                                {
                                if (!sk_X509_INFO_push(ret,xi)) goto err;
@@ -198,10 +200,8 @@ start:
                        xi->enc_len=0;
 
                        xi->x_pkey=X509_PKEY_new();
-                       if ((xi->x_pkey->dec_pkey=EVP_PKEY_new()) == NULL)
-                               goto err;
-                       xi->x_pkey->dec_pkey->type=EVP_PKEY_DSA;
-                       pp=(char **)&(xi->x_pkey->dec_pkey->pkey.dsa);
+                       ptype = EVP_PKEY_DSA;
+                       pp=&xi->x_pkey->dec_pkey;
                        if ((int)strlen(header) > 10) /* assume encrypted */
                                raw=1;
                        }
@@ -210,7 +210,7 @@ start:
 #ifndef OPENSSL_NO_EC
                        if (strcmp(name,PEM_STRING_ECPRIVATEKEY) == 0)
                        {
-                               (D2I_OF(EC_KEY))d2i=d2i_ECPrivateKey;
+                               d2i=(D2I_OF(void))d2i_ECPrivateKey;
                                if (xi->x_pkey != NULL) 
                                {
                                        if (!sk_X509_INFO_push(ret,xi)) goto err;
@@ -222,10 +222,8 @@ start:
                        xi->enc_len=0;
  
                        xi->x_pkey=X509_PKEY_new();
-                       if ((xi->x_pkey->dec_pkey=EVP_PKEY_new()) == NULL)
-                               goto err;
-                       xi->x_pkey->dec_pkey->type=EVP_PKEY_EC;
-                       pp=&(xi->x_pkey->dec_pkey->pkey.eckey);
+                       ptype = EVP_PKEY_EC;
+                       pp=&xi->x_pkey->dec_pkey;
                        if ((int)strlen(header) > 10) /* assume encrypted */
                                raw=1;
                        }
@@ -247,7 +245,15 @@ start:
                                if (!PEM_do_header(&cipher,data,&len,cb,u))
                                        goto err;
                                p=data;
-                               if (d2i(pp,&p,len) == NULL)
+                               if (ptype)
+                                       {
+                                       if (!d2i_PrivateKey(ptype, pp, &p, len))
+                                               {
+                                               PEMerr(PEM_F_PEM_X509_INFO_READ_BIO,ERR_R_ASN1_LIB);
+                                               goto err;
+                                               }
+                                       }
+                               else if (d2i(pp,&p,len) == NULL)
                                        {
                                        PEMerr(PEM_F_PEM_X509_INFO_READ_BIO,ERR_R_ASN1_LIB);
                                        goto err;
@@ -333,6 +339,12 @@ int PEM_X509_INFO_write_bio(BIO *bp, X509_INFO *xi, EVP_CIPHER *enc,
                {
                if ( (xi->enc_data!=NULL) && (xi->enc_len>0) )
                        {
+                       if (enc == NULL)
+                               {
+                               PEMerr(PEM_F_PEM_X509_INFO_WRITE_BIO,PEM_R_CIPHER_IS_NULL);
+                               goto err;
+                               }
+
                        /* copy from weirdo names into more normal things */
                        iv=xi->enc_cipher.iv;
                        data=(unsigned char *)xi->enc_data;