Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
f2fc4f01
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
f2fc4f01
编写于
11月 08, 2014
作者:
A
ascarpino
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8063700: -Xcheck:jni changes cause many JCK failures in api/javax_crypto tests in SunPKCS11
Reviewed-by: mullan, valeriep
上级
f528a2f7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
70 addition
and
6 deletion
+70
-6
src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c
src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c
+6
-6
test/sun/security/pkcs11/Cipher/JNICheck.java
test/sun/security/pkcs11/Cipher/JNICheck.java
+64
-0
未找到文件。
src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c
浏览文件 @
f2fc4f01
...
@@ -141,8 +141,8 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1Encrypt
...
@@ -141,8 +141,8 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1Encrypt
(
CK_BYTE_PTR
)(
outBufP
+
jOutOfs
),
(
CK_BYTE_PTR
)(
outBufP
+
jOutOfs
),
&
ckEncryptedPartLen
);
&
ckEncryptedPartLen
);
(
*
env
)
->
ReleasePrimitiveArrayCritical
(
env
,
jOut
,
outBufP
,
JNI_ABORT
);
(
*
env
)
->
ReleasePrimitiveArrayCritical
(
env
,
jIn
,
inBufP
,
JNI_ABORT
);
(
*
env
)
->
ReleasePrimitiveArrayCritical
(
env
,
jIn
,
inBufP
,
JNI_ABORT
);
(
*
env
)
->
ReleasePrimitiveArrayCritical
(
env
,
jOut
,
outBufP
,
JNI_COMMIT
);
ckAssertReturnValueOK
(
env
,
rv
);
ckAssertReturnValueOK
(
env
,
rv
);
return
ckEncryptedPartLen
;
return
ckEncryptedPartLen
;
...
@@ -214,7 +214,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptUpdate
...
@@ -214,7 +214,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptUpdate
}
}
if
(
directOut
==
0
)
{
if
(
directOut
==
0
)
{
(
*
env
)
->
ReleasePrimitiveArrayCritical
(
env
,
jOut
,
outBufP
,
JNI_
ABOR
T
);
(
*
env
)
->
ReleasePrimitiveArrayCritical
(
env
,
jOut
,
outBufP
,
JNI_
COMMI
T
);
}
}
ckAssertReturnValueOK
(
env
,
rv
);
ckAssertReturnValueOK
(
env
,
rv
);
...
@@ -266,7 +266,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptFinal
...
@@ -266,7 +266,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptFinal
//printf("EF: ckLastEncryptedPartLen=%i", ckLastEncryptedPartLen);
//printf("EF: ckLastEncryptedPartLen=%i", ckLastEncryptedPartLen);
if
(
directOut
==
0
)
{
if
(
directOut
==
0
)
{
(
*
env
)
->
ReleasePrimitiveArrayCritical
(
env
,
jOut
,
outBufP
,
JNI_
ABOR
T
);
(
*
env
)
->
ReleasePrimitiveArrayCritical
(
env
,
jOut
,
outBufP
,
JNI_
COMMI
T
);
}
}
ckAssertReturnValueOK
(
env
,
rv
);
ckAssertReturnValueOK
(
env
,
rv
);
...
@@ -361,8 +361,8 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1Decrypt
...
@@ -361,8 +361,8 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1Decrypt
(
CK_BYTE_PTR
)(
outBufP
+
jOutOfs
),
(
CK_BYTE_PTR
)(
outBufP
+
jOutOfs
),
&
ckPartLen
);
&
ckPartLen
);
(
*
env
)
->
ReleasePrimitiveArrayCritical
(
env
,
jOut
,
outBufP
,
JNI_ABORT
);
(
*
env
)
->
ReleasePrimitiveArrayCritical
(
env
,
jIn
,
inBufP
,
JNI_ABORT
);
(
*
env
)
->
ReleasePrimitiveArrayCritical
(
env
,
jIn
,
inBufP
,
JNI_ABORT
);
(
*
env
)
->
ReleasePrimitiveArrayCritical
(
env
,
jOut
,
outBufP
,
JNI_COMMIT
);
ckAssertReturnValueOK
(
env
,
rv
);
ckAssertReturnValueOK
(
env
,
rv
);
...
@@ -429,7 +429,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptUpdate
...
@@ -429,7 +429,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptUpdate
}
}
if
(
directOut
==
0
)
{
if
(
directOut
==
0
)
{
(
*
env
)
->
ReleasePrimitiveArrayCritical
(
env
,
jOut
,
outBufP
,
JNI_
ABOR
T
);
(
*
env
)
->
ReleasePrimitiveArrayCritical
(
env
,
jOut
,
outBufP
,
JNI_
COMMI
T
);
}
}
ckAssertReturnValueOK
(
env
,
rv
);
ckAssertReturnValueOK
(
env
,
rv
);
...
@@ -478,7 +478,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptFinal
...
@@ -478,7 +478,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptFinal
&
ckLastPartLen
);
&
ckLastPartLen
);
if
(
directOut
==
0
)
{
if
(
directOut
==
0
)
{
(
*
env
)
->
ReleasePrimitiveArrayCritical
(
env
,
jOut
,
outBufP
,
JNI_
ABOR
T
);
(
*
env
)
->
ReleasePrimitiveArrayCritical
(
env
,
jOut
,
outBufP
,
JNI_
COMMI
T
);
}
}
...
...
test/sun/security/pkcs11/Cipher/JNICheck.java
0 → 100644
浏览文件 @
f2fc4f01
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8063700
* @run main/othervm -Xcheck:jni JNICheck
*/
import
javax.crypto.Cipher
;
import
javax.crypto.SealedObject
;
import
javax.crypto.SecretKey
;
import
javax.crypto.KeyGenerator
;
import
java.security.NoSuchProviderException
;
public
class
JNICheck
{
/* This test is similar to the JCK test that found 8063700. */
static
class
SealedObjectTest
{
Cipher
c
;
SealedObjectTest
()
throws
Exception
{
try
{
c
=
Cipher
.
getInstance
(
"AES"
,
"SunPKCS11-Solaris"
);
}
catch
(
NoSuchProviderException
nspe
)
{
System
.
out
.
println
(
"No SunPKCS11-Solaris provider. Test skipped"
);
return
;
}
String
s
=
"Test string"
;
SealedObject
so
;
SecretKey
key
=
KeyGenerator
.
getInstance
(
"AES"
).
generateKey
();
c
.
init
(
Cipher
.
ENCRYPT_MODE
,
key
);
so
=
new
SealedObject
(
s
,
c
);
so
.
getObject
(
key
,
"SunPKCS11-Solaris"
);
}
}
public
static
void
main
(
String
args
[])
throws
Exception
{
new
SealedObjectTest
();
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录