Update NSS to NSS 3.14 Beta 1.

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

 /* 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/. */
 #include "cryptohi.h"
 #include "secasn1.h"
 #include "secitem.h"
 #include "prerr.h"
 
-#ifndef DSA_SUBPRIME_LEN
-#define DSA_SUBPRIME_LEN 20     /* bytes */
+#ifndef DSA1_SUBPRIME_LEN
+#define DSA1_SUBPRIME_LEN 20    /* bytes */
 #endif
 
 typedef struct {
     SECItem r;
     SECItem s;
 } DSA_ASN1Signature;
 
 const SEC_ASN1Template DSA_SignatureTemplate[] =
 {
     { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(DSA_ASN1Signature) },
@@ skipping 127 matching lines @@
     if (item == NULL)
         return SECFailure;
 
     /* XXX leak item? */
     return SECSuccess;
 }
 
 /* src is a DER-encoded ECDSA or DSA signature.
 ** Returns a newly-allocated SECItem structure, pointing at a newly allocated
 ** buffer containing the "raw" signature, which is len bytes of r,
-** followed by len bytes of s. For DSA, len is always DSA_SUBPRIME_LEN.
+** followed by len bytes of s. For DSA, len is the length of q.
 ** For ECDSA, len depends on the key size used to create the signature.
 */
 static SECItem *
 common_DecodeDerSig(const SECItem *item, unsigned int len)
 {
     SECItem *         result = NULL;
     SECStatus         status;
     DSA_ASN1Signature sig;
     SECItem           dst;
 
@@ skipping 37 matching lines @@
     return result;
 
 loser:
     if (result != NULL) {
         SECITEM_FreeItem(result, PR_TRUE);
         result = NULL;
     }
     goto done;
 }
 
-/* src is a "raw" DSA signature, 20 bytes of r followed by 20 bytes of s.
+/* src is a "raw" DSA1 signature, 20 bytes of r followed by 20 bytes of s.
 ** dest is the signature DER encoded. ?
 */
 SECStatus
 DSAU_EncodeDerSig(SECItem *dest, SECItem *src)
 {
-    PORT_Assert(src->len == 2 * DSA_SUBPRIME_LEN);
-    if (src->len != 2 * DSA_SUBPRIME_LEN) {
+    PORT_Assert(src->len == 2 * DSA1_SUBPRIME_LEN);
+    if (src->len != 2 * DSA1_SUBPRIME_LEN) {
         PORT_SetError( PR_INVALID_ARGUMENT_ERROR );
         return SECFailure;
     }
 
     return common_EncodeDerSig(dest, src);
 }
 
 /* src is a "raw" DSA signature of length len (len/2 bytes of r followed
 ** by len/2 bytes of s). dest is the signature DER encoded.
 */
 SECStatus
 DSAU_EncodeDerSigWithLen(SECItem *dest, SECItem *src, unsigned int len)
 {
 
     PORT_Assert((src->len == len) && (len % 2 == 0));
     if ((src->len != len) || (src->len % 2 != 0)) {
         PORT_SetError( PR_INVALID_ARGUMENT_ERROR );
         return SECFailure;
     }
 
     return common_EncodeDerSig(dest, src);
 }
 
 /* src is a DER-encoded DSA signature.
 ** Returns a newly-allocated SECItem structure, pointing at a newly allocated
-** buffer containing the "raw" DSA signature, which is 20 bytes of r,
+** buffer containing the "raw" DSA1 signature, which is 20 bytes of r,
 ** followed by 20 bytes of s.
 */
 SECItem *
 DSAU_DecodeDerSig(const SECItem *item)
 {
-    return common_DecodeDerSig(item, DSA_SUBPRIME_LEN);
+    return common_DecodeDerSig(item, DSA1_SUBPRIME_LEN);
 }
 
 /* src is a DER-encoded ECDSA signature.
 ** Returns a newly-allocated SECItem structure, pointing at a newly allocated
 ** buffer containing the "raw" ECDSA signature of length len containing
 ** r followed by s (both padded to take up exactly len/2 bytes).
 */
 SECItem *
 DSAU_DecodeDerSigToLen(const SECItem *item, unsigned int len)
 {
     return common_DecodeDerSig(item, len/2);
 }