--- old/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c	2013-03-13 14:04:47.656802165 -0400
+++ new/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c	2013-03-13 14:04:47.332672559 -0400
@@ -475,6 +475,8 @@
     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; }
@@ -528,6 +530,7 @@
     jfieldID fieldID;
     jobject jSeed, jLabel, jOutput;
 
+    memset(&ckParam, 0, sizeof(CK_TLS_PRF_PARAMS));
     // TBD: what if jParam == NULL?!
 
     /* get pSeed */
@@ -593,6 +596,8 @@
     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; }
@@ -1356,6 +1361,8 @@
     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; }
@@ -1405,6 +1412,8 @@
     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; }
@@ -1523,6 +1532,8 @@
     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; }
@@ -1578,6 +1589,7 @@
     CK_RSA_PKCS_PSS_PARAMS ckParam;
     jfieldID fieldID;
     jlong jHashAlg, jMgf, jSLen;
+
     memset(&ckParam, 0, sizeof(CK_RSA_PKCS_PSS_PARAMS));
 
     /* get hashAlg */
@@ -1619,6 +1631,7 @@
     jfieldID fieldID;
     jlong jLong;
     jobject jSharedData, jPublicData;
+
     memset(&ckParam, 0, sizeof(CK_ECDH1_DERIVE_PARAMS));
 
     /* get kdf */
@@ -1666,6 +1679,7 @@
     jfieldID fieldID;
     jlong jKdf, jPrivateDataLen, jPrivateData;
     jobject jSharedData, jPublicData, jPublicData2;
+
     memset(&ckParam, 0, sizeof(CK_ECDH2_DERIVE_PARAMS));
 
     /* get kdf */
@@ -1735,6 +1749,8 @@
     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; }
@@ -1779,6 +1795,8 @@
     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);