src/share/native/sun/security/pkcs11/wrapper/p11_convert.c

*** 473,482 ****
--- 473,484 ----
      CK_SSL3_MASTER_KEY_DERIVE_PARAMS ckParam;
      jfieldID fieldID;
      jclass jSsl3RandomDataClass;
      jobject jRandomInfo, jRIClientRandom, jRIServerRandom, jVersion;
  
+     memset(&ckParam, 0, sizeof(CK_SSL3_MASTER_KEY_DERIVE_PARAMS));
+ 
      /* get RandomInfo */
      jSsl3MasterKeyDeriveParamsClass = (*env)->FindClass(env, CLASS_SSL3_MASTER_KEY_DERIVE_PARAMS);
      if (jSsl3MasterKeyDeriveParamsClass == NULL) { return ckParam; }
      fieldID = (*env)->GetFieldID(env, jSsl3MasterKeyDeriveParamsClass, "RandomInfo", "Lsun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA;");
      if (fieldID == NULL) { return ckParam; }
*** 526,535 ****
--- 528,538 ----
      jclass jTlsPrfParamsClass;
      CK_TLS_PRF_PARAMS ckParam;
      jfieldID fieldID;
      jobject jSeed, jLabel, jOutput;
  
+     memset(&ckParam, 0, sizeof(CK_TLS_PRF_PARAMS));
      // TBD: what if jParam == NULL?!
  
      /* get pSeed */
      jTlsPrfParamsClass = (*env)->FindClass(env, CLASS_TLS_PRF_PARAMS);
      if (jTlsPrfParamsClass == NULL) { return ckParam; }
*** 591,600 ****
--- 594,605 ----
      jboolean jIsExport;
      jobject jRandomInfo, jRIClientRandom, jRIServerRandom;
      jobject jReturnedKeyMaterial, jRMIvClient, jRMIvServer;
      CK_ULONG ckTemp;
  
+     memset(&ckParam, 0, sizeof(CK_SSL3_KEY_MAT_PARAMS));
+ 
      /* get ulMacSizeInBits */
      jSsl3KeyMatParamsClass = (*env)->FindClass(env, CLASS_SSL3_KEY_MAT_PARAMS);
      if (jSsl3KeyMatParamsClass == NULL) { return ckParam; }
      fieldID = (*env)->GetFieldID(env, jSsl3KeyMatParamsClass, "ulMacSizeInBits", "J");
      if (fieldID == NULL) { return ckParam; }
*** 1354,1363 ****
--- 1359,1370 ----
      jfieldID fieldID;
      jlong jHashAlg, jMgf, jSource;
      jobject jSourceData;
      CK_BYTE_PTR ckpByte;
  
+     memset(&ckParam, 0, sizeof(CK_RSA_PKCS_OAEP_PARAMS));
+ 
      /* get hashAlg */
      jRsaPkcsOaepParamsClass = (*env)->FindClass(env, CLASS_RSA_PKCS_OAEP_PARAMS);
      if (jRsaPkcsOaepParamsClass == NULL) { return ckParam; }
      fieldID = (*env)->GetFieldID(env, jRsaPkcsOaepParamsClass, "hashAlg", "J");
      if (fieldID == NULL) { return ckParam; }
*** 1403,1412 ****
--- 1410,1421 ----
      jfieldID fieldID;
      jlong jIteration;
      jobject jInitVector, jPassword, jSalt;
      CK_ULONG ckTemp;
  
+     memset(&ckParam, 0, sizeof(CK_PBE_PARAMS));
+ 
      /* get pInitVector */
      jPbeParamsClass = (*env)->FindClass(env, CLASS_PBE_PARAMS);
      if (jPbeParamsClass == NULL) { return ckParam; }
      fieldID = (*env)->GetFieldID(env, jPbeParamsClass, "pInitVector", "[C");
      if (fieldID == NULL) { return ckParam; }
*** 1521,1530 ****
--- 1530,1541 ----
      CK_PKCS5_PBKD2_PARAMS ckParam;
      jfieldID fieldID;
      jlong jSaltSource, jIteration, jPrf;
      jobject jSaltSourceData, jPrfData;
  
