mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-27 06:45:07 +02:00
8273045: Fix misc javadoc bugs in the java.security and javax.net.ssl code
Reviewed-by: xuelei
This commit is contained in:
parent
b16a04ebf7
commit
76baace2f0
10 changed files with 40 additions and 35 deletions
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
|
@ -96,7 +96,7 @@ public abstract class AuthProvider extends Provider {
|
||||||
* from the caller, which may be {@code null}
|
* from the caller, which may be {@code null}
|
||||||
*
|
*
|
||||||
* @throws IllegalStateException if the provider requires configuration
|
* @throws IllegalStateException if the provider requires configuration
|
||||||
* and {@link configure} has not been called
|
* and {@link #configure} has not been called
|
||||||
* @throws LoginException if the login operation fails
|
* @throws LoginException if the login operation fails
|
||||||
* @throws SecurityException if the caller does not pass a
|
* @throws SecurityException if the caller does not pass a
|
||||||
* security check for
|
* security check for
|
||||||
|
@ -111,7 +111,7 @@ public abstract class AuthProvider extends Provider {
|
||||||
* Log out from this provider.
|
* Log out from this provider.
|
||||||
*
|
*
|
||||||
* @throws IllegalStateException if the provider requires configuration
|
* @throws IllegalStateException if the provider requires configuration
|
||||||
* and {@link configure} has not been called
|
* and {@link #configure} has not been called
|
||||||
* @throws LoginException if the logout operation fails
|
* @throws LoginException if the logout operation fails
|
||||||
* @throws SecurityException if the caller does not pass a
|
* @throws SecurityException if the caller does not pass a
|
||||||
* security check for
|
* security check for
|
||||||
|
@ -139,7 +139,7 @@ public abstract class AuthProvider extends Provider {
|
||||||
* authentication information, which may be {@code null}
|
* authentication information, which may be {@code null}
|
||||||
*
|
*
|
||||||
* @throws IllegalStateException if the provider requires configuration
|
* @throws IllegalStateException if the provider requires configuration
|
||||||
* and {@link configure} has not been called
|
* and {@link #configure} has not been called
|
||||||
* @throws SecurityException if the caller does not pass a
|
* @throws SecurityException if the caller does not pass a
|
||||||
* security check for
|
* security check for
|
||||||
* {@code SecurityPermission("authProvider.name")},
|
* {@code SecurityPermission("authProvider.name")},
|
||||||
|
|
|
@ -34,6 +34,7 @@ import java.nio.charset.CharacterCodingException;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
import java.util.regex.PatternSyntaxException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Instances of this class represent a server name of type
|
* Instances of this class represent a server name of type
|
||||||
|
@ -297,7 +298,7 @@ public final class SNIHostName extends SNIServerName {
|
||||||
* @return a {@code SNIMatcher} object for {@code SNIHostName}s
|
* @return a {@code SNIMatcher} object for {@code SNIHostName}s
|
||||||
* @throws NullPointerException if {@code regex} is
|
* @throws NullPointerException if {@code regex} is
|
||||||
* {@code null}
|
* {@code null}
|
||||||
* @throws java.util.regex.PatternSyntaxException if the regular expression's
|
* @throws PatternSyntaxException if the regular expression's
|
||||||
* syntax is invalid
|
* syntax is invalid
|
||||||
*/
|
*/
|
||||||
public static SNIMatcher createSNIMatcher(String regex) {
|
public static SNIMatcher createSNIMatcher(String regex) {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
|
@ -25,6 +25,8 @@
|
||||||
|
|
||||||
package javax.net.ssl;
|
package javax.net.ssl;
|
||||||
|
|
||||||
|
import java.util.Collection;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Instances of this class represent a matcher that performs match
|
* Instances of this class represent a matcher that performs match
|
||||||
* operations on an {@link SNIServerName} instance.
|
* operations on an {@link SNIServerName} instance.
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
|
@ -27,6 +27,7 @@ package javax.net.ssl;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.HexFormat;
|
import java.util.HexFormat;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Instances of this class represent a server name in a Server Name
|
* Instances of this class represent a server name in a Server Name
|
||||||
|
|
|
@ -983,7 +983,7 @@ public abstract class SSLEngine {
|
||||||
* @see #getSupportedCipherSuites()
|
* @see #getSupportedCipherSuites()
|
||||||
* @see #getEnabledCipherSuites()
|
* @see #getEnabledCipherSuites()
|
||||||
*/
|
*/
|
||||||
public abstract void setEnabledCipherSuites(String suites []);
|
public abstract void setEnabledCipherSuites(String[] suites);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1024,7 +1024,7 @@ public abstract class SSLEngine {
|
||||||
* when the protocols parameter is null.
|
* when the protocols parameter is null.
|
||||||
* @see #getEnabledProtocols()
|
* @see #getEnabledProtocols()
|
||||||
*/
|
*/
|
||||||
public abstract void setEnabledProtocols(String protocols[]);
|
public abstract void setEnabledProtocols(String[] protocols);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1161,7 +1161,7 @@ public abstract class SSLEngine {
|
||||||
*
|
*
|
||||||
* @implNote
|
* @implNote
|
||||||
* The JDK SunJSSE provider implementation returns false unless
|
* The JDK SunJSSE provider implementation returns false unless
|
||||||
* {@link setUseClientMode(boolean)} is used to change the mode to true.
|
* {@link #setUseClientMode(boolean)} is used to change the mode to true.
|
||||||
*
|
*
|
||||||
* @return true if the engine should do handshaking
|
* @return true if the engine should do handshaking
|
||||||
* in "client" mode
|
* in "client" mode
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
|
@ -25,6 +25,8 @@
|
||||||
|
|
||||||
package javax.net.ssl;
|
package javax.net.ssl;
|
||||||
|
|
||||||
|
import java.nio.ByteBuffer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An encapsulation of the result state produced by
|
* An encapsulation of the result state produced by
|
||||||
* {@code SSLEngine} I/O calls.
|
* {@code SSLEngine} I/O calls.
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
|
@ -23,13 +23,11 @@
|
||||||
* questions.
|
* questions.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
package javax.net.ssl;
|
package javax.net.ssl;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.net.*;
|
import java.net.*;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class extends <code>ServerSocket</code> and
|
* This class extends <code>ServerSocket</code> and
|
||||||
* provides secure server sockets using protocols such as the Secure
|
* provides secure server sockets using protocols such as the Secure
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
package javax.net.ssl;
|
package javax.net.ssl;
|
||||||
|
|
||||||
import java.security.Principal;
|
import java.security.Principal;
|
||||||
|
import java.nio.ByteBuffer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* In SSL, sessions are used to describe an ongoing relationship between
|
* In SSL, sessions are used to describe an ongoing relationship between
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
|
@ -26,8 +26,8 @@
|
||||||
package javax.net.ssl;
|
package javax.net.ssl;
|
||||||
|
|
||||||
import java.net.Socket;
|
import java.net.Socket;
|
||||||
import javax.net.ssl.X509TrustManager;
|
|
||||||
|
|
||||||
|
import java.security.AlgorithmConstraints;
|
||||||
import java.security.cert.X509Certificate;
|
import java.security.cert.X509Certificate;
|
||||||
import java.security.cert.CertificateException;
|
import java.security.cert.CertificateException;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue