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

mozilla/security/nss/lib/softoken/pkcs11.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/. */
 /*
  * This file implements PKCS 11 on top of our existing security modules
  *
  * For more information about PKCS 11 See PKCS 11 Token Inteface Standard.
  *   This implementation has two slots:
  *      slot 1 is our generic crypto support. It does not require login.
  *   It supports Public Key ops, and all they bulk ciphers and hashes. 
@@ skipping 272 matching lines @@
                                  CKF_SN_VR},    PR_TRUE},
      {CKM_SHA384_RSA_PKCS,      {RSA_MIN_MODULUS_BITS,CK_MAX,
                                  CKF_SN_VR},    PR_TRUE},
      {CKM_SHA512_RSA_PKCS,      {RSA_MIN_MODULUS_BITS,CK_MAX,
                                  CKF_SN_VR},    PR_TRUE},
      /* ------------------------- DSA Operations --------------------------- */
      {CKM_DSA_KEY_PAIR_GEN,     {DSA_MIN_P_BITS, DSA_MAX_P_BITS,
                                  CKF_GENERATE_KEY_PAIR}, PR_TRUE},
      {CKM_DSA,                  {DSA_MIN_P_BITS, DSA_MAX_P_BITS, 
                                  CKF_SN_VR},              PR_TRUE},
+     {CKM_DSA_PARAMETER_GEN,    {DSA_MIN_P_BITS, DSA_MAX_P_BITS, 
+                                 CKF_GENERATE},           PR_TRUE},
      {CKM_DSA_SHA1,             {DSA_MIN_P_BITS, DSA_MAX_P_BITS,
                                  CKF_SN_VR},              PR_TRUE},
      /* -------------------- Diffie Hellman Operations --------------------- */
      /* no diffie hellman yet */
      {CKM_DH_PKCS_KEY_PAIR_GEN, {DH_MIN_P_BITS, DH_MAX_P_BITS, 
                                  CKF_GENERATE_KEY_PAIR}, PR_TRUE}, 
      {CKM_DH_PKCS_DERIVE,       {DH_MIN_P_BITS, DH_MAX_P_BITS,
                                  CKF_DERIVE},   PR_TRUE}, 
 #ifdef NSS_ENABLE_ECC
      /* -------------------- Elliptic Curve Operations --------------------- */
@@ skipping 550 matching lines @@
         if (crv != CKR_OK) {
             return crv;
         }
         crv = sftk_ConstrainAttribute(object, CKA_PUBLIC_EXPONENT, 2, 0, 0);
         if (crv != CKR_OK) {
             return crv;
         }
         break;
     case CKK_DSA:
         crv = sftk_ConstrainAttribute(object, CKA_SUBPRIME, 
-                                                DSA_Q_BITS, DSA_Q_BITS, 0);
+                                        DSA_MIN_Q_BITS, DSA_MAX_Q_BITS, 0);
         if (crv != CKR_OK) {
             return crv;
         }
         crv = sftk_ConstrainAttribute(object, CKA_PRIME, 
                                         DSA_MIN_P_BITS, DSA_MAX_P_BITS, 64);
         if (crv != CKR_OK) {
             return crv;
         }
-        crv = sftk_ConstrainAttribute(object, CKA_BASE, 1, DSA_MAX_P_BITS, 0);
+        crv = sftk_ConstrainAttribute(object, CKA_BASE, 2, DSA_MAX_P_BITS, 0);
         if (crv != CKR_OK) {
             return crv;
         }
-        crv = sftk_ConstrainAttribute(object, CKA_VALUE, 1, DSA_MAX_P_BITS, 0);
+        crv = sftk_ConstrainAttribute(object, CKA_VALUE, 2, DSA_MAX_P_BITS, 0);
         if (crv != CKR_OK) {
             return crv;
         }
         encrypt = CK_FALSE;
         recover = CK_FALSE;
         wrap = CK_FALSE;
         break;
     case CKK_DH:
         crv = sftk_ConstrainAttribute(object, CKA_PRIME, 
                                         DH_MIN_P_BITS, DH_MAX_P_BITS, 0);
         if (crv != CKR_OK) {
             return crv;
         }
-        crv = sftk_ConstrainAttribute(object, CKA_BASE, 1, DH_MAX_P_BITS, 0);
+        crv = sftk_ConstrainAttribute(object, CKA_BASE, 2, DH_MAX_P_BITS, 0);
         if (crv != CKR_OK) {
             return crv;
         }
-        crv = sftk_ConstrainAttribute(object, CKA_VALUE, 1, DH_MAX_P_BITS, 0);
+        crv = sftk_ConstrainAttribute(object, CKA_VALUE, 2, DH_MAX_P_BITS, 0);
         if (crv != CKR_OK) {
             return crv;
         }
         verify = CK_FALSE;
         derive = CK_TRUE;
         encrypt = CK_FALSE;
         recover = CK_FALSE;
         wrap = CK_FALSE;
         break;
 #ifdef NSS_ENABLE_ECC
