Uprev NSS to 3.18 RTM

nss/lib/pk11wrap/pk11mech.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 maps various PKCS #11 Mechanisms to related mechanisms, key
  * types, and ASN.1 encodings.
  */
 #include "seccomon.h"
 #include "secmod.h"
 #include "secmodi.h"
@@ skipping 1366 matching lines @@
  */
 SECItem *
 pk11_GenerateNewParamWithKeyLen(CK_MECHANISM_TYPE type, int keyLen) 
 { 
     CK_RC2_CBC_PARAMS *rc2_params;
     CK_RC2_PARAMS *rc2_ecb_params;
     SECItem *mech;
     SECItem iv;
     SECStatus rv;
 
-
     mech = (SECItem *) PORT_Alloc(sizeof(SECItem));
     if (mech == NULL) return NULL;
 
     rv = SECSuccess;
     mech->type = siBuffer;
+    mech->data = NULL;
+    mech->len = 0;
     switch (type) {
     case CKM_RC4:
     case CKM_SEED_ECB:
     case CKM_CAMELLIA_ECB:
     case CKM_AES_ECB:
     case CKM_DES_ECB:
     case CKM_DES3_ECB:
     case CKM_IDEA_ECB:
     case CKM_CDMF_ECB:
     case CKM_CAST_ECB:
     case CKM_CAST3_ECB:
     case CKM_CAST5_ECB:
-        mech->data = NULL;
-        mech->len = 0;
         break;
     case CKM_RC2_ECB:
         rc2_ecb_params = (CK_RC2_PARAMS *)PORT_Alloc(sizeof(CK_RC2_PARAMS));
         if (rc2_ecb_params == NULL) {
             rv = SECFailure;
             break;
         }
         /* NOTE PK11_GetKeyLength can return -1 if the key isn't and RC2, RC5,
          *   or RC4 key. Of course that wouldn't happen here doing RC2:).*/
         *rc2_ecb_params = keyLen ? keyLen*8 : 128;
@@ skipping 27 matching lines @@
     case CKM_RC5_CBC:
     case CKM_RC5_CBC_PAD:
         rv = pk11_GenIV(type,&iv);
         if (rv != SECSuccess) {
             break;
         }
         PORT_Free(mech);
         return PK11_ParamFromIV(type,&iv);
     default:
         if (pk11_lookup(type)->iv == 0) {
-            mech->data = NULL;
-            mech->len = 0;
             break;
         }
     case CKM_SEED_CBC:
     case CKM_CAMELLIA_CBC:
     case CKM_AES_CBC:
     case CKM_DES_CBC:
     case CKM_DES3_CBC:
     case CKM_IDEA_CBC:
     case CKM_CDMF_CBC:
     case CKM_CAST_CBC:
@@ skipping 417 matching lines @@
     case SEC_OID_MISSI_DSS:
     case SEC_OID_MISSI_DSS_OLD:
     case SEC_OID_MISSI_KEA_DSS_OLD:
     case SEC_OID_BOGUS_DSA_SIGNATURE_WITH_SHA1_DIGEST:
         return SEC_OID_ANSIX9_DSA_SIGNATURE;
     default:
         break;
     }
     return algTag;
 }