jdk-sandbox: comparison jdk/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp

equal deleted inserted replaced

-:92cc72d2a11a
+:93708c7917fc
 //=--------------------------------------------------------------------------=
 //
 #include <jni.h>
 #include <stdlib.h>
+#include <string.h>
 #include <windows.h>
 #include <BaseTsd.h>
 #include <wincrypt.h>
 #include <stdio.h>
 void ThrowException(JNIEnv *env, char *exceptionName, DWORD dwError)
 {
 char szMessage[1024];
 szMessage[0] = '\0';
-FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwError, NULL, szMessage,
+DWORD res = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwError,
-1024, NULL);
+NULL, szMessage, sizeof(szMessage), NULL);
+if (res == 0) {
+strcpy(szMessage, "Unknown error");
+}
 jclass exceptionClazz = env->FindClass(exceptionName);
-env->ThrowNew(exceptionClazz, szMessage);
+if (exceptionClazz != NULL) {
+env->ThrowNew(exceptionClazz, szMessage);
+}
 }
 /*
 * Maps the name of a hash algorithm to an algorithm identifier.
 __leave;
 }
 // Determine clazz and method ID to generate certificate
 jclass clazzArrayList = env->FindClass("java/util/ArrayList");
+if (clazzArrayList == NULL) {
+__leave;
+}
 jmethodID mNewArrayList = env->GetMethodID(clazzArrayList, "<init>", "()V");
+if (mNewArrayList == NULL) {
-jmethodID mGenCert = env->GetMethodID(env->GetObjectClass(obj),
+__leave;
+}
+jclass clazzOfThis = env->GetObjectClass(obj);
+if (clazzOfThis == NULL) {
+__leave;
+}
+jmethodID mGenCert = env->GetMethodID(clazzOfThis,
 "generateCertificate",
 "([BLjava/util/Collection;)V");
+if (mGenCert == NULL) {
+__leave;
+}
 // Determine method ID to generate certificate chain
-jmethodID mGenCertChain = env->GetMethodID(env->GetObjectClass(obj),
+jmethodID mGenCertChain = env->GetMethodID(clazzOfThis,
 "generateCertificateChain",
 "(Ljava/lang/String;Ljava/util/Collection;Ljava/util/Collection;)V");
+if (mGenCertChain == NULL) {
+__leave;
+}
 // Determine method ID to generate RSA certificate chain
-jmethodID mGenRSAKeyAndCertChain = env->GetMethodID(env->GetObjectClass(obj),
+jmethodID mGenRSAKeyAndCertChain = env->GetMethodID(clazzOfThis,
 "generateRSAKeyAndCertificateChain",
 "(Ljava/lang/String;JJILjava/util/Collection;Ljava/util/Collection;)V");
+if (mGenRSAKeyAndCertChain == NULL) {
+__leave;
+}
 // Use CertEnumCertificatesInStore to get the certificates
 // from the open store. pCertContext must be reset to
 // NULL to retrieve the first certificate in the store.
 while (pCertContext = ::CertEnumCertificatesInStore(hCertStore, pCertContext))
 jSignedHash = temp;
 }
 __finally
 {
+if (pSignedHashBuffer)
+delete [] pSignedHashBuffer;
+if (pHashBuffer)
+delete [] pHashBuffer;
+if (hHash)
+::CryptDestroyHash(hHash);
 if (hCryptProvAlt)
 ::CryptReleaseContext(hCryptProvAlt, 0);
-if (pSignedHashBuffer)
-delete [] pSignedHashBuffer;
-if (pHashBuffer)
-delete [] pHashBuffer;
-if (hHash)
-::CryptDestroyHash(hHash);
 }
 return jSignedHash;
 }
 }
 }
 __finally
 {
+if (pSignedHashBuffer)
+delete [] pSignedHashBuffer;
+if (pHashBuffer)
+delete [] pHashBuffer;
+if (hHash)
+::CryptDestroyHash(hHash);
 if (hCryptProvAlt)
 ::CryptReleaseContext(hCryptProvAlt, 0);
-if (pSignedHashBuffer)
-delete [] pSignedHashBuffer;
-if (pHashBuffer)
-delete [] pHashBuffer;
-if (hHash)
-::CryptDestroyHash(hHash);
 }
 return result;
 }
 }
 // Get the method ID for the RSAKeyPair constructor
 jclass clazzRSAKeyPair =
 env->FindClass("sun/security/mscapi/RSAKeyPair");
+if (clazzRSAKeyPair == NULL) {
+__leave;
+}
 jmethodID mNewRSAKeyPair =
 env->GetMethodID(clazzRSAKeyPair, "<init>", "(JJI)V");
+if (mNewRSAKeyPair == NULL) {
+__leave;
+}
 // Create a new RSA keypair
 keypair = env->NewObject(clazzRSAKeyPair, mNewRSAKeyPair,
 (jlong) hCryptProv, (jlong) hKeyPair, keySize);
 }
 // Get the method ID for the RSAPrivateKey constructor
 jclass clazzRSAPrivateKey =
 env->FindClass("sun/security/mscapi/RSAPrivateKey");
+if (clazzRSAPrivateKey == NULL) {
+__leave;
+}
 jmethodID mNewRSAPrivateKey =
 env->GetMethodID(clazzRSAPrivateKey, "<init>", "(JJI)V");
+if (mNewRSAPrivateKey == NULL) {
+__leave;
+}
 // Create a new RSA private key
 privateKey = env->NewObject(clazzRSAPrivateKey, mNewRSAPrivateKey,
 (jlong) hCryptProv, (jlong) hKey, keySize);
 }
 // Get the method ID for the RSAPublicKey constructor
 jclass clazzRSAPublicKey =
 env->FindClass("sun/security/mscapi/RSAPublicKey");
+if (clazzRSAPublicKey == NULL) {
+__leave;
+}
 jmethodID mNewRSAPublicKey =
 env->GetMethodID(clazzRSAPublicKey, "<init>", "(JJI)V");
+if (mNewRSAPublicKey == NULL) {
+__leave;
+}
 // Create a new RSA public key
 publicKey = env->NewObject(clazzRSAPublicKey, mNewRSAPublicKey,
 (jlong) hCryptProv, (jlong) hKey, keySize);

changeset 31470	93708c7917fc
parent 31264	896105040033
child 33653	c1ee09fe3274