Update NSS to NSS 3.14 Beta 1.

mozilla/security/nss/lib/freebl/blapit.h

 /*
  * blapit.h - public data structures for the crypto library
  *
  * 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: blapit.h,v 1.29 2012/06/14 18:55:10 wtc%google.com Exp $ */
 
 #ifndef _BLAPIT_H_
 #define _BLAPIT_H_
@@ skipping 25 matching lines @@
 #define NSS_AES_CBC             1
 
 /* Camellia operation modes */
 #define NSS_CAMELLIA                 0
 #define NSS_CAMELLIA_CBC             1
 
 /* SEED operation modes */
 #define NSS_SEED                0
 #define NSS_SEED_CBC            1
 
-#define DSA_SIGNATURE_LEN       40      /* Bytes */
-#define DSA_SUBPRIME_LEN        20      /* Bytes */
+#define DSA1_SUBPRIME_LEN       20                      /* Bytes */
+#define DSA1_SIGNATURE_LEN      (DSA1_SUBPRIME_LEN*2)   /* Bytes */
+#define DSA_MAX_SUBPRIME_LEN    32                      /* Bytes */
+#define DSA_MAX_SIGNATURE_LEN   (DSA_MAX_SUBPRIME_LEN*2)/* Bytes */
+
+/*
+ * Mark the old defines as deprecated. This will warn code that expected
+ * DSA1 only that they need to change if the are to support DSA2.
+ */
+#if defined(__GNUC__) && (__GNUC__ > 3)
+/* make GCC warn when we use these #defines */
+typedef int __BLAPI_DEPRECATED __attribute__((deprecated));
+#define DSA_SUBPRIME_LEN ((__BLAPI_DEPRECATED)DSA1_SUBPRIME_LEN)
+#define DSA_SIGNATURE_LEN ((__BLAPI_DEPRECATED)DSA1_SIGNATURE_LEN)
+#define DSA_Q_BITS ((__BLAPI_DEPRECATED)(DSA1_SUBPRIME_LEN*8))
+#else
+#ifdef _WIN32
+/* This magic gets the windows compiler to give us a deprecation
+ * warning */
+#pragma deprecated(DSA_SUBPRIME_LEN, DSA_SIGNATURE_LEN, DSA_QBITS)
+#endif
+#define DSA_SUBPRIME_LEN  DSA1_SUBPRIME_LEN
+#define DSA_SIGNATURE_LEN DSA1_SIGNATURE_LEN
+#define DSA_Q_BITS        (DSA1_SUBPRIME_LEN*8)
+#endif
+
 
 /* XXX We shouldn't have to hard code this limit. For
  * now, this is the quickest way to support ECDSA signature
  * processing (ECDSA signature lengths depend on curve
  * size). This limit is sufficient for curves upto
  * 576 bits.
  */
 #define MAX_ECKEY_LEN           72      /* Bytes */
 
 /* EC point compression format */
@@ skipping 40 matching lines @@
 #define SEED_BLOCK_SIZE 16              /* bytes */
 #define SEED_KEY_LENGTH 16              /* bytes */
 
 #define NSS_FREEBL_DEFAULT_CHUNKSIZE 2048
 
 /*
  * These values come from the initial key size limits from the PKCS #11
  * module. They may be arbitrarily adjusted to any value freebl supports.
  */
 #define RSA_MIN_MODULUS_BITS   128
-#define RSA_MAX_MODULUS_BITS  8192
+#define RSA_MAX_MODULUS_BITS 16384
 #define RSA_MAX_EXPONENT_BITS   64
 #define DH_MIN_P_BITS          128
-#define DH_MAX_P_BITS         3072
+#define DH_MAX_P_BITS        16384
 
 /*
- * The FIPS 186 algorithm for generating primes P and Q allows only 9
+ * The FIPS 186-1 algorithm for generating primes P and Q allows only 9
  * distinct values for the length of P, and only one value for the
  * length of Q.
  * The algorithm uses a variable j to indicate which of the 9 lengths
  * of P is to be used.
  * The following table relates j to the lengths of P and Q in bits.
  *
  *      j       bits in P       bits in Q
  *      _       _________       _________
  *      0        512            160
  *      1        576            160
  *      2        640            160
  *      3        704            160
  *      4        768            160
  *      5        832            160
  *      6        896            160
  *      7        960            160
  *      8       1024            160
  *
- * The FIPS-186 compliant PQG generator takes j as an input parameter.
+ * The FIPS-186-1 compliant PQG generator takes j as an input parameter.
+ *
+ * FIPS 186-3 algorithm specifies 4 distinct P and Q sizes:
+ *
+ *     bits in P       bits in Q
+ *     _________       _________
+ *      1024           160
+ *      2048           224
+ *      2048           256
+ *      3072           256
+ *
+ * The FIPS-186-3 complaiant PQG generator (PQG V2) takes arbitrary p and q
+ * lengths as input and returns an error if they aren't in this list.
  */
 
-#define DSA_Q_BITS       160
-#define DSA_MAX_P_BITS  1024
+#define DSA1_Q_BITS      160
+#define DSA_MAX_P_BITS  3072
 #define DSA_MIN_P_BITS   512
+#define DSA_MAX_Q_BITS   256
+#define DSA_MIN_Q_BITS   160
+
+#if DSA_MAX_Q_BITS != DSA_MAX_SUBPRIME_LEN*8
+#error "Inconsistent declaration of DSA SUBPRIME/Q parameters in blapit.h"
+#endif
+
 
 /*
  * function takes desired number of bits in P,
  * returns index (0..8) or -1 if number of bits is invalid.
  */
 #define PQG_PBITS_TO_INDEX(bits) \
     (((bits) < 512 || (bits) > 1024 || (bits) % 64) ? \
     -1 : (int)((bits)-512)/64)
 
 /*
@@ skipping 211 matching lines @@
                                    int, 
                                    unsigned int ,
                                    unsigned int );
 typedef SECStatus (*BLapiEncrypt)(void *cx, unsigned char *output,
                                 unsigned int *outputLen, 
                                 unsigned int maxOutputLen,
                                 const unsigned char *input, 
                                 unsigned int inputLen);
 
 #endif /* _BLAPIT_H_ */