# HG changeset patch # User mullan # Date 1442406217 14400 # Node ID 53b8fd1f38403c64e9b83f90e484acc54a9e14a7 # Parent 32e2fd6206d1d2d75b0c117fe8d7adf8950a7d35 8015388: Required algorithms for JDK 9 Reviewed-by: jnimeh, wetmore, xuelei diff -r 32e2fd6206d1 -r 53b8fd1f3840 jdk/src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java --- a/jdk/src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java Tue Sep 15 15:10:49 2015 -0700 +++ b/jdk/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: * * These algorithms are described in the diff -r 32e2fd6206d1 -r 53b8fd1f3840 jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java --- a/jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java Tue Sep 15 15:10:49 2015 -0700 +++ b/jdk/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: * * These algorithms are described in the diff -r 32e2fd6206d1 -r 53b8fd1f3840 jdk/src/java.base/share/classes/java/security/Signature.java --- a/jdk/src/java.base/share/classes/java/security/Signature.java Tue Sep 15 15:10:49 2015 -0700 +++ b/jdk/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: * diff -r 32e2fd6206d1 -r 53b8fd1f3840 jdk/src/java.base/share/classes/javax/crypto/Cipher.java --- a/jdk/src/java.base/share/classes/javax/crypto/Cipher.java Tue Sep 15 15:10:49 2015 -0700 +++ b/jdk/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 diff -r 32e2fd6206d1 -r 53b8fd1f3840 jdk/src/java.base/share/classes/javax/net/ssl/SSLContext.java --- a/jdk/src/java.base/share/classes/javax/net/ssl/SSLContext.java Tue Sep 15 15:10:49 2015 -0700 +++ b/jdk/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. * *

Every implementation of the Java platform is required to support the - * following standard {@code SSLContext} protocol: + * following standard {@code SSLContext} protocols: *

- * This protocol is described in the * SSLContext section of the * Java Cryptography Architecture Standard Algorithm Name Documentation. diff -r 32e2fd6206d1 -r 53b8fd1f3840 jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java --- a/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java Tue Sep 15 15:10:49 2015 -0700 +++ b/jdk/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. + * + *

Every implementation of the Java platform is required to support the + * following standard {@code TrustManagerFactory} algorithm: + *

+ * This algorithm is described in the + * TrustManagerFactory section 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