Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
12997553
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看板
提交
12997553
编写于
9月 19, 2013
作者:
A
ascarpino
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
7122707: Security Providers need to have their version numbers updated for JDK8
Reviewed-by: xuelei
上级
0da8f78c
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
89 addition
and
29 deletion
+89
-29
src/macosx/classes/apple/security/AppleProvider.java
src/macosx/classes/apple/security/AppleProvider.java
+2
-2
src/share/classes/com/sun/crypto/provider/SunJCE.java
src/share/classes/com/sun/crypto/provider/SunJCE.java
+1
-1
src/share/classes/com/sun/security/sasl/Provider.java
src/share/classes/com/sun/security/sasl/Provider.java
+2
-2
src/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java
...hare/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java
+2
-2
src/share/classes/sun/security/ec/SunEC.java
src/share/classes/sun/security/ec/SunEC.java
+2
-2
src/share/classes/sun/security/jgss/SunProvider.java
src/share/classes/sun/security/jgss/SunProvider.java
+2
-2
src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
.../classes/sun/security/jgss/wrapper/SunNativeProvider.java
+2
-2
src/share/classes/sun/security/pkcs11/SunPKCS11.java
src/share/classes/sun/security/pkcs11/SunPKCS11.java
+2
-2
src/share/classes/sun/security/provider/MD4.java
src/share/classes/sun/security/provider/MD4.java
+2
-2
src/share/classes/sun/security/provider/Sun.java
src/share/classes/sun/security/provider/Sun.java
+1
-1
src/share/classes/sun/security/provider/VerificationProvider.java
...e/classes/sun/security/provider/VerificationProvider.java
+2
-2
src/share/classes/sun/security/rsa/SunRsaSign.java
src/share/classes/sun/security/rsa/SunRsaSign.java
+2
-2
src/share/classes/sun/security/smartcardio/SunPCSC.java
src/share/classes/sun/security/smartcardio/SunPCSC.java
+2
-2
src/share/classes/sun/security/ssl/JsseJce.java
src/share/classes/sun/security/ssl/JsseJce.java
+1
-1
src/share/classes/sun/security/ssl/SunJSSE.java
src/share/classes/sun/security/ssl/SunJSSE.java
+2
-2
src/windows/classes/sun/security/mscapi/SunMSCAPI.java
src/windows/classes/sun/security/mscapi/SunMSCAPI.java
+2
-2
test/java/security/Provider/ProviderVersionCheck.java
test/java/security/Provider/ProviderVersionCheck.java
+60
-0
未找到文件。
src/macosx/classes/apple/security/AppleProvider.java
浏览文件 @
12997553
/*
* Copyright (c) 2011, 201
2
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 201
3
, 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
...
...
@@ -43,7 +43,7 @@ public final class AppleProvider extends Provider {
public
AppleProvider
()
{
/* We are the Apple provider */
super
(
"Apple"
,
1.
1
,
info
);
super
(
"Apple"
,
1.
8d
,
info
);
AccessController
.<
Object
>
doPrivileged
(
new
java
.
security
.
PrivilegedAction
<
Object
>()
{
public
Object
run
()
{
...
...
src/share/classes/com/sun/crypto/provider/SunJCE.java
浏览文件 @
12997553
...
...
@@ -104,7 +104,7 @@ public final class SunJCE extends Provider {
public
SunJCE
()
{
/* We are the "SunJCE" provider */
super
(
"SunJCE"
,
1.
7
d
,
info
);
super
(
"SunJCE"
,
1.
8
d
,
info
);
final
String
BLOCK_MODES
=
"ECB|CBC|PCBC|CTR|CTS|CFB|OFB"
+
"|CFB8|CFB16|CFB24|CFB32|CFB40|CFB48|CFB56|CFB64"
+
...
...
src/share/classes/com/sun/security/sasl/Provider.java
浏览文件 @
12997553
/*
* Copyright (c) 2003, 201
0
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 201
3
, 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
...
...
@@ -53,7 +53,7 @@ public final class Provider extends java.security.Provider {
" server mechanisms for: DIGEST-MD5, GSSAPI, CRAM-MD5, NTLM)"
;
public
Provider
()
{
super
(
"SunSASL"
,
1.
7
d
,
info
);
super
(
"SunSASL"
,
1.
8
d
,
info
);
AccessController
.
doPrivileged
(
new
PrivilegedAction
<
Void
>()
{
public
Void
run
()
{
...
...
src/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java
浏览文件 @
12997553
...
...
@@ -28,7 +28,7 @@
* ===========================================================================
*/
/*
* Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005,
2013
Oracle and/or its affiliates. All rights reserved.
*/
/*
* $Id: XMLDSigRI.java 1400021 2012-10-19 10:16:04Z coheigea $
...
...
@@ -61,7 +61,7 @@ public final class XMLDSigRI extends Provider {
public
XMLDSigRI
()
{
/* We are the XMLDSig provider */
super
(
"XMLDSig"
,
1.8
,
INFO
);
super
(
"XMLDSig"
,
1.8
d
,
INFO
);
final
Map
<
Object
,
Object
>
map
=
new
HashMap
<
Object
,
Object
>();
map
.
put
(
"XMLSignatureFactory.DOM"
,
...
...
src/share/classes/sun/security/ec/SunEC.java
浏览文件 @
12997553
/*
* Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009,
2013,
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
...
...
@@ -67,7 +67,7 @@ public final class SunEC extends Provider {
}
public
SunEC
()
{
super
(
"SunEC"
,
1.
7
d
,
"Sun Elliptic Curve provider (EC, ECDSA, ECDH)"
);
super
(
"SunEC"
,
1.
8
d
,
"Sun Elliptic Curve provider (EC, ECDSA, ECDH)"
);
// if there is no security manager installed, put directly into
// the provider. Otherwise, create a temporary map and use a
...
...
src/share/classes/sun/security/jgss/SunProvider.java
浏览文件 @
12997553
/*
* Copyright (c) 2000, 20
06
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 20
13
, 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
...
...
@@ -62,7 +62,7 @@ public final class SunProvider extends Provider {
public
SunProvider
()
{
/* We are the Sun JGSS provider */
super
(
"SunJGSS"
,
1.
7
d
,
INFO
);
super
(
"SunJGSS"
,
1.
8
d
,
INFO
);
AccessController
.
doPrivileged
(
new
java
.
security
.
PrivilegedAction
<
Void
>()
{
...
...
src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
浏览文件 @
12997553
/*
* Copyright (c) 2005, 201
2
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 201
3
, 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
...
...
@@ -120,7 +120,7 @@ public final class SunNativeProvider extends Provider {
public
SunNativeProvider
()
{
/* We are the Sun NativeGSS provider */
super
(
NAME
,
1.
0
,
INFO
);
super
(
NAME
,
1.
8d
,
INFO
);
if
(
MECH_MAP
!=
null
)
{
AccessController
.
doPrivileged
(
new
PutAllAction
(
this
,
MECH_MAP
));
...
...
src/share/classes/sun/security/pkcs11/SunPKCS11.java
浏览文件 @
12997553
...
...
@@ -94,7 +94,7 @@ public final class SunPKCS11 extends AuthProvider {
}
public
SunPKCS11
()
{
super
(
"SunPKCS11-Dummy"
,
1.
7
d
,
"SunPKCS11-Dummy"
);
super
(
"SunPKCS11-Dummy"
,
1.
8
d
,
"SunPKCS11-Dummy"
);
throw
new
ProviderException
(
"SunPKCS11 requires configuration file argument"
);
}
...
...
@@ -127,7 +127,7 @@ public final class SunPKCS11 extends AuthProvider {
public
SunPKCS11
(
String
configName
,
InputStream
configStream
)
{
super
(
"SunPKCS11-"
+
Config
.
getConfig
(
configName
,
configStream
).
getName
(),
1.
7
d
,
Config
.
getConfig
(
configName
,
configStream
).
getDescription
());
1.
8
d
,
Config
.
getConfig
(
configName
,
configStream
).
getDescription
());
this
.
configName
=
configName
;
this
.
config
=
Config
.
removeConfig
(
configName
);
...
...
src/share/classes/sun/security/provider/MD4.java
浏览文件 @
12997553
/*
* Copyright (c) 2005, 201
2
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 201
3
, 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
...
...
@@ -65,7 +65,7 @@ public final class MD4 extends DigestBase {
private
final
static
Provider
md4Provider
;
static
{
md4Provider
=
new
Provider
(
"MD4Provider"
,
1.
0
d
,
"MD4 MessageDigest"
)
{
md4Provider
=
new
Provider
(
"MD4Provider"
,
1.
8
d
,
"MD4 MessageDigest"
)
{
private
static
final
long
serialVersionUID
=
-
8850464997518327965L
;
};
AccessController
.
doPrivileged
(
new
PrivilegedAction
<
Void
>()
{
...
...
src/share/classes/sun/security/provider/Sun.java
浏览文件 @
12997553
...
...
@@ -47,7 +47,7 @@ public final class Sun extends Provider {
public
Sun
()
{
/* We are the SUN provider */
super
(
"SUN"
,
1.8
,
INFO
);
super
(
"SUN"
,
1.8
d
,
INFO
);
// if there is no security manager installed, put directly into
// the provider. Otherwise, create a temporary map and use a
...
...
src/share/classes/sun/security/provider/VerificationProvider.java
浏览文件 @
12997553
/*
* Copyright (c) 1996, 201
1
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 201
3
, 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
...
...
@@ -61,7 +61,7 @@ public final class VerificationProvider extends Provider {
}
public
VerificationProvider
()
{
super
(
"SunJarVerification"
,
1.
7
,
"Jar Verification Provider"
);
super
(
"SunJarVerification"
,
1.
8d
,
"Jar Verification Provider"
);
// register all algorithms normally registered by the Sun and SunRsaSign
// providers, but only if they are missing
if
(
ACTIVE
==
false
)
{
...
...
src/share/classes/sun/security/rsa/SunRsaSign.java
浏览文件 @
12997553
/*
* Copyright (c) 2003, 201
1
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 201
3
, 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
...
...
@@ -43,7 +43,7 @@ public final class SunRsaSign extends Provider {
private
static
final
long
serialVersionUID
=
866040293550393045L
;
public
SunRsaSign
()
{
super
(
"SunRsaSign"
,
1.
7
d
,
"Sun RSA signature provider"
);
super
(
"SunRsaSign"
,
1.
8
d
,
"Sun RSA signature provider"
);
// if there is no security manager installed, put directly into
// the provider. Otherwise, create a temporary map and use a
...
...
src/share/classes/sun/security/smartcardio/SunPCSC.java
浏览文件 @
12997553
/*
* Copyright (c) 2005, 20
06
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 20
13
, 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
...
...
@@ -40,7 +40,7 @@ public final class SunPCSC extends Provider {
private
static
final
long
serialVersionUID
=
6168388284028876579L
;
public
SunPCSC
()
{
super
(
"SunPCSC"
,
1.
7
d
,
"Sun PC/SC provider"
);
super
(
"SunPCSC"
,
1.
8
d
,
"Sun PC/SC provider"
);
AccessController
.
doPrivileged
(
new
PrivilegedAction
<
Void
>()
{
public
Void
run
()
{
put
(
"TerminalFactory.PC/SC"
,
"sun.security.smartcardio.SunPCSC$Factory"
);
...
...
src/share/classes/sun/security/ssl/JsseJce.java
浏览文件 @
12997553
...
...
@@ -110,7 +110,7 @@ final class JsseJce {
private
static
final
long
serialVersionUID
=
-
3284138292032213752L
;
SunCertificates
(
final
Provider
p
)
{
super
(
"SunCertificates"
,
1.
0
d
,
"SunJSSE internal"
);
super
(
"SunCertificates"
,
1.
8
d
,
"SunJSSE internal"
);
AccessController
.
doPrivileged
(
new
PrivilegedAction
<
Object
>()
{
@Override
public
Object
run
()
{
...
...
src/share/classes/sun/security/ssl/SunJSSE.java
浏览文件 @
12997553
/*
* Copyright (c) 1999, 201
2
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 201
3
, 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
...
...
@@ -131,7 +131,7 @@ public abstract class SunJSSE extends java.security.Provider {
private
SunJSSE
(
java
.
security
.
Provider
cryptoProvider
,
String
providerName
)
{
super
(
"SunJSSE"
,
1.
6
d
,
fipsInfo
+
providerName
+
")"
);
super
(
"SunJSSE"
,
1.
8
d
,
fipsInfo
+
providerName
+
")"
);
subclassCheck
();
if
(
cryptoProvider
==
null
)
{
// Calling Security.getProvider() will cause other providers to be
...
...
src/windows/classes/sun/security/mscapi/SunMSCAPI.java
浏览文件 @
12997553
/*
* Copyright (c) 2005, 201
2
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 201
3
, 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
...
...
@@ -56,7 +56,7 @@ public final class SunMSCAPI extends Provider {
}
public
SunMSCAPI
()
{
super
(
"SunMSCAPI"
,
1.
7
d
,
INFO
);
super
(
"SunMSCAPI"
,
1.
8
d
,
INFO
);
// if there is no security manager installed, put directly into
// the provider. Otherwise, create a temporary map and use a
...
...
test/java/security/Provider/ProviderVersionCheck.java
0 → 100644
浏览文件 @
12997553
/*
* Copyright (c) 2013, 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.
*/
import
java.security.Provider
;
import
java.security.Security
;
import
java.lang.Exception
;
/*
* @test
* @bug 7122707
* @run main/othervm ProviderVersionCheck
* @summary Verify all providers in the default Providers list have the proper
* version for the release
* @author Anthony Scarpino
*/
public
class
ProviderVersionCheck
{
public
static
void
main
(
String
arg
[])
throws
Exception
{
boolean
failure
=
false
;
for
(
Provider
p:
Security
.
getProviders
())
{
System
.
out
.
print
(
p
.
getName
()
+
" "
);
if
(
p
.
getVersion
()
!=
1.8d
)
{
System
.
out
.
println
(
"failed. "
+
"Version received was "
+
p
.
getVersion
());
failure
=
true
;
}
else
{
System
.
out
.
println
(
"passed."
);
}
}
if
(
failure
)
{
throw
new
Exception
(
"Provider(s) failed to have the expected "
+
"version value."
);
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录