PKCS#8 support for alternative PRFs.

Add option to set an alternative to the default hmacWithSHA1 PRF
for PKCS#8 private key encryptions. This is used automatically
by PKCS8_encrypt if the nid specified is a PRF.

Add option to pkcs8 utility.

Update docs.
(cherry picked from commit b60272b01fcb4f69201b3e1659b4f7e9e9298dfb)

diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index 7edeb179dd1afd52bf8d7d35bfaa5432094756a2..dc9e1ef66fc36d0004ef6194082f2f3680f79c4a 100644 (file)
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -135,6 +135,22 @@ int MAIN(int argc, char **argv)
                        else
                                badarg = 1;
                        }
+               else if (!strcmp(*args,"-v2prf"))
+                       {
+                       if (args[1])
+                               {
+                               args++;
+                               pbe_nid=OBJ_txt2nid(*args);
+                               if (!EVP_PBE_find(EVP_PBE_TYPE_PRF, pbe_nid, NULL, NULL, 0))
+                                       {
+                                       BIO_printf(bio_err,
+                                                "Unknown PRF algorithm %s\n", *args);
+                                       badarg = 1;
+                                       }
+                               }
+                       else
+                               badarg = 1;
+                       }
                else if (!strcmp(*args,"-inform"))
                        {
                        if (args[1])

diff --git a/crypto/pkcs12/p12_p8e.c b/crypto/pkcs12/p12_p8e.c
index bf20a77b4c7420279d8db00ccaab7c08b526f68b..1adb969fc40068bf82055a9ebeccf218f3a379e4 100644 (file)
--- a/crypto/pkcs12/p12_p8e.c
+++ b/crypto/pkcs12/p12_p8e.c
@@ -73,8 +73,15 @@ X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher,
                goto err;
        }
 
-       if(pbe_nid == -1) pbe = PKCS5_pbe2_set(cipher, iter, salt, saltlen);
-       else pbe = PKCS5_pbe_set(pbe_nid, iter, salt, saltlen);
+       if(pbe_nid == -1)
+               pbe = PKCS5_pbe2_set(cipher, iter, salt, saltlen);
+       else if (EVP_PBE_find(EVP_PBE_TYPE_PRF, pbe_nid, NULL, NULL, 0))
+               pbe = PKCS5_pbe2_set_iv(cipher, iter, salt, saltlen, NULL, pbe_nid);
+       else
+               {
+               ERR_clear_error();
+               pbe = PKCS5_pbe_set(pbe_nid, iter, salt, saltlen);
+               }
        if(!pbe) {
                PKCS12err(PKCS12_F_PKCS8_ENCRYPT, ERR_R_ASN1_LIB);
                goto err;

diff --git a/doc/apps/pkcs8.pod b/doc/apps/pkcs8.pod
index 84abee78f3ebbf77a78087b6891cd4dabf274a1d..6901f1f3f2112ecbb60540a58b68d52e69c2ae1e 100644 (file)
--- a/doc/apps/pkcs8.pod
+++ b/doc/apps/pkcs8.pod
@@ -20,6 +20,7 @@ B<openssl> B<pkcs8>
 [B<-embed>]
 [B<-nsdb>]
 [B<-v2 alg>]
+[B<-v2prf alg>]
 [B<-v1 alg>]
 [B<-engine id>]
 
@@ -118,6 +119,12 @@ private keys with OpenSSL then this doesn't matter.
 The B<alg> argument is the encryption algorithm to use, valid values include
 B<des>, B<des3> and B<rc2>. It is recommended that B<des3> is used.
 
+=item B<-v2prf alg>
+
+This option sets the PRF algorithm to use with PKCS#5 v2.0. A typical value
+values would be B<hmacWithSHA256>. If this option isn't set then the default
+for the cipher is used or B<hmacWithSHA1> if there is no default.
+
 =item B<-v1 alg>
 
 This option specifies a PKCS#5 v1.5 or PKCS#12 algorithm to use. A complete
@@ -195,6 +202,11 @@ DES:
 
  openssl pkcs8 -in key.pem -topk8 -v2 des3 -out enckey.pem
 
+Convert a private from traditional to PKCS#5 v2.0 format using AES with
+256 bits in CBC mode and B<hmacWithSHA256> PRF:
+
+ openssl pkcs8 -in key.pem -topk8 -v2 aes-256-cbc -v2prf hmacWithSHA256 -out enckey.pem
+
 Convert a private key to PKCS#8 using a PKCS#5 1.5 compatible algorithm
 (DES):