@@ skipping 437 matching lines @@
     SFTKAttribute *primeAttr = NULL;
     SFTKAttribute *subPrimeAttr = NULL;
     SFTKAttribute *baseAttr = NULL;
     SFTKAttribute *seedAttr = NULL;
     SFTKAttribute *hAttr = NULL;
     SFTKAttribute *attribute;
     CK_RV crv = CKR_TEMPLATE_INCOMPLETE;
     PQGParams params;
     PQGVerify vfy, *verify = NULL;
     SECStatus result,rv;
+    /* This bool keeps track of whether or not we need verify parameters.
+     * If a P, Q and G or supplied, we dont' need verify parameters, as we
+     * have PQ and G. 
+     *   - If G is not supplied, the presumption is that we want to
+     * verify P and Q only.
+     *   - If counter is supplied, it is presumed we want to verify PQ because
+     * the counter is only used in verification.
+     *   - If H is supplied, is is presumed we want to verify G because H is
+     * only used to verify G.
+     *   - Any verification step must have the SEED (counter or H could be 
+     * missing depending on exactly what we want to verify). If SEED is supplied,
+     * the code just goes ahead and runs verify (other errors are parameter
+     * errors are detected by the PQG_VerifyParams function). If SEED is not
+     * supplied, but we determined that we are trying to verify (because needVfy
+     * is set, go ahead and return CKR_TEMPLATE_INCOMPLETE.
+     */
+    PRBool needVfy = PR_FALSE;      
 
     primeAttr = sftk_FindAttribute(object,CKA_PRIME);
     if (primeAttr == NULL) goto loser;
     params.prime.data = primeAttr->attrib.pValue;
     params.prime.len = primeAttr->attrib.ulValueLen;
 
     subPrimeAttr = sftk_FindAttribute(object,CKA_SUBPRIME);
     if (subPrimeAttr == NULL) goto loser;
     params.subPrime.data = subPrimeAttr->attrib.pValue;
     params.subPrime.len = subPrimeAttr->attrib.ulValueLen;
 
     baseAttr = sftk_FindAttribute(object,CKA_BASE);
-    if (baseAttr == NULL) goto loser;
-    params.base.data = baseAttr->attrib.pValue;
-    params.base.len = baseAttr->attrib.ulValueLen;
+    if (baseAttr != NULL) {
+        params.base.data = baseAttr->attrib.pValue;
+        params.base.len = baseAttr->attrib.ulValueLen;
+    } else {
+        params.base.data = NULL;
+        params.base.len = 0;
+        needVfy = PR_TRUE; /* presumably only including PQ so we can verify
+                            * them. */
+    }
 
     attribute = sftk_FindAttribute(object, CKA_NETSCAPE_PQG_COUNTER);
     if (attribute != NULL) {
         vfy.counter = *(CK_ULONG *) attribute->attrib.pValue;
         sftk_FreeAttribute(attribute);
+        needVfy = PR_TRUE; /* included a count so we can verify PQ */
+    } else {
+        vfy.counter = -1;
+    }
 
-        seedAttr = sftk_FindAttribute(object, CKA_NETSCAPE_PQG_SEED);
-        if (seedAttr == NULL) goto loser;
+    hAttr = sftk_FindAttribute(object, CKA_NETSCAPE_PQG_H);
+    if (hAttr != NULL) {
+        vfy.h.data = hAttr->attrib.pValue;
+        vfy.h.len = hAttr->attrib.ulValueLen;
+        needVfy = PR_TRUE; /* included H so we can verify G */
+    } else {
+        vfy.h.data = NULL;
+        vfy.h.len = 0;
+    }
+    seedAttr = sftk_FindAttribute(object, CKA_NETSCAPE_PQG_SEED);
+    if (seedAttr != NULL) {
         vfy.seed.data = seedAttr->attrib.pValue;
         vfy.seed.len = seedAttr->attrib.ulValueLen;
 
-        hAttr = sftk_FindAttribute(object, CKA_NETSCAPE_PQG_H);
-        if (hAttr == NULL) goto loser;
-        vfy.h.data = hAttr->attrib.pValue;
-        vfy.h.len = hAttr->attrib.ulValueLen;
-
         verify = &vfy;
+    } else if (needVfy) {
+        goto loser; /* Verify always needs seed, if we need verify and not seed
+                     * then fail */
     }
 
     crv = CKR_FUNCTION_FAILED;
     rv = PQG_VerifyParams(&params,verify,&result);
     if (rv == SECSuccess) {
         crv = (result== SECSuccess) ? CKR_OK : CKR_ATTRIBUTE_VALUE_INVALID;
     }
 
 loser:
     if (hAttr) sftk_FreeAttribute(hAttr);
@@ skipping 3201 matching lines @@
 
 
 CK_RV NSC_WaitForSlotEvent(CK_FLAGS flags, CK_SLOT_ID_PTR pSlot,
                                                          CK_VOID_PTR pReserved)
 {
     CHECK_FORK();
 
     return CKR_FUNCTION_NOT_SUPPORTED;
 }