提交 e9a7550a 编写于 作者: X xuelei

7022855: Export "PKIX" as the standard algorithm name of KeyManagerFactory

Summary: export the existing "NewSunX509" algorithm implementation using the standard name "PKIX"
Reviewed-by: weijun, wetmore
上级 ec9ff2a5
/*
* Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 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
......@@ -378,7 +378,8 @@ final class ClientHandshaker extends Handshaker {
if (!isNegotiable(mesgVersion)) {
throw new SSLHandshakeException(
"Server chose " + mesgVersion +
", but client does not support or disables " + mesgVersion);
", but that protocol version is not enabled or not supported " +
"by the client.");
}
handshakeHash.protocolDetermined(mesgVersion);
......
/*
* Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 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
......@@ -195,6 +195,8 @@ public abstract class SunJSSE extends java.security.Provider {
"sun.security.ssl.KeyManagerFactoryImpl$SunX509");
put("KeyManagerFactory.NewSunX509",
"sun.security.ssl.KeyManagerFactoryImpl$X509");
put("Alg.Alias.KeyManagerFactory.PKIX", "NewSunX509");
put("TrustManagerFactory.SunX509",
"sun.security.ssl.TrustManagerFactoryImpl$SimpleFactory");
put("TrustManagerFactory.PKIX",
......
/*
* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 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
......@@ -23,8 +23,9 @@
/*
* @test
* @bug 4898428
* @bug 4898428 7022855
* @summary verify getInstance() works using Provider.getService()
* Export "PKIX" as the standard algorithm name of KeyManagerFactory
* @author Andreas Sterbenz
*/
......@@ -61,6 +62,20 @@ public class GetInstance {
kmf = KeyManagerFactory.getInstance("SunX509", p);
same(p, kmf.getProvider());
kmf = KeyManagerFactory.getInstance("NewSunX509");
same(p, kmf.getProvider());
kmf = KeyManagerFactory.getInstance("NewSunX509", "SunJSSE");
same(p, kmf.getProvider());
kmf = KeyManagerFactory.getInstance("NewSunX509", p);
same(p, kmf.getProvider());
kmf = KeyManagerFactory.getInstance("PKIX");
same(p, kmf.getProvider());
kmf = KeyManagerFactory.getInstance("PKIX", "SunJSSE");
same(p, kmf.getProvider());
kmf = KeyManagerFactory.getInstance("PKIX", p);
same(p, kmf.getProvider());
TrustManagerFactory tmf;
tmf = TrustManagerFactory.getInstance("SunX509");
same(p, tmf.getProvider());
......@@ -69,6 +84,34 @@ public class GetInstance {
tmf = TrustManagerFactory.getInstance("SunX509", p);
same(p, tmf.getProvider());
tmf = TrustManagerFactory.getInstance("PKIX");
same(p, tmf.getProvider());
tmf = TrustManagerFactory.getInstance("PKIX", "SunJSSE");
same(p, tmf.getProvider());
tmf = TrustManagerFactory.getInstance("PKIX", p);
same(p, tmf.getProvider());
tmf = TrustManagerFactory.getInstance("SunPKIX");
same(p, tmf.getProvider());
tmf = TrustManagerFactory.getInstance("SunPKIX", "SunJSSE");
same(p, tmf.getProvider());
tmf = TrustManagerFactory.getInstance("SunPKIX", p);
same(p, tmf.getProvider());
tmf = TrustManagerFactory.getInstance("X509");
same(p, tmf.getProvider());
tmf = TrustManagerFactory.getInstance("X509", "SunJSSE");
same(p, tmf.getProvider());
tmf = TrustManagerFactory.getInstance("X509", p);
same(p, tmf.getProvider());
tmf = TrustManagerFactory.getInstance("X.509");
same(p, tmf.getProvider());
tmf = TrustManagerFactory.getInstance("X.509", "SunJSSE");
same(p, tmf.getProvider());
tmf = TrustManagerFactory.getInstance("X.509", p);
same(p, tmf.getProvider());
testComSun();
long stop = System.currentTimeMillis();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册