Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
50b85f77
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
3
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
50b85f77
编写于
5月 04, 2011
作者:
V
vinnie
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
6738532: Error in Elliptic Curve NamedCurve determination. (related to PKCS11)
Reviewed-by: valeriep
上级
3b70481b
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
94 addition
and
9 deletion
+94
-9
src/share/classes/java/security/spec/EllipticCurve.java
src/share/classes/java/security/spec/EllipticCurve.java
+10
-9
test/java/security/spec/EllipticCurveMatch.java
test/java/security/spec/EllipticCurveMatch.java
+84
-0
未找到文件。
src/share/classes/java/security/spec/EllipticCurve.java
浏览文件 @
50b85f77
/*
* Copyright (c) 2003, 20
06
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 20
11
, 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
...
...
@@ -165,8 +165,7 @@ public class EllipticCurve {
* specified object.
* @param obj the object to be compared.
* @return true if <code>obj</code> is an instance of
* EllipticCurve and the field, A, B, and seeding bytes
* match, false otherwise.
* EllipticCurve and the field, A, and B match, false otherwise.
*/
public
boolean
equals
(
Object
obj
)
{
if
(
this
==
obj
)
return
true
;
...
...
@@ -174,8 +173,7 @@ public class EllipticCurve {
EllipticCurve
curve
=
(
EllipticCurve
)
obj
;
if
((
field
.
equals
(
curve
.
field
))
&&
(
a
.
equals
(
curve
.
a
))
&&
(
b
.
equals
(
curve
.
b
))
&&
(
Arrays
.
equals
(
seed
,
curve
.
seed
)))
{
(
b
.
equals
(
curve
.
b
)))
{
return
true
;
}
}
...
...
@@ -184,12 +182,15 @@ public class EllipticCurve {
/**
* Returns a hash code value for this elliptic curve.
* @return a hash code value.
* @return a hash code value computed from the hash codes of the field, A,
* and B, as follows:
* <code>
* (field.hashCode() << 6) + (a.hashCode() << 4) + (b.hashCode() << 2)
* </code>
*/
public
int
hashCode
()
{
return
(
field
.
hashCode
()
<<
6
+
(
a
.
hashCode
()
<<
4
)
+
(
b
.
hashCode
()
<<
2
)
+
(
seed
==
null
?
0
:
seed
.
length
));
(
b
.
hashCode
()
<<
2
));
}
}
test/java/security/spec/EllipticCurveMatch.java
0 → 100644
浏览文件 @
50b85f77
/*
* Copyright (c) 2011, 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 6738532
* @summary Check EllipticCurve.equals() does not compare seed value of curve.
* @run main/othervm EllipticCurveMatch
* @author Mike StJohns
*/
import
java.security.spec.*
;
import
java.math.BigInteger
;
import
java.security.SecureRandom
;
public
class
EllipticCurveMatch
{
static
String
primeP256
=
"0FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF"
;
static
String
aP256
=
"0FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC"
;
static
String
bP256
=
"05AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B"
;
static
String
seedP256
=
"0C49D360886E704936A6678E1139D26B7819F7E90"
;
private
static
EllipticCurve
addSeedToCurve
(
EllipticCurve
curve
)
{
SecureRandom
rand
=
new
SecureRandom
();
byte
[]
seed
=
new
byte
[
12
];
rand
.
nextBytes
(
seed
);
return
new
EllipticCurve
(
curve
.
getField
(),
curve
.
getA
(),
curve
.
getB
(),
seed
);
}
private
static
EllipticCurve
getP256Curve
()
{
ECFieldFp
field
=
new
ECFieldFp
(
new
BigInteger
(
primeP256
,
16
));
BigInteger
a
=
new
BigInteger
(
aP256
,
16
);
BigInteger
b
=
new
BigInteger
(
bP256
,
16
);
return
new
EllipticCurve
(
field
,
a
,
b
);
}
public
static
void
main
(
String
[]
argv
)
throws
Exception
{
EllipticCurve
firstCurve
=
getP256Curve
();
EllipticCurve
secondCurve
=
addSeedToCurve
(
firstCurve
);
EllipticCurve
thirdCurve
=
addSeedToCurve
(
firstCurve
);
if
(!
firstCurve
.
equals
(
firstCurve
))
throw
new
Exception
(
"Original curve doesn't equal itself"
);
if
(!
firstCurve
.
equals
(
secondCurve
))
throw
new
Exception
(
"Original curve doesn't equal seeded curve"
);
if
(!
secondCurve
.
equals
(
secondCurve
))
throw
new
Exception
(
"Seeded curve doesn't equal itself"
);
if
(!
secondCurve
.
equals
(
thirdCurve
))
throw
new
Exception
(
"Seeded curve doesn't equal differently "
+
"seeded curve"
);
System
.
out
.
println
(
"Curve equals test passed"
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录