archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 11:04:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Jesper Wilhelmsson 2019-06-25 14:36:31 +02:00
commit a1e6e5f785
16 changed files with 289 additions and 383 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2019, 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
@ -127,9 +127,10 @@ public class KeyManagerFactory {
*
* @param algorithm the standard name of the requested algorithm.
* See the <a href=
* "{@docRoot}/../specs/security/standard-names.html">
* Java Security Standard Algorithm Names</a> document
* for information about standard algorithm names.
* "{@docRoot}/../specs/security/standard-names.html#keymanagerfactory-algorithms">
* KeyManagerFactory section</a> in the Java Security Standard
* Algorithm Names Specification for information about standard
* algorithm names.
*
* @return the new {@code KeyManagerFactory} object
*
@ -165,9 +166,10 @@ public class KeyManagerFactory {
* @param algorithm the standard name of the requested algorithm.
* See the <a href=
* "{@docRoot}/../specs/security/standard-names.html">
* Java Security Standard Algorithm Names</a> document
* for information about standard algorithm names.
* "{@docRoot}/../specs/security/standard-names.html#keymanagerfactory-algorithms">
* KeyManagerFactory section</a> in the Java Security Standard
* Algorithm Names Specification for information about standard
* algorithm names.
*
* @param provider the name of the provider.
*
@ -209,9 +211,10 @@ public class KeyManagerFactory {
*
* @param algorithm the standard name of the requested algorithm.
* See the <a href=
* "{@docRoot}/../specs/security/standard-names.html">
* Java Security Standard Algorithm Names</a> document
* for information about standard algorithm names.
* "{@docRoot}/../specs/security/standard-names.html#keymanagerfactory-algorithms">
* KeyManagerFactory section</a> in the Java Security Standard
* Algorithm Names Specification for information about standard
* algorithm names.
*
* @param provider an instance of the provider.
*

23
src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2019, 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
@ -141,9 +141,10 @@ public class TrustManagerFactory {
*
* @param algorithm the standard name of the requested trust management
* algorithm. See the <a href=
* "{@docRoot}/../specs/security/standard-names.html">
* Java Security Standard Algorithm Names</a> document
* for information about standard algorithm names.
* "{@docRoot}/../specs/security/standard-names.html#trustmanagerfactory-algorithms">
* TrustManagerFactory section</a> in the Java Security Standard
* Algorithm Names Specification for information about standard
* algorithm names.
*
* @return the new {@code TrustManagerFactory} object
*
@ -179,9 +180,10 @@ public class TrustManagerFactory {
*
* @param algorithm the standard name of the requested trust management
* algorithm. See the <a href=
* "{@docRoot}/../specs/security/standard-names.html">
* Java Security Standard Algorithm Names</a> document
* for information about standard algorithm names.
* "{@docRoot}/../specs/security/standard-names.html#trustmanagerfactory-algorithms">
* TrustManagerFactory section</a> in the Java Security Standard
* Algorithm Names Specification for information about standard
* algorithm names.
*
* @param provider the name of the provider.
*
@ -223,9 +225,10 @@ public class TrustManagerFactory {
*
* @param algorithm the standard name of the requested trust management
* algorithm. See the <a href=
* "{@docRoot}/../specs/security/standard-names.html">
* Java Security Standard Algorithm Names</a> document
* for information about standard algorithm names.
* "{@docRoot}/../specs/security/standard-names.html#trustmanagerfactory-algorithms">
* TrustManagerFactory section</a> in the Java Security Standard
* Algorithm Names Specification for information about standard
* algorithm names.
*
* @param provider an instance of the provider.
*