Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
294c2232
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看板
提交
294c2232
编写于
4月 02, 2016
作者:
I
igerasim
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8149017: Delayed provider selection broken in RSA client key exchange
Reviewed-by: coffeys
上级
6efe6e7f
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
25 addition
and
7 deletion
+25
-7
src/share/classes/sun/security/ssl/RSAClientKeyExchange.java
src/share/classes/sun/security/ssl/RSAClientKeyExchange.java
+25
-7
未找到文件。
src/share/classes/sun/security/ssl/RSAClientKeyExchange.java
浏览文件 @
294c2232
/*
/*
* Copyright (c) 1996, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 201
6
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
*
* This code is free software; you can redistribute it and/or modify it
* This code is free software; you can redistribute it and/or modify it
...
@@ -113,10 +113,31 @@ final class RSAClientKeyExchange extends HandshakeMessage {
...
@@ -113,10 +113,31 @@ final class RSAClientKeyExchange extends HandshakeMessage {
byte
[]
encoded
=
null
;
byte
[]
encoded
=
null
;
try
{
try
{
boolean
needFailover
=
false
;
Cipher
cipher
=
JsseJce
.
getCipher
(
JsseJce
.
CIPHER_RSA_PKCS1
);
Cipher
cipher
=
JsseJce
.
getCipher
(
JsseJce
.
CIPHER_RSA_PKCS1
);
boolean
needFailover
=
!
KeyUtil
.
isOracleJCEProvider
(
try
{
// Try UNWRAP_MODE mode firstly.
cipher
.
init
(
Cipher
.
UNWRAP_MODE
,
privateKey
,
new
TlsRsaPremasterSecretParameterSpec
(
maxVersion
.
v
,
currentVersion
.
v
),
generator
);
// The provider selection can be delayed, please don't call
// any Cipher method before the call to Cipher.init().
needFailover
=
!
KeyUtil
.
isOracleJCEProvider
(
cipher
.
getProvider
().
getName
());
cipher
.
getProvider
().
getName
());
}
catch
(
InvalidKeyException
|
UnsupportedOperationException
iue
)
{
if
(
debug
!=
null
&&
Debug
.
isOn
(
"handshake"
))
{
System
.
out
.
println
(
"The Cipher provider "
+
cipher
.
getProvider
().
getName
()
+
" caused exception: "
+
iue
.
getMessage
());
}
needFailover
=
true
;
}
if
(
needFailover
)
{
if
(
needFailover
)
{
// Use DECRYPT_MODE and dispose the previous initialization.
cipher
.
init
(
Cipher
.
DECRYPT_MODE
,
privateKey
);
cipher
.
init
(
Cipher
.
DECRYPT_MODE
,
privateKey
);
boolean
failed
=
false
;
boolean
failed
=
false
;
try
{
try
{
...
@@ -132,10 +153,7 @@ final class RSAClientKeyExchange extends HandshakeMessage {
...
@@ -132,10 +153,7 @@ final class RSAClientKeyExchange extends HandshakeMessage {
maxVersion
.
v
,
currentVersion
.
v
,
maxVersion
.
v
,
currentVersion
.
v
,
encoded
,
generator
);
encoded
,
generator
);
}
else
{
}
else
{
cipher
.
init
(
Cipher
.
UNWRAP_MODE
,
privateKey
,
// the cipher should have been initialized
new
TlsRsaPremasterSecretParameterSpec
(
maxVersion
.
v
,
currentVersion
.
v
),
generator
);
preMaster
=
(
SecretKey
)
cipher
.
unwrap
(
encrypted
,
preMaster
=
(
SecretKey
)
cipher
.
unwrap
(
encrypted
,
"TlsRsaPremasterSecret"
,
Cipher
.
SECRET_KEY
);
"TlsRsaPremasterSecret"
,
Cipher
.
SECRET_KEY
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录