Skip to content

D
dragonwell8_jdk

openanolis / dragonwell8_jdk

通知 4
Star 2
Fork 0
D
dragonwell8_jdk
提交 ff44ffd3 编写于 作者: V valeriep
浏览文件
操作

6988081: Use GetPrimitiveArrayCritical instead GetByteArray to Reduce... 

6988081: Use GetPrimitiveArrayCritical instead GetByteArray to Reduce allocation in some sunpkcs jni wrappers
Summary: Changed to use GetPrimitiveArrayCritical for encryption and decryption.
Reviewed-by: vinnie
上级 6422bb0a
隐藏空白更改
内联 并排
Showing with 98 addition and 191 deletion
src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c
浏览文件 @ ff44ffd3
/* /*
* Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
*/ */
/* Copyright (c) 2002 Graz University of Technology. All rights reserved. /* Copyright (c) 2002 Graz University of Technology. All rights reserved.
...@@ -114,8 +114,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1Encrypt ...@@ -114,8 +114,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1Encrypt
{ {
CK_SESSION_HANDLE ckSessionHandle; CK_SESSION_HANDLE ckSessionHandle;
CK_RV rv; CK_RV rv;
CK_BYTE IBUF[MAX_STACK_BUFFER_LEN];
CK_BYTE OBUF[MAX_STACK_BUFFER_LEN];
CK_BYTE_PTR inBufP; CK_BYTE_PTR inBufP;
CK_BYTE_PTR outBufP; CK_BYTE_PTR outBufP;
CK_ULONG ckEncryptedPartLen; CK_ULONG ckEncryptedPartLen;
...@@ -125,50 +124,27 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1Encrypt ...@@ -125,50 +124,27 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1Encrypt
ckSessionHandle = jLongToCKULong(jSessionHandle); ckSessionHandle = jLongToCKULong(jSessionHandle);
if (jInLen > MAX_STACK_BUFFER_LEN) { inBufP = (*env)->GetPrimitiveArrayCritical(env, jIn, NULL);
inBufP = (CK_BYTE_PTR)malloc((size_t)jInLen); if (inBufP == NULL) { return 0; }
if (inBufP == NULL) {
JNU_ThrowOutOfMemoryError(env, 0); outBufP = (*env)->GetPrimitiveArrayCritical(env, jOut, NULL);
if (outBufP == NULL) {
// Make sure to release inBufP
(*env)->ReleasePrimitiveArrayCritical(env, jIn, inBufP, JNI_ABORT);
return 0; return 0;
}
} else {
inBufP = IBUF;
}
(*env)->GetByteArrayRegion(env, jIn, jInOfs, jInLen, (jbyte *)inBufP);
if ((*env)->ExceptionCheck(env)) {
if (inBufP != IBUF) { free(inBufP); }
return 0;
} }
ckEncryptedPartLen = jOutLen; ckEncryptedPartLen = jOutLen;
if (jOutLen > MAX_STACK_BUFFER_LEN) {
outBufP = (CK_BYTE_PTR)malloc((size_t)jOutLen);
if (outBufP == NULL) {
if (inBufP != IBUF) {
free(inBufP);
}
JNU_ThrowOutOfMemoryError(env, 0);
return 0;
}
} else {
outBufP = OBUF;
}
rv = (*ckpFunctions->C_Encrypt)(ckSessionHandle, inBufP, jInLen, rv = (*ckpFunctions->C_Encrypt)(ckSessionHandle,
outBufP, &ckEncryptedPartLen); (CK_BYTE_PTR)(inBufP + jInOfs), jInLen,
(CK_BYTE_PTR)(outBufP + jOutOfs),
&ckEncryptedPartLen);
if (ckAssertReturnValueOK(env, rv) == CK_ASSERT_OK) { (*env)->ReleasePrimitiveArrayCritical(env, jOut, outBufP, JNI_ABORT);
if (ckEncryptedPartLen > 0) { (*env)->ReleasePrimitiveArrayCritical(env, jIn, inBufP, JNI_ABORT);
(*env)->SetByteArrayRegion(env, jOut, jOutOfs, ckEncryptedPartLen,
(jbyte *)outBufP); ckAssertReturnValueOK(env, rv);
}
}
if (inBufP != IBUF) {
free(inBufP);
}
if (outBufP != OBUF) {
free(outBufP);
}
return ckEncryptedPartLen; return ckEncryptedPartLen;
} }
#endif #endif
...@@ -193,8 +169,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptUpdate ...@@ -193,8 +169,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptUpdate
{ {
CK_SESSION_HANDLE ckSessionHandle; CK_SESSION_HANDLE ckSessionHandle;
CK_RV rv; CK_RV rv;
CK_BYTE IBUF[MAX_STACK_BUFFER_LEN];
CK_BYTE OBUF[MAX_STACK_BUFFER_LEN];
CK_BYTE_PTR inBufP; CK_BYTE_PTR inBufP;
CK_BYTE_PTR outBufP; CK_BYTE_PTR outBufP;
CK_ULONG ckEncryptedPartLen; CK_ULONG ckEncryptedPartLen;
...@@ -205,64 +180,45 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptUpdate ...@@ -205,64 +180,45 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptUpdate
ckSessionHandle = jLongToCKULong(jSessionHandle); ckSessionHandle = jLongToCKULong(jSessionHandle);
if (directIn != 0) { if (directIn != 0) {
inBufP = (CK_BYTE_PTR)(directIn + jInOfs); inBufP = (CK_BYTE_PTR) directIn;
} else { } else {
if (jInLen > MAX_STACK_BUFFER_LEN) { inBufP = (*env)->GetPrimitiveArrayCritical(env, jIn, NULL);
inBufP = (CK_BYTE_PTR)malloc((size_t)jInLen); if (inBufP == NULL) { return 0; }
if (inBufP == NULL) {
JNU_ThrowOutOfMemoryError(env, 0);
return 0;
}
} else {
inBufP = IBUF;
}
(*env)->GetByteArrayRegion(env, jIn, jInOfs, jInLen, (jbyte *)inBufP);
if ((*env)->ExceptionCheck(env)) {
if (directIn == 0 && inBufP != IBUF) { free(inBufP); }
return 0;
}
} }
ckEncryptedPartLen = jOutLen;
if (directOut != 0) { if (directOut != 0) {
outBufP = (CK_BYTE_PTR)(directOut + jOutOfs); outBufP = (CK_BYTE_PTR) directOut;
} else { } else {
if (jOutLen > MAX_STACK_BUFFER_LEN) { outBufP = (*env)->GetPrimitiveArrayCritical(env, jOut, NULL);
outBufP = (CK_BYTE_PTR)malloc((size_t)jOutLen); if (outBufP == NULL) {
if (outBufP == NULL) { // Make sure to release inBufP
if (directIn == 0 && inBufP != IBUF) { (*env)->ReleasePrimitiveArrayCritical(env, jIn, inBufP, JNI_ABORT);
free(inBufP);
}
JNU_ThrowOutOfMemoryError(env, 0);
return 0; return 0;
}
} else {
outBufP = OBUF;
} }
} }
ckEncryptedPartLen = jOutLen;
//printf("EU: inBufP=%i, jInOfs=%i, jInLen=%i, outBufP=%i\n", //printf("EU: inBufP=%i, jInOfs=%i, jInLen=%i, outBufP=%i\n",
// inBufP, jInOfs, jInLen, outBufP); // inBufP, jInOfs, jInLen, outBufP);
rv = (*ckpFunctions->C_EncryptUpdate)(ckSessionHandle, rv = (*ckpFunctions->C_EncryptUpdate)(ckSessionHandle,
inBufP, jInLen, (CK_BYTE_PTR)(inBufP + jInOfs), jInLen,
outBufP, &ckEncryptedPartLen); (CK_BYTE_PTR)(outBufP + jOutOfs),
&ckEncryptedPartLen);
//printf("EU: ckEncryptedPartLen=%i\n", ckEncryptedPartLen); //printf("EU: ckEncryptedPartLen=%i\n", ckEncryptedPartLen);
if (directIn == 0 && inBufP != IBUF) { if (directIn == 0) {
free(inBufP); (*env)->ReleasePrimitiveArrayCritical(env, jIn, inBufP, JNI_ABORT);
} }
if (ckAssertReturnValueOK(env, rv) == CK_ASSERT_OK) { if (directOut == 0) {
if (directOut == 0 && ckEncryptedPartLen > 0) { (*env)->ReleasePrimitiveArrayCritical(env, jOut, outBufP, JNI_ABORT);
(*env)->SetByteArrayRegion(env, jOut, jOutOfs, ckEncryptedPartLen,
(jbyte *)outBufP);
}
}
if (directOut == 0 && outBufP != OBUF) {
free(outBufP);
} }
ckAssertReturnValueOK(env, rv);
return ckEncryptedPartLen; return ckEncryptedPartLen;
} }
#endif #endif
...@@ -284,7 +240,6 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptFinal ...@@ -284,7 +240,6 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptFinal
{ {
CK_SESSION_HANDLE ckSessionHandle; CK_SESSION_HANDLE ckSessionHandle;
CK_RV rv; CK_RV rv;
CK_BYTE BUF[MAX_STACK_BUFFER_LEN];
CK_BYTE_PTR outBufP; CK_BYTE_PTR outBufP;
CK_ULONG ckLastEncryptedPartLen; CK_ULONG ckLastEncryptedPartLen;
...@@ -293,31 +248,29 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptFinal ...@@ -293,31 +248,29 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptFinal
ckSessionHandle = jLongToCKULong(jSessionHandle); ckSessionHandle = jLongToCKULong(jSessionHandle);
ckLastEncryptedPartLen = jOutLen;
if (directOut != 0) { if (directOut != 0) {
outBufP = (CK_BYTE_PTR)(directOut + jOutOfs); outBufP = (CK_BYTE_PTR) directOut;
} else { } else {
// output length should always be less than MAX_STACK_BUFFER_LEN outBufP = (*env)->GetPrimitiveArrayCritical(env, jOut, NULL);
outBufP = BUF; if (outBufP == NULL) { return 0; }
} }
ckLastEncryptedPartLen = jOutLen;
//printf("EF: outBufP=%i\n", outBufP); //printf("EF: outBufP=%i\n", outBufP);
rv = (*ckpFunctions->C_EncryptFinal)(ckSessionHandle, outBufP, rv = (*ckpFunctions->C_EncryptFinal)(ckSessionHandle,
(CK_BYTE_PTR)(outBufP + jOutOfs),
&ckLastEncryptedPartLen); &ckLastEncryptedPartLen);
//printf("EF: ckLastEncryptedPartLen=%i", ckLastEncryptedPartLen); //printf("EF: ckLastEncryptedPartLen=%i", ckLastEncryptedPartLen);
if (ckAssertReturnValueOK(env, rv) == CK_ASSERT_OK) { if (directOut == 0) {
if (directOut == 0 && ckLastEncryptedPartLen > 0) { (*env)->ReleasePrimitiveArrayCritical(env, jOut, outBufP, JNI_ABORT);
(*env)->SetByteArrayRegion(env, jOut, jOutOfs, ckLastEncryptedPartLen,
(jbyte *)outBufP);
}
} }
if (directOut == 0 && outBufP != BUF) { ckAssertReturnValueOK(env, rv);
free(outBufP);
}
return ckLastEncryptedPartLen; return ckLastEncryptedPartLen;
} }
#endif #endif
...@@ -381,8 +334,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1Decrypt ...@@ -381,8 +334,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1Decrypt
{ {
CK_SESSION_HANDLE ckSessionHandle; CK_SESSION_HANDLE ckSessionHandle;
CK_RV rv; CK_RV rv;
CK_BYTE IBUF[MAX_STACK_BUFFER_LEN];
CK_BYTE OBUF[MAX_STACK_BUFFER_LEN];
CK_BYTE_PTR inBufP; CK_BYTE_PTR inBufP;
CK_BYTE_PTR outBufP; CK_BYTE_PTR outBufP;
CK_ULONG ckPartLen; CK_ULONG ckPartLen;
...@@ -392,49 +344,27 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1Decrypt ...@@ -392,49 +344,27 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1Decrypt
ckSessionHandle = jLongToCKULong(jSessionHandle); ckSessionHandle = jLongToCKULong(jSessionHandle);
if (jInLen > MAX_STACK_BUFFER_LEN) { inBufP = (*env)->GetPrimitiveArrayCritical(env, jIn, NULL);
inBufP = (CK_BYTE_PTR)malloc((size_t)jInLen); if (inBufP == NULL) { return 0; }
if (inBufP == NULL) {
JNU_ThrowOutOfMemoryError(env, 0); outBufP = (*env)->GetPrimitiveArrayCritical(env, jOut, NULL);
if (outBufP == NULL) {
// Make sure to release inBufP
(*env)->ReleasePrimitiveArrayCritical(env, jIn, inBufP, JNI_ABORT);
return 0; return 0;
}
} else {
inBufP = IBUF;
}
(*env)->GetByteArrayRegion(env, jIn, jInOfs, jInLen, (jbyte *)inBufP);
if ((*env)->ExceptionCheck(env)) {
if (inBufP != IBUF) { free(inBufP); }
return 0;
} }
ckPartLen = jOutLen; ckPartLen = jOutLen;
if (jOutLen > MAX_STACK_BUFFER_LEN) {
outBufP = (CK_BYTE_PTR)malloc((size_t)jOutLen);
if (outBufP == NULL) {
if (inBufP != IBUF) {
free(inBufP);
}
JNU_ThrowOutOfMemoryError(env, 0);
return 0;
}
} else {
outBufP = OBUF;
}
rv = (*ckpFunctions->C_Decrypt)(ckSessionHandle, inBufP, jInLen,
outBufP, &ckPartLen);
if (ckAssertReturnValueOK(env, rv) == CK_ASSERT_OK) { rv = (*ckpFunctions->C_Decrypt)(ckSessionHandle,
if (ckPartLen > 0) { (CK_BYTE_PTR)(inBufP + jInOfs), jInLen,
(*env)->SetByteArrayRegion(env, jOut, jOutOfs, ckPartLen, (CK_BYTE_PTR)(outBufP + jOutOfs),
(jbyte *)outBufP); &ckPartLen);
}
} (*env)->ReleasePrimitiveArrayCritical(env, jOut, outBufP, JNI_ABORT);
if (inBufP != IBUF) { (*env)->ReleasePrimitiveArrayCritical(env, jIn, inBufP, JNI_ABORT);
free(inBufP);
} ckAssertReturnValueOK(env, rv);
if (outBufP != OBUF) {
free(outBufP);
}
return ckPartLen; return ckPartLen;
} }
...@@ -460,8 +390,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptUpdate ...@@ -460,8 +390,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptUpdate
{ {
CK_SESSION_HANDLE ckSessionHandle; CK_SESSION_HANDLE ckSessionHandle;
CK_RV rv; CK_RV rv;
CK_BYTE IBUF[MAX_STACK_BUFFER_LEN];
CK_BYTE OBUF[MAX_STACK_BUFFER_LEN];
CK_BYTE_PTR inBufP; CK_BYTE_PTR inBufP;
CK_BYTE_PTR outBufP; CK_BYTE_PTR outBufP;
CK_ULONG ckDecryptedPartLen; CK_ULONG ckDecryptedPartLen;
...@@ -472,59 +401,39 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptUpdate ...@@ -472,59 +401,39 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptUpdate
ckSessionHandle = jLongToCKULong(jSessionHandle); ckSessionHandle = jLongToCKULong(jSessionHandle);
if (directIn != 0) { if (directIn != 0) {
inBufP = (CK_BYTE_PTR)(directIn + jInOfs); inBufP = (CK_BYTE_PTR) directIn;
} else { } else {
if (jInLen > MAX_STACK_BUFFER_LEN) { inBufP = (*env)->GetPrimitiveArrayCritical(env, jIn, NULL);
inBufP = (CK_BYTE_PTR)malloc((size_t)jInLen); if (inBufP == NULL) { return 0; }
if (inBufP == NULL) {
JNU_ThrowOutOfMemoryError(env, 0);
return 0;
}
} else {
inBufP = IBUF;
}
(*env)->GetByteArrayRegion(env, jIn, jInOfs, jInLen, (jbyte *)inBufP);
if ((*env)->ExceptionCheck(env)) {
if (directIn == 0 && inBufP != IBUF) { free(inBufP); }
return 0;
}
} }
ckDecryptedPartLen = jOutLen;
if (directOut != 0) { if (directOut != 0) {
outBufP = (CK_BYTE_PTR)(directOut + jOutOfs); outBufP = (CK_BYTE_PTR) directOut;
} else { } else {
if (jOutLen > MAX_STACK_BUFFER_LEN) { outBufP = (*env)->GetPrimitiveArrayCritical(env, jOut, NULL);
outBufP = (CK_BYTE_PTR)malloc((size_t)jOutLen); if (outBufP == NULL) {
if (outBufP == NULL) { // Make sure to release inBufP
if (directIn == 0 && inBufP != IBUF) { (*env)->ReleasePrimitiveArrayCritical(env, jIn, inBufP, JNI_ABORT);
free(inBufP);
}
JNU_ThrowOutOfMemoryError(env, 0);
return 0; return 0;
} }
} else {
outBufP = OBUF;
}
} }
rv = (*ckpFunctions->C_DecryptUpdate)(ckSessionHandle, inBufP, jInLen, ckDecryptedPartLen = jOutLen;
outBufP, &ckDecryptedPartLen);
if (directIn == 0 && inBufP != IBUF) { rv = (*ckpFunctions->C_DecryptUpdate)(ckSessionHandle,
free(inBufP); (CK_BYTE_PTR)(inBufP + jInOfs), jInLen,
(CK_BYTE_PTR)(outBufP + jOutOfs),
&ckDecryptedPartLen);
if (directIn == 0) {
(*env)->ReleasePrimitiveArrayCritical(env, jIn, inBufP, JNI_ABORT);
} }
if (ckAssertReturnValueOK(env, rv) == CK_ASSERT_OK) { if (directOut == 0) {
if (directOut == 0 && ckDecryptedPartLen > 0) { (*env)->ReleasePrimitiveArrayCritical(env, jOut, outBufP, JNI_ABORT);
(*env)->SetByteArrayRegion(env, jOut, jOutOfs, ckDecryptedPartLen,
(jbyte *)outBufP);
}
} }
if (directOut == 0 && outBufP != OBUF) { ckAssertReturnValueOK(env, rv);
free(outBufP);
}
return ckDecryptedPartLen; return ckDecryptedPartLen;
} }
...@@ -547,7 +456,6 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptFinal ...@@ -547,7 +456,6 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptFinal
{ {
CK_SESSION_HANDLE ckSessionHandle; CK_SESSION_HANDLE ckSessionHandle;
CK_RV rv; CK_RV rv;
CK_BYTE BUF[MAX_STACK_BUFFER_LEN];
CK_BYTE_PTR outBufP; CK_BYTE_PTR outBufP;
CK_ULONG ckLastPartLen; CK_ULONG ckLastPartLen;
...@@ -556,27 +464,26 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptFinal ...@@ -556,27 +464,26 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptFinal
ckSessionHandle = jLongToCKULong(jSessionHandle); ckSessionHandle = jLongToCKULong(jSessionHandle);
ckLastPartLen = jOutLen;
if (directOut != 0) { if (directOut != 0) {
outBufP = (CK_BYTE_PTR)(directOut + jOutOfs); outBufP = (CK_BYTE_PTR) directOut;
} else { } else {
// jOutLen should always be less than MAX_STACK_BUFFER_LEN outBufP = (*env)->GetPrimitiveArrayCritical(env, jOut, NULL);
outBufP = BUF; if (outBufP == NULL) { return 0; }
} }
rv = (*ckpFunctions->C_DecryptFinal)(ckSessionHandle, outBufP, ckLastPartLen = jOutLen;
rv = (*ckpFunctions->C_DecryptFinal)(ckSessionHandle,
(CK_BYTE_PTR)(outBufP + jOutOfs),
&ckLastPartLen); &ckLastPartLen);
if (ckAssertReturnValueOK(env, rv) == CK_ASSERT_OK) { if (directOut == 0) {
if (directOut == 0 && ckLastPartLen > 0) { (*env)->ReleasePrimitiveArrayCritical(env, jOut, outBufP, JNI_ABORT);
(*env)->SetByteArrayRegion(env, jOut, jOutOfs, ckLastPartLen,
(jbyte *)outBufP);
}
}
if (directOut == 0 && outBufP != BUF) {
free(outBufP);
} }
ckAssertReturnValueOK(env, rv);
return ckLastPartLen; return ckLastPartLen;
} }
#endif #endif
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或