src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp

*** 35,45 ****
  #include <windows.h>
  #include <BaseTsd.h>
  #include <wincrypt.h>
  #include <stdio.h>
  #include <memory>
! 
  
  #define OID_EKU_ANY         "2.5.29.37.0"
  
  #define CERTIFICATE_PARSING_EXCEPTION \
                              "java/security/cert/CertificateParsingException"
--- 35,51 ----
  #include <windows.h>
  #include <BaseTsd.h>
  #include <wincrypt.h>
  #include <stdio.h>
  #include <memory>
! #include "sun_security_mscapi_Key.h"
! #include "sun_security_mscapi_KeyStore.h"
! #include "sun_security_mscapi_PRNG.h"
! #include "sun_security_mscapi_RSACipher.h"
! #include "sun_security_mscapi_RSAKeyPairGenerator.h"
! #include "sun_security_mscapi_RSAPublicKey.h"
! #include "sun_security_mscapi_RSASignature.h"
  
  #define OID_EKU_ANY         "2.5.29.37.0"
  
  #define CERTIFICATE_PARSING_EXCEPTION \
                              "java/security/cert/CertificateParsingException"
*** 1311,1321 ****
   * Class:     sun_security_mscapi_KeyStore
   * Method:    destroyKeyContainer
   * Signature: (Ljava/lang/String;)V
   */
  JNIEXPORT void JNICALL Java_sun_security_mscapi_KeyStore_destroyKeyContainer
!   (JNIEnv *env, jclass clazz, jstring keyContainerName)
  {
      HCRYPTPROV hCryptProv = NULL;
      const char* pszKeyContainerName = NULL;
  
      __try
--- 1317,1327 ----
   * Class:     sun_security_mscapi_KeyStore
   * Method:    destroyKeyContainer
   * Signature: (Ljava/lang/String;)V
   */
  JNIEXPORT void JNICALL Java_sun_security_mscapi_KeyStore_destroyKeyContainer
!   (JNIEnv *env, jobject clazz, jstring keyContainerName)
  {
      HCRYPTPROV hCryptProv = NULL;
      const char* pszKeyContainerName = NULL;
  
      __try
*** 1433,1443 ****
   * Class:     sun_security_mscapi_RSAPublicKey
   * Method:    getPublicKeyBlob
   * Signature: (J)[B
   */
  JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_RSAPublicKey_getPublicKeyBlob
!     (JNIEnv *env, jclass clazz, jlong hCryptKey) {
  
      jbyteArray blob = NULL;
      DWORD dwBlobLen;
      BYTE* pbKeyBlob = NULL;
  
--- 1439,1449 ----
   * Class:     sun_security_mscapi_RSAPublicKey
   * Method:    getPublicKeyBlob
   * Signature: (J)[B
   */
  JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_RSAPublicKey_getPublicKeyBlob
!     (JNIEnv *env, jobject clazz, jlong hCryptKey) {
  
      jbyteArray blob = NULL;
      DWORD dwBlobLen;
      BYTE* pbKeyBlob = NULL;
  
*** 1484,1494 ****
   * Class:     sun_security_mscapi_RSAPublicKey
   * Method:    getExponent
   * Signature: ([B)[B
   */
  JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_RSAPublicKey_getExponent
!     (JNIEnv *env, jclass clazz, jbyteArray jKeyBlob) {
  
      jbyteArray exponent = NULL;
      jbyte*     exponentBytes = NULL;
      jbyte*     keyBlob = NULL;
  
--- 1490,1500 ----
   * Class:     sun_security_mscapi_RSAPublicKey
   * Method:    getExponent
   * Signature: ([B)[B
   */
  JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_RSAPublicKey_getExponent
!     (JNIEnv *env, jobject clazz, jbyteArray jKeyBlob) {
  
      jbyteArray exponent = NULL;
      jbyte*     exponentBytes = NULL;
      jbyte*     keyBlob = NULL;
  
*** 1540,1550 ****
   * Class:     sun_security_mscapi_RSAPublicKey
   * Method:    getModulus
   * Signature: ([B)[B
   */
  JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_RSAPublicKey_getModulus
!     (JNIEnv *env, jclass clazz, jbyteArray jKeyBlob) {
  
      jbyteArray modulus = NULL;
      jbyte*     modulusBytes = NULL;
      jbyte*     keyBlob = NULL;
  
--- 1546,1556 ----
   * Class:     sun_security_mscapi_RSAPublicKey
   * Method:    getModulus
   * Signature: ([B)[B
   */
  JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_RSAPublicKey_getModulus
!     (JNIEnv *env, jobject clazz, jbyteArray jKeyBlob) {
  
      jbyteArray modulus = NULL;
      jbyte*     modulusBytes = NULL;
      jbyte*     keyBlob = NULL;
  
*** 1813,1823 ****
   * Class:     sun_security_mscapi_KeyStore
   * Method:    generatePrivateKeyBlob
   * Signature: (I[B[B[B[B[B[B[B[B)[B
   */
  JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_KeyStore_generatePrivateKeyBlob
!     (JNIEnv *env, jclass clazz,
          jint jKeyBitLength,
          jbyteArray jModulus,
          jbyteArray jPublicExponent,
          jbyteArray jPrivateExponent,
          jbyteArray jPrimeP,
--- 1819,1829 ----
   * Class:     sun_security_mscapi_KeyStore
   * Method:    generatePrivateKeyBlob
   * Signature: (I[B[B[B[B[B[B[B[B)[B
   */
  JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_KeyStore_generatePrivateKeyBlob
!     (JNIEnv *env, jobject clazz,
          jint jKeyBitLength,
          jbyteArray jModulus,
          jbyteArray jPublicExponent,
          jbyteArray jPrivateExponent,
          jbyteArray jPrimeP,
*** 1850,1860 ****
   * Class:     sun_security_mscapi_KeyStore
   * Method:    storePrivateKey
   * Signature: ([BLjava/lang/String;I)Lsun/security/mscapi/RSAPrivateKey;
   */
  JNIEXPORT jobject JNICALL Java_sun_security_mscapi_KeyStore_storePrivateKey
!     (JNIEnv *env, jclass clazz, jbyteArray keyBlob, jstring keyContainerName,
       jint keySize)
  {
      HCRYPTPROV hCryptProv = NULL;
      HCRYPTKEY hKey = NULL;
      DWORD dwBlobLen;
--- 1856,1866 ----
   * Class:     sun_security_mscapi_KeyStore
   * Method:    storePrivateKey
   * Signature: ([BLjava/lang/String;I)Lsun/security/mscapi/RSAPrivateKey;
   */
  JNIEXPORT jobject JNICALL Java_sun_security_mscapi_KeyStore_storePrivateKey
!     (JNIEnv *env, jobject clazz, jbyteArray keyBlob, jstring keyContainerName,
       jint keySize)
  {
      HCRYPTPROV hCryptProv = NULL;
      HCRYPTKEY hKey = NULL;
      DWORD dwBlobLen;