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

mozilla/security/nss/lib/pk11wrap/pk11skey.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 the Symkey wrapper and the PKCS context
  * Interfaces.
  */
 
 #include "seccomon.h"
 #include "secmod.h"
@@ skipping 1659 matching lines @@
             attrs++;
             PK11_SETATTRS(attrs, operation, &cktrue, 1); attrs++;
             PK11_SETATTRS(attrs, CKA_VALUE_LEN, &key_size, sizeof(key_size)); 
             attrs++;
             templateCount =  attrs - keyTemplate;
             PR_ASSERT(templateCount <= sizeof(keyTemplate)/sizeof(CK_ATTRIBUTE));
 
             keyType = PK11_GetKeyType(target,keySize);
             key_size = keySize;
             if (key_size == 0) {
-                if (pk11_GetPredefinedKeyLength(keyType)) {
+                if ((key_size = pk11_GetPredefinedKeyLength(keyType))) {
                     templateCount --;
                 } else {
                     /* sigh, some tokens can't figure this out and require
                      * CKA_VALUE_LEN to be set */
                     key_size = SHA1_LENGTH;
                 }
             }
             symKey->size = key_size;
 
             mechParams = PORT_ZNew(CK_ECDH1_DERIVE_PARAMS); 
@@ skipping 64 matching lines @@
     CK_ULONG                key_size        = 0;
     CK_ATTRIBUTE            keyTemplate[4];
     int                     templateCount;
     CK_ATTRIBUTE           *attrs           = keyTemplate;
     CK_ECDH1_DERIVE_PARAMS *mechParams      = NULL;
 
     if (pubKey->keyType != ecKey) {
         PORT_SetError(SEC_ERROR_BAD_KEY);
         return NULL;
     }
-    if ((kdf < CKD_NULL) || (kdf > CKD_SHA1_KDF)) {
+    if ((kdf != CKD_NULL) && (kdf != CKD_SHA1_KDF) &&
+        (kdf != CKD_SHA224_KDF) && (kdf != CKD_SHA256_KDF) &&
+        (kdf != CKD_SHA384_KDF) && (kdf != CKD_SHA512_KDF)) {
         PORT_SetError(SEC_ERROR_INVALID_ALGORITHM);
         return NULL;
     }
 
     /* get our key Structure */
     symKey = pk11_CreateSymKey(slot, target, PR_TRUE, PR_TRUE, wincx);
     if (symKey == NULL) {
         return NULL;
     }
 
     symKey->origin = PK11_OriginDerive;
 
     PK11_SETATTRS(attrs, CKA_CLASS, &keyClass, sizeof(keyClass));     attrs++;
     PK11_SETATTRS(attrs, CKA_KEY_TYPE, &keyType, sizeof(keyType));    attrs++;
     PK11_SETATTRS(attrs, operation, &cktrue, 1);                      attrs++;
     PK11_SETATTRS(attrs, CKA_VALUE_LEN, &key_size, sizeof(key_size)); attrs++;
     templateCount =  attrs - keyTemplate;
     PR_ASSERT(templateCount <= sizeof(keyTemplate)/sizeof(CK_ATTRIBUTE));
 
     keyType = PK11_GetKeyType(target,keySize);
     key_size = keySize;
     if (key_size == 0) {
-        if (pk11_GetPredefinedKeyLength(keyType)) {
+        if ((key_size = pk11_GetPredefinedKeyLength(keyType))) {
             templateCount --;
         } else {
             /* sigh, some tokens can't figure this out and require
              * CKA_VALUE_LEN to be set */
             switch (kdf) {
             case CKD_NULL:
-                key_size = (pubKey->u.ec.publicValue.len-1)/2;
+                if (pubKey->u.ec.publicValue.data[0] == 0x04) {
+                    /* key encoded in uncompressed form */
+                    key_size = (pubKey->u.ec.publicValue.len-1)/2;
+                } else if ((pubKey->u.ec.publicValue.data[0] == 0x02) ||
+                           (pubKey->u.ec.publicValue.data[0] == 0x03)) {
+                    /* key encoded in compressed form */
+                    key_size = pubKey->u.ec.publicValue.len-1;
+                } else {
+                    /* key encoding not recognized */
+                    PK11_FreeSymKey(symKey);
+                    return NULL;

[wtc, 2012/11/07 22:12:33]

We should call PORT_SetError(SEC_ERROR_UNSUPPORTED_EC_POINT_FORM) here.

+                }
                 break;
             case CKD_SHA1_KDF:
                 key_size = SHA1_LENGTH;
                 break;
+            case CKD_SHA224_KDF:
+                key_size = SHA224_LENGTH;
+                break;
+            case CKD_SHA256_KDF:
+                key_size = SHA256_LENGTH;
+                break;
+            case CKD_SHA384_KDF:
+                key_size = SHA384_LENGTH;
+                break;
+            case CKD_SHA512_KDF:
+                key_size = SHA512_LENGTH;
+                break;
             default:
                 PORT_Assert(!"Invalid CKD");
                 PORT_SetError(SEC_ERROR_INVALID_ALGORITHM);

[wtc, 2012/11/07 22:12:33]

We should call PK11_FreeSymKey(symKey) here.

                 return NULL;
             }
         }
     }
     symKey->size = key_size;
 
     mechParams = PORT_ZNew(CK_ECDH1_DERIVE_PARAMS);
     if (!mechParams) {
         PK11_FreeSymKey(symKey);
         return NULL;
@@ skipping 501 matching lines @@
     PK11_ExitSlotMonitor(symKey->slot);
     return rv;
 }
 
 CK_OBJECT_HANDLE
 PK11_GetSymKeyHandle(PK11SymKey *symKey)
 {
     return symKey->objectID;
 }