changeset 11727:fb4779f55a53

8076223: Rest of tidy warning in javax.security / java.security Summary: minor HTML markup fix for documentation Reviewed-by: xuelei
author avstepan
date Thu, 09 Apr 2015 16:31:55 +0400
parents 58f4669c75a8
children 909e26d8f565
files src/java.base/share/classes/javax/security/auth/Policy.java src/java.security.jgss/share/classes/org/ietf/jgss/GSSContext.java src/java.security.jgss/share/classes/org/ietf/jgss/GSSCredential.java src/java.security.jgss/share/classes/org/ietf/jgss/GSSException.java src/java.security.jgss/share/classes/org/ietf/jgss/GSSManager.java src/java.security.jgss/share/classes/org/ietf/jgss/GSSName.java src/java.security.jgss/share/classes/org/ietf/jgss/MessageProp.java src/java.security.jgss/share/classes/org/ietf/jgss/package.html
diffstat 8 files changed, 55 insertions(+), 55 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.base/share/classes/javax/security/auth/Policy.java	Wed Apr 08 17:46:43 2015 -0700
+++ b/src/java.base/share/classes/javax/security/auth/Policy.java	Thu Apr 09 16:31:55 2015 +0400
@@ -322,7 +322,7 @@
      *                  in conjunction with the provided
      *                  {@code CodeSource}, determines the Permissions
      *                  returned by this method.  This parameter
-     *                  may be {@code null}. <p>
+     *                  may be {@code null}.
      *
      * @param cs the code specified by its {@code CodeSource}
      *                  that determines, in conjunction with the provided
--- a/src/java.security.jgss/share/classes/org/ietf/jgss/GSSContext.java	Wed Apr 08 17:46:43 2015 -0700
+++ b/src/java.security.jgss/share/classes/org/ietf/jgss/GSSContext.java	Thu Apr 09 16:31:55 2015 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -104,7 +104,7 @@
  * operations on the <code>GSSContext</code> object are presented,
  * including: object instantiation, setting of desired flags, context
  * establishment, query of actual context flags, per-message operations on
- * application data, and finally context deletion.<p>
+ * application data, and finally context deletion.
  *
  * <pre>
  *    // Create a context using default credentials
@@ -209,7 +209,7 @@
      * Some mechanism providers might require that the caller be granted
      * permission to initiate a security context. A failed permission check
      * might cause a {@link java.lang.SecurityException SecurityException}
-     * to be thrown from this method.<p>
+     * to be thrown from this method.
      *
      * @return a byte[] containing the token to be sent to the
      * peer. <code>null</code> indicates that no token is generated.
@@ -276,7 +276,7 @@
      * to be thrown from this method.<p>
      *
      * The following example code demonstrates how this method might be
-     * used:<p>
+     * used:
      * <pre>
      *     InputStream is ...
      *     OutputStream os ...
@@ -346,7 +346,7 @@
      * to be thrown from this method.<p>
      *
      * The following example code demonstrates how this method might be
-     * used:<p>
+     * used:
      * <pre>
      *     byte[] inToken;
      *     byte[] outToken;
@@ -423,7 +423,7 @@
      * to be thrown from this method.<p>
      *
      * The following example code demonstrates how this method might be
-     * used:<p>
+     * used:
      * <pre>
      *     InputStream is ...
      *     OutputStream os ...
@@ -510,7 +510,7 @@
      * GSS-API implementations are recommended but not required to detect
      * invalid QOP values when <code>getWrapSizeLimit</code> is called.
      * This routine guarantees only a maximum message size, not the
-     * availability of specific QOP values for message protection.<p>
+     * availability of specific QOP values for message protection.
      *
      * @param qop the level of protection wrap will be asked to provide.
      * @param confReq <code>true</code> if wrap will be asked to provide
@@ -595,7 +595,7 @@
      *
      * Since some application-level protocols may wish to use tokens
      * emitted by wrap to provide "secure framing", implementations should
