--- a/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp Fri Jun 08 11:30:10 2018 +0200
+++ b/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp Fri Jun 08 18:11:32 2018 +0200
@@ -37,7 +37,13 @@
#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"
@@ -1313,7 +1319,7 @@
* Signature: (Ljava/lang/String;)V
*/
JNIEXPORT void JNICALL Java_sun_security_mscapi_KeyStore_destroyKeyContainer
- (JNIEnv *env, jclass clazz, jstring keyContainerName)
+ (JNIEnv *env, jobject clazz, jstring keyContainerName)
{
HCRYPTPROV hCryptProv = NULL;
const char* pszKeyContainerName = NULL;
@@ -1435,7 +1441,7 @@
* Signature: (J)[B
*/
JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_RSAPublicKey_getPublicKeyBlob
- (JNIEnv *env, jclass clazz, jlong hCryptKey) {
+ (JNIEnv *env, jobject clazz, jlong hCryptKey) {
jbyteArray blob = NULL;
DWORD dwBlobLen;
@@ -1486,7 +1492,7 @@
* Signature: ([B)[B
*/
JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_RSAPublicKey_getExponent
- (JNIEnv *env, jclass clazz, jbyteArray jKeyBlob) {
+ (JNIEnv *env, jobject clazz, jbyteArray jKeyBlob) {
jbyteArray exponent = NULL;
jbyte* exponentBytes = NULL;
@@ -1542,7 +1548,7 @@
* Signature: ([B)[B
*/
JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_RSAPublicKey_getModulus
- (JNIEnv *env, jclass clazz, jbyteArray jKeyBlob) {
+ (JNIEnv *env, jobject clazz, jbyteArray jKeyBlob) {
jbyteArray modulus = NULL;
jbyte* modulusBytes = NULL;
@@ -1815,7 +1821,7 @@
* Signature: (I[B[B[B[B[B[B[B[B)[B
*/
JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_KeyStore_generatePrivateKeyBlob
- (JNIEnv *env, jclass clazz,
+ (JNIEnv *env, jobject clazz,
jint jKeyBitLength,
jbyteArray jModulus,
jbyteArray jPublicExponent,
@@ -1852,7 +1858,7 @@
* 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,
+ (JNIEnv *env, jobject clazz, jbyteArray keyBlob, jstring keyContainerName,
jint keySize)
{
HCRYPTPROV hCryptProv = NULL;