Update NSS to NSS 3.14 pre-release snapshot 2012-06-26 01:00:00 PDT.

mozilla/security/nss/lib/cryptohi/secsign.c

 /*
  * Signature stuff.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /* $Id: secsign.c,v 1.29 2012/06/25 21:48:39 rrelyea%redhat.com Exp $ */
 
 #include <stdio.h>
 #include "cryptohi.h"
@@ skipping 308 matching lines @@
     /* XXX We should probably have some asserts here to make sure the key type
      * and algID match
      */
 
     if (algID == SEC_OID_UNKNOWN) {
         switch(pk->keyType) {
           case rsaKey:
             algID = SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION;
             break;
           case dsaKey:
-            algID = SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST;
+            /* get Signature length (= q_len*2) and work from there */
+            switch (PK11_SignatureLen(pk)) {
+                case 448:
+                    algID = SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA224_DIGEST;
+                    break;
+                case 512:
+                    algID = SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA256_DIGEST;
+                    break;
+                default:
+                    algID = SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST;
+                    break;
+            }
             break;
           case ecKey:
             algID = SEC_OID_ANSIX962_ECDSA_SIGNATURE_WITH_SHA1_DIGEST;
             break;
           default:
             PORT_SetError(SEC_ERROR_INVALID_KEY);
             return SECFailure;
         }
     }
 
@@ skipping 115 matching lines @@
             sigTag = SEC_OID_PKCS1_SHA512_WITH_RSA_ENCRYPTION;  break;
         default:
             break;
         }
         break;
     case dsaKey:
         switch (hashAlgTag) {
         case SEC_OID_UNKNOWN:   /* default for DSA if not specified */
         case SEC_OID_SHA1:
             sigTag = SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST; break;
+        case SEC_OID_SHA224:
+            sigTag = SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA224_DIGEST; break;
+        case SEC_OID_SHA256:
+            sigTag = SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA256_DIGEST; break;
         default:
             break;
         }
         break;
     case ecKey:
         switch (hashAlgTag) {
         case SEC_OID_UNKNOWN:   /* default for ECDSA if not specified */
         case SEC_OID_SHA1:
             sigTag = SEC_OID_ANSIX962_ECDSA_SHA1_SIGNATURE; break;
         case SEC_OID_SHA224:
             sigTag = SEC_OID_ANSIX962_ECDSA_SHA224_SIGNATURE; break;
         case SEC_OID_SHA256:
             sigTag = SEC_OID_ANSIX962_ECDSA_SHA256_SIGNATURE; break;
         case SEC_OID_SHA384:
             sigTag = SEC_OID_ANSIX962_ECDSA_SHA384_SIGNATURE; break;
         case SEC_OID_SHA512:
             sigTag = SEC_OID_ANSIX962_ECDSA_SHA512_SIGNATURE; break;
         default:
         break;
         }
     default:
         break;
     }
     return sigTag;
 }