Mercurial > hg > jdk9-shenandoah > jdk

changeset 12743:325b96583c6c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8015388: Required algorithms for JDK 9 Reviewed-by: jnimeh, wetmore, xuelei
author mullan
date Wed, 16 Sep 2015 08:23:37 -0400
parents 27dfaac11928
children 68856db2908a
files src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java src/java.base/share/classes/java/security/KeyPairGenerator.java src/java.base/share/classes/java/security/Signature.java src/java.base/share/classes/javax/crypto/Cipher.java src/java.base/share/classes/javax/net/ssl/SSLContext.java src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java
diffstat 6 files changed, 27 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java	Tue Sep 15 15:10:49 2015 -0700
+++ b/src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java	Wed Sep 16 08:23:37 2015 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -70,8 +70,8 @@
  * following standard {@code AlgorithmParameterGenerator} algorithms and
  * keysizes in parentheses:
  * <ul>
- * <li>{@code DiffieHellman} (1024)</li>
- * <li>{@code DSA} (1024)</li>
+ * <li>{@code DiffieHellman} (1024, 2048, 4096)</li>
+ * <li>{@code DSA} (1024, 2048)</li>
  * </ul>
  * These algorithms are described in the <a href=
  * "{@docRoot}/../technotes/guides/security/StandardNames.html#AlgorithmParameterGenerator">
--- a/src/java.base/share/classes/java/security/KeyPairGenerator.java	Tue Sep 15 15:10:49 2015 -0700
+++ b/src/java.base/share/classes/java/security/KeyPairGenerator.java	Wed Sep 16 08:23:37 2015 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -109,9 +109,9 @@
  * following standard {@code KeyPairGenerator} algorithms and keysizes in
  * parentheses:
  * <ul>
- * <li>{@code DiffieHellman} (1024)</li>
- * <li>{@code DSA} (1024)</li>
- * <li>{@code RSA} (1024, 2048)</li>
+ * <li>{@code DiffieHellman} (1024, 2048, 4096)</li>
+ * <li>{@code DSA} (1024, 2048)</li>
+ * <li>{@code RSA} (1024, 2048, 4096)</li>
  * </ul>
  * These algorithms are described in the <a href=
  * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyPairGenerator">
--- a/src/java.base/share/classes/java/security/Signature.java	Tue Sep 15 15:10:49 2015 -0700
+++ b/src/java.base/share/classes/java/security/Signature.java	Wed Sep 16 08:23:37 2015 -0400
@@ -102,6 +102,7 @@
  * following standard {@code Signature} algorithms:
  * <ul>
  * <li>{@code SHA1withDSA}</li>
+ * <li>{@code SHA256withDSA}</li>
  * <li>{@code SHA1withRSA}</li>
  * <li>{@code SHA256withRSA}</li>
  * </ul>
--- a/src/java.base/share/classes/javax/crypto/Cipher.java	Tue Sep 15 15:10:49 2015 -0700
+++ b/src/java.base/share/classes/javax/crypto/Cipher.java	Wed Sep 16 08:23:37 2015 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
--- a/src/java.base/share/classes/javax/net/ssl/SSLContext.java	Tue Sep 15 15:10:49 2015 -0700
+++ b/src/java.base/share/classes/javax/net/ssl/SSLContext.java	Wed Sep 16 08:23:37 2015 -0400
@@ -37,11 +37,13 @@
  * secure random bytes.
  *
  * <p> Every implementation of the Java platform is required to support the
- * following standard {@code SSLContext} protocol:
+ * following standard {@code SSLContext} protocols:
  * <ul>
  * <li>{@code TLSv1}</li>
+ * <li>{@code TLSv1.1}</li>
+ * <li>{@code TLSv1.2}</li>
  * </ul>
- * This protocol is described in the <a href=
+ * These protocols are described in the <a href=
  * "{@docRoot}/../technotes/guides/security/StandardNames.html#SSLContext">
  * SSLContext section</a> of the
  * Java Cryptography Architecture Standard Algorithm Name Documentation.
--- a/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java	Tue Sep 15 15:10:49 2015 -0700
+++ b/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java	Wed Sep 16 08:23:37 2015 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -34,7 +34,19 @@
  * This class acts as a factory for trust managers based on a
  * source of trust material. Each trust manager manages a specific
  * type of trust material for use by secure sockets. The trust
- * material is based on a KeyStore and/or provider specific sources.
+ * material is based on a KeyStore and/or provider-specific sources.
+ *
+ * <p> Every implementation of the Java platform is required to support the
+ * following standard {@code TrustManagerFactory} algorithm:
+ * <ul>
+ * <li><tt>PKIX</tt></li>
+ * </ul>
+ * This algorithm is described in the <a href=
+ * "{@docRoot}/../technotes/guides/security/StandardNames.html#TrustManagerFactory">
+ * TrustManagerFactory section</a> of the
+ * Java Cryptography Architecture Standard Algorithm Name Documentation.
+ * Consult the release documentation for your implementation to see if any
+ * other algorithms are supported.
  *
  * @since 1.4
  * @see TrustManager