-     * support the wrapping of zero-length messages.<p>
+     * support the wrapping of zero-length messages.
      *
      * @param inStream an InputStream containing the application data to be
      * protected. All of the data that is available in
@@ -630,7 +630,7 @@
      *
      * Since some application-level protocols may wish to use tokens
      * emitted by wrap to provide "secure framing", implementations should
-     * support the wrapping and unwrapping of zero-length messages.<p>
+     * support the wrapping and unwrapping of zero-length messages.
      *
      * @param inBuf a byte array containing the wrap token received from
      * peer.
@@ -679,7 +679,7 @@
      *
      * Other than the possible blocking behavior described above, this
      * method is equivalent to the byte array based {@link #unwrap(byte[],
-     * int, int, MessageProp) unwrap} method.<p>
+     * int, int, MessageProp) unwrap} method.
      *
      * @param inStream an InputStream that contains the wrap token generated
      * by the peer.
@@ -827,7 +827,7 @@
      *
      * Other than the possible blocking behavior described above, this
      * method is equivalent to the byte array based {@link #verifyMIC(byte[],
-     * int, int, byte[], int, int, MessageProp) verifyMIC} method.<p>
+     * int, int, byte[], int, int, MessageProp) verifyMIC} method.
      *
      * @param tokStream an InputStream containing the token generated by the
      * peer's getMIC method.
@@ -913,7 +913,7 @@
      * might require mutual authentication even if the application
      * doesn't. Therefore, the application should check to see if the
      * request was honored with the {@link #getMutualAuthState()
-     * getMutualAuthState} method.<p>
+     * getMutualAuthState} method.
      *
      * @param state a boolean value indicating whether mutual
      * authentication should be used or not.
@@ -943,7 +943,7 @@
      * MessageProp#isOldToken() MessageProp.isOldToken} methods will return
      * valid results for the <code>MessageProp</code> object that is passed
      * in to the <code>unwrap</code> method or the <code>verifyMIC</code>
-     * method.<p>
+     * method.
      *
      * @param state a boolean value indicating whether replay detection
      * should be enabled over the established context or not.