+     memset(&ckParam, 0, sizeof(CK_PKCS5_PBKD2_PARAMS));
+ 
      /* get saltSource */
      jPkcs5Pbkd2ParamsClass = (*env)->FindClass(env, CLASS_PKCS5_PBKD2_PARAMS);
      if (jPkcs5Pbkd2ParamsClass == NULL) { return ckParam; }
      fieldID = (*env)->GetFieldID(env, jPkcs5Pbkd2ParamsClass, "saltSource", "J");
      if (fieldID == NULL) { return ckParam; }
*** 1576,1585 ****
--- 1587,1597 ----
  {
      jclass jRsaPkcsPssParamsClass;
      CK_RSA_PKCS_PSS_PARAMS ckParam;
      jfieldID fieldID;
      jlong jHashAlg, jMgf, jSLen;
+ 
      memset(&ckParam, 0, sizeof(CK_RSA_PKCS_PSS_PARAMS));
  
      /* get hashAlg */
      jRsaPkcsPssParamsClass = (*env)->FindClass(env, CLASS_RSA_PKCS_PSS_PARAMS);
      if (jRsaPkcsPssParamsClass == NULL) { return ckParam; }
*** 1617,1626 ****
--- 1629,1639 ----
      jclass jEcdh1DeriveParamsClass;
      CK_ECDH1_DERIVE_PARAMS ckParam;
      jfieldID fieldID;
      jlong jLong;
      jobject jSharedData, jPublicData;
+ 
      memset(&ckParam, 0, sizeof(CK_ECDH1_DERIVE_PARAMS));
  
      /* get kdf */
      jEcdh1DeriveParamsClass = (*env)->FindClass(env, CLASS_ECDH1_DERIVE_PARAMS);
      if (jEcdh1DeriveParamsClass == NULL) { return ckParam; }
*** 1664,1673 ****
--- 1677,1687 ----
      jclass jEcdh2DeriveParamsClass;
      CK_ECDH2_DERIVE_PARAMS ckParam;
      jfieldID fieldID;
      jlong jKdf, jPrivateDataLen, jPrivateData;
      jobject jSharedData, jPublicData, jPublicData2;
+ 
      memset(&ckParam, 0, sizeof(CK_ECDH2_DERIVE_PARAMS));
  
      /* get kdf */
      jEcdh2DeriveParamsClass = (*env)->FindClass(env, CLASS_ECDH2_DERIVE_PARAMS);
      if (jEcdh2DeriveParamsClass == NULL) { return ckParam; }
*** 1733,1742 ****
--- 1747,1758 ----
      CK_X9_42_DH1_DERIVE_PARAMS ckParam;
      jfieldID fieldID;
      jlong jKdf;
      jobject jOtherInfo, jPublicData;
  
+     memset(&ckParam, 0, sizeof(CK_X9_42_DH1_DERIVE_PARAMS));
+ 
      /* get kdf */
      jX942Dh1DeriveParamsClass = (*env)->FindClass(env, CLASS_X9_42_DH1_DERIVE_PARAMS);
      if (jX942Dh1DeriveParamsClass == NULL) { return ckParam; }
      fieldID = (*env)->GetFieldID(env, jX942Dh1DeriveParamsClass, "kdf", "J");
      if (fieldID == NULL) { return ckParam; }
*** 1778,1787 ****
--- 1794,1805 ----
      CK_X9_42_DH2_DERIVE_PARAMS ckParam;
      jfieldID fieldID;
      jlong jKdf, jPrivateDataLen, jPrivateData;
      jobject jOtherInfo, jPublicData, jPublicData2;
      
+     memset(&ckParam, 0, sizeof(CK_X9_42_DH2_DERIVE_PARAMS));
+ 
      /* get kdf */
      jX942Dh2DeriveParamsClass = (*env)->FindClass(env, CLASS_X9_42_DH2_DERIVE_PARAMS);
      if (jX942Dh2DeriveParamsClass == NULL) { return ckParam; }
      fieldID = (*env)->GetFieldID(env, jX942Dh2DeriveParamsClass, "kdf", "J");
      if (fieldID == NULL) { return ckParam; }