Prepare for 1.0.1l release

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

diff --git a/crypto/pem/pem_all.c b/crypto/pem/pem_all.c
index a9ac52de02b9d543b0c6c7073f3386a8c356072e..eac0460e3ebec9342a16a338b1d0f7599a99a800 100644 (file)
--- a/crypto/pem/pem_all.c
+++ b/crypto/pem/pem_all.c
@@ -110,16 +110,21 @@
  */
 
 #include <stdio.h>
-#undef SSLEAY_MACROS
 #include "cryptlib.h"
 #include <openssl/bio.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pkcs7.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_DH
 #include <openssl/dh.h>
+#endif
 
 #ifndef OPENSSL_NO_RSA
 static RSA *pkey_get_rsa(EVP_PKEY *key, RSA **rsa);
@@ -188,7 +193,61 @@ RSA *PEM_read_RSAPrivateKey(FILE *fp, RSA **rsa, pem_password_cb *cb,
 
 #endif
 
+#ifdef OPENSSL_FIPS
+
+int PEM_write_bio_RSAPrivateKey(BIO *bp, RSA *x, const EVP_CIPHER *enc,
+                                               unsigned char *kstr, int klen,
+                                               pem_password_cb *cb, void *u)
+{
+       if (FIPS_mode())
+               {
+               EVP_PKEY *k;
+               int ret;
+               k = EVP_PKEY_new();
+               if (!k)
+                       return 0;
+               EVP_PKEY_set1_RSA(k, x);
+
+               ret = PEM_write_bio_PrivateKey(bp, k, enc, kstr, klen, cb, u);
+               EVP_PKEY_free(k);
+               return ret;
+               }
+       else
+               return PEM_ASN1_write_bio((i2d_of_void *)i2d_RSAPrivateKey,
+                                       PEM_STRING_RSA,bp,x,enc,kstr,klen,cb,u);
+}
+
+#ifndef OPENSSL_NO_FP_API
+int PEM_write_RSAPrivateKey(FILE *fp, RSA *x, const EVP_CIPHER *enc,
+                                               unsigned char *kstr, int klen,
+                                               pem_password_cb *cb, void *u)
+{
+       if (FIPS_mode())
+               {
+               EVP_PKEY *k;
+               int ret;
+               k = EVP_PKEY_new();
+               if (!k)
+                       return 0;
+
+               EVP_PKEY_set1_RSA(k, x);
+
+               ret = PEM_write_PrivateKey(fp, k, enc, kstr, klen, cb, u);
+               EVP_PKEY_free(k);
+               return ret;
+               }
+       else
+               return PEM_ASN1_write((i2d_of_void *)i2d_RSAPrivateKey,
+                                       PEM_STRING_RSA,fp,x,enc,kstr,klen,cb,u);
+}
+#endif
+
+#else
+
 IMPLEMENT_PEM_write_cb_const(RSAPrivateKey, RSA, PEM_STRING_RSA, RSAPrivateKey)
+
+#endif
+
 IMPLEMENT_PEM_rw_const(RSAPublicKey, RSA, PEM_STRING_RSA_PUBLIC, RSAPublicKey)
 IMPLEMENT_PEM_rw(RSA_PUBKEY, RSA, PEM_STRING_PUBLIC, RSA_PUBKEY)
 
@@ -215,10 +274,62 @@ DSA *PEM_read_bio_DSAPrivateKey(BIO *bp, DSA **dsa, pem_password_cb *cb,
 {
        EVP_PKEY *pktmp;
        pktmp = PEM_read_bio_PrivateKey(bp, NULL, cb, u);
-       return pkey_get_dsa(pktmp, dsa);
+       return pkey_get_dsa(pktmp, dsa);        /* will free pktmp */
+}
+
+#ifdef OPENSSL_FIPS
+
+int PEM_write_bio_DSAPrivateKey(BIO *bp, DSA *x, const EVP_CIPHER *enc,
+                                               unsigned char *kstr, int klen,
+                                               pem_password_cb *cb, void *u)
+{
+       if (FIPS_mode())
+               {
+               EVP_PKEY *k;
+               int ret;
+               k = EVP_PKEY_new();
+               if (!k)
+                       return 0;
+               EVP_PKEY_set1_DSA(k, x);
+
+               ret = PEM_write_bio_PrivateKey(bp, k, enc, kstr, klen, cb, u);
+               EVP_PKEY_free(k);
+               return ret;
+               }
+       else
+               return PEM_ASN1_write_bio((i2d_of_void *)i2d_DSAPrivateKey,
+                                       PEM_STRING_DSA,bp,x,enc,kstr,klen,cb,u);
+}
+
+#ifndef OPENSSL_NO_FP_API
+int PEM_write_DSAPrivateKey(FILE *fp, DSA *x, const EVP_CIPHER *enc,
+                                               unsigned char *kstr, int klen,
+                                               pem_password_cb *cb, void *u)
+{
+       if (FIPS_mode())
+               {
+               EVP_PKEY *k;
+               int ret;
+               k = EVP_PKEY_new();
+               if (!k)
+                       return 0;
+               EVP_PKEY_set1_DSA(k, x);
+               ret = PEM_write_PrivateKey(fp, k, enc, kstr, klen, cb, u);
+               EVP_PKEY_free(k);
+               return ret;
+               }
+       else
+               return PEM_ASN1_write((i2d_of_void *)i2d_DSAPrivateKey,
+                                       PEM_STRING_DSA,fp,x,enc,kstr,klen,cb,u);
 }
+#endif
+
+#else
 
 IMPLEMENT_PEM_write_cb_const(DSAPrivateKey, DSA, PEM_STRING_DSA, DSAPrivateKey)
+
+#endif
+
 IMPLEMENT_PEM_rw(DSA_PUBKEY, DSA, PEM_STRING_PUBLIC, DSA_PUBKEY)
 
 #ifndef OPENSSL_NO_FP_API
@@ -228,7 +339,7 @@ DSA *PEM_read_DSAPrivateKey(FILE *fp, DSA **dsa, pem_password_cb *cb,
 {
        EVP_PKEY *pktmp;
        pktmp = PEM_read_PrivateKey(fp, NULL, cb, u);
-       return pkey_get_dsa(pktmp, dsa);
+       return pkey_get_dsa(pktmp, dsa);        /* will free pktmp */
 }
 
 #endif
@@ -259,13 +370,68 @@ EC_KEY *PEM_read_bio_ECPrivateKey(BIO *bp, EC_KEY **key, pem_password_cb *cb,
 {
        EVP_PKEY *pktmp;
        pktmp = PEM_read_bio_PrivateKey(bp, NULL, cb, u);
-       return pkey_get_eckey(pktmp, key);
+       return pkey_get_eckey(pktmp, key);      /* will free pktmp */
 }
 
 IMPLEMENT_PEM_rw_const(ECPKParameters, EC_GROUP, PEM_STRING_ECPARAMETERS, ECPKParameters)
 
+
+
+#ifdef OPENSSL_FIPS
+
+int PEM_write_bio_ECPrivateKey(BIO *bp, EC_KEY *x, const EVP_CIPHER *enc,
+                                               unsigned char *kstr, int klen,
+                                               pem_password_cb *cb, void *u)
+{
+       if (FIPS_mode())
+               {
+               EVP_PKEY *k;
+               int ret;
+               k = EVP_PKEY_new();
+               if (!k)
+                       return 0;
+               EVP_PKEY_set1_EC_KEY(k, x);
+
+               ret = PEM_write_bio_PrivateKey(bp, k, enc, kstr, klen, cb, u);
+               EVP_PKEY_free(k);
+               return ret;
+               }
+       else
+               return PEM_ASN1_write_bio((i2d_of_void *)i2d_ECPrivateKey,
+                                               PEM_STRING_ECPRIVATEKEY,
+                                               bp,x,enc,kstr,klen,cb,u);
+}
+
+#ifndef OPENSSL_NO_FP_API
+int PEM_write_ECPrivateKey(FILE *fp, EC_KEY *x, const EVP_CIPHER *enc,
+                                               unsigned char *kstr, int klen,
+                                               pem_password_cb *cb, void *u)
+{
+       if (FIPS_mode())
+               {
+               EVP_PKEY *k;
+               int ret;
+               k = EVP_PKEY_new();
+               if (!k)
+                       return 0;
+               EVP_PKEY_set1_EC_KEY(k, x);
+               ret = PEM_write_PrivateKey(fp, k, enc, kstr, klen, cb, u);
+               EVP_PKEY_free(k);
+               return ret;
+               }
+       else
+               return PEM_ASN1_write((i2d_of_void *)i2d_ECPrivateKey,
+                                               PEM_STRING_ECPRIVATEKEY,
+                                               fp,x,enc,kstr,klen,cb,u);
+}
+#endif
+
+#else
+
 IMPLEMENT_PEM_write_cb(ECPrivateKey, EC_KEY, PEM_STRING_ECPRIVATEKEY, ECPrivateKey)
 
+#endif
+
 IMPLEMENT_PEM_rw(EC_PUBKEY, EC_KEY, PEM_STRING_PUBLIC, EC_PUBKEY)
 
 #ifndef OPENSSL_NO_FP_API
@@ -275,7 +441,7 @@ EC_KEY *PEM_read_ECPrivateKey(FILE *fp, EC_KEY **eckey, pem_password_cb *cb,
 {
        EVP_PKEY *pktmp;
        pktmp = PEM_read_PrivateKey(fp, NULL, cb, u);
-       return pkey_get_eckey(pktmp, eckey);
+       return pkey_get_eckey(pktmp, eckey);    /* will free pktmp */
 }
 
 #endif
@@ -288,15 +454,4 @@ IMPLEMENT_PEM_rw_const(DHparams, DH, PEM_STRING_DHPARAMS, DHparams)
 
 #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:\
-                       (x->type == EVP_PKEY_RSA)?PEM_STRING_RSA:PEM_STRING_ECPRIVATEKEY), PrivateKey)
-
 IMPLEMENT_PEM_rw(PUBKEY, EVP_PKEY, PEM_STRING_PUBLIC, PUBKEY)
-