@@ -975,7 +975,7 @@
      * {@link MessageProp#isGapToken() MessageProp.isGapToken} methods will return
      * valid results for the <code>MessageProp</code> object that is passed
      * in to the <code>unwrap</code> method or the <code>verifyMIC</code>
-     * method.<p>
+     * method.
      *
      * @param state a boolean value indicating whether sequence checking
      * should be enabled over the established context or not.
@@ -1001,7 +1001,7 @@
      * delegation must not be used, then the mechanism will honor the
      * request and delegation will not occur. This is an exception
      * to the general rule that a mechanism may enable a service even if it
-     * is not requested.<p>
+     * is not requested.
      *
      * @param state a boolean value indicating whether the credentials
      * should be delegated or not.
@@ -1021,7 +1021,7 @@
      *
      * Not all mechanisms support anonymity for the initiator. Therefore, the
      * application should check to see if the request was honored with the
-     * {@link #getAnonymityState() getAnonymityState} method.<p>
+     * {@link #getAnonymityState() getAnonymityState} method.
      *
      * @param state a boolean value indicating if the initiator should
      * be authenticated to the acceptor as an anonymous principal.
@@ -1048,7 +1048,7 @@
      * object that is passed in to the <code>wrap</code> method.<p>
      *
      * Enabling confidentiality will also automatically enable
-     * integrity.<p>
+     * integrity.
      *
      * @param state a boolean value indicating whether confidentiality
      * should be enabled or not.
@@ -1075,7 +1075,7 @@
      * the {@link #getIntegState() getIntegState} method.<p>
      *
      * Disabling integrity will also automatically disable
-     * confidentiality.<p>
+     * confidentiality.
      *
      * @param state a boolean value indicating whether integrity
      * should be enabled or not.
@@ -1095,7 +1095,7 @@
      *
      * The actual lifetime of the context will depend on the capabilities of
      * the underlying mechanism and the application should call the {@link
-     * #getLifetime() getLifetime} method to determine this.<p>
+     * #getLifetime() getLifetime} method to determine this.
      *
      * @param lifetime the desired context lifetime in seconds. Use
      * <code>INDEFINITE_LIFETIME</code> to request an indefinite lifetime
@@ -1133,7 +1133,7 @@
      * initiator requests that delegation not be allowed the {@link
      * #requestCredDeleg(boolean) requestCredDeleg} method will honor that
      * request and this method will return <code>false</code> on the
-     * initiator's side from that point onwards. <p>
+     * initiator's side from that point onwards.
      *
      * @return true if delegation is enabled, false otherwise.
      * @see #requestCredDeleg(boolean)
@@ -1147,7 +1147,7 @@
      * called only after context establishment is complete. An initiator
      * that requests mutual authentication can call this method after
      * context completion and dispose the context if its request was not
-     * honored.<p>
+     * honored.
      *
      * @return true if mutual authentication is enabled, false otherwise.
      * @see #requestMutualAuth(boolean)
@@ -1161,7 +1161,7 @@
      * definitive answer this method must be called only after context
      * establishment is complete. An initiator that requests replay
      * detection can call this method after context completion and
-     * dispose the context if its request was not honored.<p>
+     * dispose the context if its request was not honored.
      *
      * @return true if replay detection is enabled, false otherwise.
      * @see #requestReplayDet(boolean)
@@ -1175,7 +1175,7 @@
      * definitive answer this method must be called only after context
      * establishment is complete. An initiator that requests sequence
      * checking can call this method after context completion and
-     * dispose the context if its request was not honored.<p>
+     * dispose the context if its request was not honored.
      *
      * @return true if sequence checking is enabled, false otherwise.
      * @see #requestSequenceDet(boolean)
@@ -1195,7 +1195,7 @@
      * should be sent to the peer or the context aborted.</strong> On the
      * acceptor side, a call to this method determines if any of the tokens
      * processed by <code>acceptSecContext</code> thus far have divulged
-     * the identity of the initiator.<p>
+     * the identity of the initiator.
      *
      * @return true if the context initiator is still anonymous, false
      * otherwise.
@@ -1235,7 +1235,7 @@
      * #isProtReady() isProtReady} or {@link #isEstablished()
      * isEstablished} return <code>true</code>. If this method returns
      * <code>true</code>, so will {@link #getIntegState()
-     * getIntegState}<p>
+     * getIntegState}
      *
      * @return true if confidentiality services are available, false
      * otherwise.
@@ -1250,7 +1250,7 @@
      * #isProtReady() isProtReady} or {@link #isEstablished()
      * isEstablished} return <code>true</code>. This method will always
      * return <code>true</code> if {@link #getConfState() getConfState}
-     * returns true.<p>
+     * returns true.
      *
      * @return true if integrity services are available, false otherwise.
      * @see #requestInteg(boolean)
@@ -1262,7 +1262,7 @@
      * context is. It can be called by both the context initiator and the
      * context acceptor, but for a definitive answer it should be called
      * only after {@link #isEstablished() isEstablished} returns
-     * true.<p>
+     * true.
      *
      * @return the remaining lifetime in seconds
      * @see #requestLifetime(int)
--- a/src/java.security.jgss/share/classes/org/ietf/jgss/GSSCredential.java	Wed Apr 08 17:46:43 2015 -0700
+++ b/src/java.security.jgss/share/classes/org/ietf/jgss/GSSCredential.java	Thu Apr 09 16:31:55 2015 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -57,7 +57,7 @@
  *
  * This example code demonstrates the creation of a GSSCredential
  * implementation for a specific entity, querying of its fields, and its
- * release when it is no longer needed:<p>
+ * release when it is no longer needed:
  * <pre>
  *    GSSManager manager = GSSManager.getInstance();
  *
--- a/src/java.security.jgss/share/classes/org/ietf/jgss/GSSException.java	Wed Apr 08 17:46:43 2015 -0700
+++ b/src/java.security.jgss/share/classes/org/ietf/jgss/GSSException.java	Thu Apr 09 16:31:55 2015 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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,7 @@
  * mechanism implementation is responsible for setting appropriate minor
  * status codes when throwing this exception.  Aside from delivering the
  * numeric error codes to the caller, this class performs the mapping from
- * their numeric values to textual representations. <p>
+ * their numeric values to textual representations.
  *
  * @author Mayank Upadhyay
  * @since 1.4
--- a/src/java.security.jgss/share/classes/org/ietf/jgss/GSSManager.java	Wed Apr 08 17:46:43 2015 -0700
+++ b/src/java.security.jgss/share/classes/org/ietf/jgss/GSSManager.java	Thu Apr 09 16:31:55 2015 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -55,7 +55,7 @@
  * of this and recover cleanly by catching the exception.<p>
  *
  * It is envisioned that there will be three most common ways in which
- * providers will be used:<p>
+ * providers will be used:
  * <ol>
  * <li> The application does not care about what provider is used (the
  * default case).
@@ -87,7 +87,7 @@
  * the <code>addProviderAtFront</code> method on a GSSManager that has
  * already created an object.<p>
  *
- *  Here is some sample code showing how the GSSManager might be used: <p>
+ *  Here is some sample code showing how the GSSManager might be used:
  * <pre>
  *     GSSManager manager = GSSManager.getInstance();
  *
@@ -116,7 +116,7 @@
  *                                                GSSContext.DEFAULT_LIFETIME);
  * </pre><p>
  *
- * The server side might use the following variation of this source:<p>
+ * The server side might use the following variation of this source:
  *
  * <pre>
  *     // Acquire credentials for the server
@@ -387,7 +387,7 @@
      * Non-default values for lifetime cannot always be honored by the
      * underlying mechanisms, thus applications should be prepared to call
      * {@link GSSCredential#getRemainingLifetime() getRemainingLifetime}
-     * on the returned credential.<p>
+     * on the returned credential.
      *
      * @param name the name of the principal for whom this credential is to be
      * acquired.  Use <code>null</code> to specify the default principal.
@@ -442,7 +442,7 @@
      * Non-default values for lifetime cannot always be honored by the
      * underlying mechanisms, thus applications should be prepared to call
      * {@link GSSCredential#getRemainingLifetime() getRemainingLifetime}
-     * on the returned credential.<p>
+     * on the returned credential.
      *
      * @param name the name of the principal for whom this credential is to
      * be acquired.  Use <code>null</code> to specify the default
@@ -492,7 +492,7 @@
      * Non-default values for lifetime cannot always be honored by the
      * underlying mechanism, thus applications should be prepared to call
      * {@link GSSContext#getLifetime() getLifetime} on the returned
-     * context.<p>
+     * context.
      *
      * @param peer the name of the target peer.
      * @param mech the Oid of the desired mechanism.  Use <code>null</code>
@@ -610,7 +610,7 @@
      * operation is unavailable.<p>
      *
      * Suppose an application desired that the provider A always be checked
-     * first when any mechanism is needed, it would call:<p>
+     * first when any mechanism is needed, it would call:
      * <pre>
      *         GSSManager mgr = GSSManager.getInstance();
      *         // mgr may at this point have its own pre-configured list
@@ -621,7 +621,7 @@
      * </pre>
      * Now if it also desired that the mechanism of Oid m1 always be
      * obtained from the provider B before the previously set A was checked,
-     * it would call:<p>
+     * it would call:
      * <pre>
      *         mgr.addProviderAtFront(B, m1);
      * </pre>
@@ -632,7 +632,7 @@
      * directly.<p>
      *
      * Suppose at a later time the following call is made to the same
-     * GSSManager instance:<p>
+     * GSSManager instance:
      * <pre>
      *         mgr.addProviderAtFront(B, null)
      * </pre>
@@ -684,14 +684,14 @@
      * Suppose an application desired that when a mechanism of Oid m1 is
      * needed the system default providers always be checked first, and only
      * when they do not support m1 should a provider A be checked. It would
-     * then make the call:<p>
+     * then make the call:
      * <pre>
      *         GSSManager mgr = GSSManager.getInstance();
      *         mgr.addProviderAtEnd(A, m1);
      * </pre>
      * Now, if it also desired that for all mechanisms the provider B be
      * checked after all configured providers have been checked, it would
-     * then call:<p>
+     * then call:
      * <pre>
      *         mgr.addProviderAtEnd(B, null);
      * </pre>
@@ -699,7 +699,7 @@
      * null)}.<p>
      *
      * Suppose at a later time the following call is made to the same
-     * GSSManager instance:<p>
+     * GSSManager instance:
      * <pre>
      *         mgr.addProviderAtEnd(B, m2)
      * </pre>
@@ -708,7 +708,7 @@
      * request is made for the already existing pairs of (A, m1) or (B,
      * null).<p>
      *
-     * Please note, however, that the following call:<p>
+     * Please note, however, that the following call:
      * <pre>
      *         mgr.addProviderAtEnd(A, null)
      * </pre>
--- a/src/java.security.jgss/share/classes/org/ietf/jgss/GSSName.java	Wed Apr 08 17:46:43 2015 -0700
+++ b/src/java.security.jgss/share/classes/org/ietf/jgss/GSSName.java	Thu Apr 09 16:31:55 2015 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -48,7 +48,7 @@
  * The code below creates a <code>GSSName</code>, converts it to an MN, performs a
  * comparison, obtains a printable representation of the name, exports it
  * to a byte array and then re-imports to obtain a
- * new <code>GSSName</code>.<p>
+ * new <code>GSSName</code>.
  * <pre>
  *      GSSManager manager = GSSManager.getInstance();
  *
@@ -236,7 +236,8 @@
      * method {@link GSSManager#createName(byte[], Oid)
      * GSSManager.createName} and specifying the NT_EXPORT_NAME as the name
      * type object identifier. The resulting <code>GSSName</code> name will
-     * also be a MN.<p>
+     * also be a MN.
+     *
      * @return a byte[] containing the exported name. RFC 2743 defines the
      * "Mechanism-Independent Exported Name Object Format" for these bytes.
      *
--- a/src/java.security.jgss/share/classes/org/ietf/jgss/MessageProp.java	Wed Apr 08 17:46:43 2015 -0700
+++ b/src/java.security.jgss/share/classes/org/ietf/jgss/MessageProp.java	Thu Apr 09 16:31:55 2015 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -42,7 +42,7 @@
  * <code>false</code>.  Upon return from these methods, this object will also
  * contain any supplementary status values applicable to the processed
  * token.  The supplementary status values can indicate old tokens, out
- * of sequence tokens, gap tokens or duplicate tokens.<p>
+ * of sequence tokens, gap tokens or duplicate tokens.
  *
  * @see GSSContext#wrap
  * @see GSSContext#unwrap
--- a/src/java.security.jgss/share/classes/org/ietf/jgss/package.html	Wed Apr 08 17:46:43 2015 -0700
+++ b/src/java.security.jgss/share/classes/org/ietf/jgss/package.html	Thu Apr 09 16:31:55 2015 +0400
@@ -2,7 +2,7 @@
 <html>
 <head>
 <!--
-Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2000, 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
@@ -55,10 +55,10 @@
 
     The GSS-API does not perform any communication with the peer. It merely 
     produces tokens that the application must somehow transport to the
-    other end.<p>
+    other end.
 
 <h3>Credential Acquisition</h3>
-<a name=useSubjectCredsOnly>
+<a name=useSubjectCredsOnly></a>
     The GSS-API itself does not dictate how an underlying mechanism
     obtains the credentials that are needed for authentication. It is
     assumed that prior to calling the GSS-API, these credentials are
@@ -97,7 +97,6 @@
     the provider is free to use any credentials cache of its choice. Such
     a credential cache might be a disk cache, an in-memory cache, or even
     just the current Subject itself.
-</a>
 
 <h2>Related Documentation</h2>
 <p>