Bug 1346239 - pk12util can't import RSA-PSS certificate+key file to NSS database, r=kaie, r=rrelyea
authorDaiki Ueno <dueno@redhat.com>
Mon, 13 Mar 2017 11:27:13 +0100
changeset 13207 560e80c021a543a21d174eea1465a52fec290563
parent 13204 97406323124d75e17bd4a88f98337580f9f1aa7f
child 13208 81a1d9f72ea5b08a95b837e9395e883ac8b9553c
push id2078
push userkaie@kuix.de
push dateWed, 15 Mar 2017 09:37:31 +0000
reviewerskaie, rrelyea
bugs1346239
Bug 1346239 - pk12util can't import RSA-PSS certificate+key file to NSS database, r=kaie, r=rrelyea
lib/softoken/pkcs11c.c
--- a/lib/softoken/pkcs11c.c
+++ b/lib/softoken/pkcs11c.c
@@ -5586,16 +5586,17 @@ sftk_unwrapPrivateKey(SFTKObject *key, S
                                                   sizeof(NSSLOWKEYPrivateKey));
     if (lpk == NULL) {
         goto loser;
     }
     lpk->arena = arena;
 
     switch (SECOID_GetAlgorithmTag(&pki->algorithm)) {
         case SEC_OID_PKCS1_RSA_ENCRYPTION:
+        case SEC_OID_PKCS1_RSA_PSS_SIGNATURE:
             keyTemplate = nsslowkey_RSAPrivateKeyTemplate;
             paramTemplate = NULL;
             paramDest = NULL;
             lpk->keyType = NSSLOWKEYRSAKey;
             prepare_low_rsa_priv_key_for_asn1(lpk);
             break;
         case SEC_OID_ANSIX9_DSA_SIGNATURE:
             keyTemplate = nsslowkey_DSAPrivateKeyExportTemplate;