From 1e20f048f155d70a6f7a63bc0d9811f9fd6ae1db Mon Sep 17 00:00:00 2001 From: Alexander Stepanov Date: Wed, 6 May 2015 21:15:07 +0400 Subject: [PATCH] 8079478: some docs cleanup for sun.security Some docs cleanup Reviewed-by: weijun --- .../sun/security/action/GetBooleanAction.java | 2 +- .../GetBooleanSecurityPropertyAction.java | 2 +- .../sun/security/action/GetIntegerAction.java | 6 ++-- .../sun/security/action/GetLongAction.java | 6 ++-- .../security/action/GetPropertyAction.java | 4 +-- .../classes/sun/security/jca/GetInstance.java | 2 +- .../sun/security/jca/ProviderList.java | 2 +- .../sun/security/pkcs/PKCS9Attribute.java | 3 +- .../sun/security/provider/PolicyFile.java | 24 ++++++------- .../sun/security/provider/PolicyParser.java | 11 +++--- .../sun/security/provider/SecureRandom.java | 2 +- .../sun/security/provider/X509Factory.java | 6 ++-- .../provider/certpath/AdjacencyList.java | 4 +-- .../security/provider/certpath/BuildStep.java | 24 ++++++------- .../provider/certpath/PolicyChecker.java | 4 +-- .../security/provider/certpath/Vertex.java | 16 ++++----- .../sun/security/rsa/RSAKeyFactory.java | 2 +- .../sun/security/ssl/ProtocolVersion.java | 2 ++ .../security/timestamp/HttpTimestamper.java | 2 +- .../sun/security/timestamp/TSRequest.java | 2 +- .../security/timestamp/TimestampToken.java | 4 +-- .../classes/sun/security/tools/PathList.java | 2 +- .../sun/security/tools/keytool/Main.java | 8 ++--- .../security/tools/keytool/Resources_de.java | 4 +-- .../security/tools/keytool/Resources_es.java | 4 +-- .../security/tools/keytool/Resources_fr.java | 4 +-- .../security/tools/keytool/Resources_it.java | 4 +-- .../security/tools/keytool/Resources_ja.java | 4 +-- .../security/tools/keytool/Resources_ko.java | 4 +-- .../tools/keytool/Resources_pt_BR.java | 4 +-- .../security/tools/keytool/Resources_sv.java | 4 +-- .../tools/keytool/Resources_zh_CN.java | 4 +-- .../tools/keytool/Resources_zh_HK.java | 4 +-- .../tools/keytool/Resources_zh_TW.java | 4 +-- .../classes/sun/security/util/BitArray.java | 4 +-- .../sun/security/util/ByteArrayLexOrder.java | 5 +-- .../sun/security/util/ByteArrayTagOrder.java | 5 +-- .../sun/security/util/DerOutputStream.java | 16 ++++----- .../classes/sun/security/util/DerValue.java | 16 ++++----- .../classes/sun/security/util/KeyUtil.java | 13 +++---- .../sun/security/util/ManifestDigester.java | 2 +- .../sun/security/util/PendingException.java | 2 -- .../classes/sun/security/util/Resources.java | 4 +-- .../security/util/SignatureFileVerifier.java | 2 +- .../sun/security/validator/PKIXValidator.java | 2 +- .../sun/security/validator/Validator.java | 2 +- .../classes/sun/security/x509/AlgIdDSA.java | 8 ++--- .../x509/AuthorityInfoAccessExtension.java | 2 +- .../x509/AuthorityKeyIdentifierExtension.java | 10 +++--- .../x509/CRLDistributionPointsExtension.java | 2 +- .../x509/CertificateSerialNumber.java | 4 +-- .../classes/sun/security/x509/DNSName.java | 8 ++--- .../sun/security/x509/DistributionPoint.java | 8 ++--- .../sun/security/x509/EDIPartyName.java | 10 +++--- .../x509/ExtendedKeyUsageExtension.java | 2 +- .../classes/sun/security/x509/Extension.java | 6 ++-- .../sun/security/x509/GeneralName.java | 2 +- .../security/x509/GeneralNameInterface.java | 4 +-- .../sun/security/x509/GeneralNames.java | 2 +- .../sun/security/x509/GeneralSubtree.java | 10 +++--- .../sun/security/x509/GeneralSubtrees.java | 15 ++++---- .../sun/security/x509/IPAddressName.java | 16 ++++----- .../x509/InhibitAnyPolicyExtension.java | 10 +++--- .../sun/security/x509/KeyIdentifier.java | 2 +- .../x509/NameConstraintsExtension.java | 8 ++--- .../classes/sun/security/x509/OIDMap.java | 4 +-- .../classes/sun/security/x509/OIDName.java | 6 ++-- .../classes/sun/security/x509/OtherName.java | 4 +-- .../x509/PolicyMappingsExtension.java | 8 ++--- .../share/classes/sun/security/x509/RDN.java | 8 ++--- .../classes/sun/security/x509/RFC822Name.java | 6 ++-- .../x509/SubjectInfoAccessExtension.java | 2 +- .../classes/sun/security/x509/URIName.java | 22 ++++++------ .../sun/security/x509/UniqueIdentity.java | 1 - .../sun/security/x509/X400Address.java | 6 ++-- .../classes/sun/security/x509/X500Name.java | 15 ++++---- .../sun/security/x509/X509CRLEntryImpl.java | 6 ++-- .../sun/security/x509/X509CRLImpl.java | 34 +++++++++---------- .../sun/security/x509/X509CertImpl.java | 6 ++-- .../sun/security/x509/X509CertInfo.java | 32 +++++++++-------- 80 files changed, 260 insertions(+), 286 deletions(-) diff --git a/jdk/src/java.base/share/classes/sun/security/action/GetBooleanAction.java b/jdk/src/java.base/share/classes/sun/security/action/GetBooleanAction.java index e3a5d1991ef..d2bcb105d3a 100644 --- a/jdk/src/java.base/share/classes/sun/security/action/GetBooleanAction.java +++ b/jdk/src/java.base/share/classes/sun/security/action/GetBooleanAction.java @@ -33,7 +33,7 @@ package sun.security.action; * AccessController.doPrivileged. * *

The following code retrieves the boolean value of the system - * property named "prop" as a privileged action:

+ * property named "prop" as a privileged action: * * 

  * boolean b = java.security.AccessController.doPrivileged
diff --git a/jdk/src/java.base/share/classes/sun/security/action/GetBooleanSecurityPropertyAction.java b/jdk/src/java.base/share/classes/sun/security/action/GetBooleanSecurityPropertyAction.java
index a96d1e05e12..9b180f1bdfd 100644
--- a/jdk/src/java.base/share/classes/sun/security/action/GetBooleanSecurityPropertyAction.java
+++ b/jdk/src/java.base/share/classes/sun/security/action/GetBooleanSecurityPropertyAction.java
@@ -35,7 +35,7 @@ import java.security.Security;
  * AccessController.doPrivileged.
  *
  * 
The following code retrieves the boolean value of the security
- * property named "prop" as a privileged action: 

+ * property named "prop" as a privileged action:
  *
  * 
  * boolean b = java.security.AccessController.doPrivileged
diff --git a/jdk/src/java.base/share/classes/sun/security/action/GetIntegerAction.java b/jdk/src/java.base/share/classes/sun/security/action/GetIntegerAction.java
index 8002ef8ede5..ff2b2019b48 100644
--- a/jdk/src/java.base/share/classes/sun/security/action/GetIntegerAction.java
+++ b/jdk/src/java.base/share/classes/sun/security/action/GetIntegerAction.java
@@ -36,7 +36,7 @@ package sun.security.action;
  * property named "prop" as a privileged action. Since it does
  * not pass a default value to be used in case the property
  * "prop" is not defined, it has to check the result for
- * null: 

+ * null:
  *
  * 
  * Integer tmp = java.security.AccessController.doPrivileged
@@ -50,7 +50,7 @@ package sun.security.action;
  * 
The following code retrieves the integer value of the system
  * property named "prop" as a privileged action, and also passes
  * a default value to be used in case the property "prop" is not
- * defined: 

+ * defined:
  *
  * 
  * int i = ((Integer)java.security.AccessController.doPrivileged(
@@ -84,7 +84,7 @@ public class GetIntegerAction
      * value of that property.
      *
      * @param theProp the name of the system property.
-     * @param defaulVal the default value.
+     * @param defaultVal the default value.
      */
     public GetIntegerAction(String theProp, int defaultVal) {
         this.theProp = theProp;
diff --git a/jdk/src/java.base/share/classes/sun/security/action/GetLongAction.java b/jdk/src/java.base/share/classes/sun/security/action/GetLongAction.java
index fdadc191b72..25335c62c36 100644
--- a/jdk/src/java.base/share/classes/sun/security/action/GetLongAction.java
+++ b/jdk/src/java.base/share/classes/sun/security/action/GetLongAction.java
@@ -36,7 +36,7 @@ package sun.security.action;
  * property named "prop" as a privileged action. Since it does
  * not pass a default value to be used in case the property
  * "prop" is not defined, it has to check the result for
- * null: 

+ * null:
  *
  * 
  * Long tmp = java.security.AccessController.doPrivileged
@@ -50,7 +50,7 @@ package sun.security.action;
  * 
The following code retrieves the Long value of the system
  * property named "prop" as a privileged action, and also passes
  * a default value to be used in case the property "prop" is not
- * defined: 

+ * defined:
  *
  * 
  * long l = java.security.AccessController.doPrivileged
@@ -83,7 +83,7 @@ public class GetLongAction implements java.security.PrivilegedAction {
      * value of that property.
      *
      * @param theProp the name of the system property.
-     * @param defaulVal the default value.
+     * @param defaultVal the default value.
      */
     public GetLongAction(String theProp, long defaultVal) {
         this.theProp = theProp;
diff --git a/jdk/src/java.base/share/classes/sun/security/action/GetPropertyAction.java b/jdk/src/java.base/share/classes/sun/security/action/GetPropertyAction.java
index 4ed9bde3783..95a113c3bef 100644
--- a/jdk/src/java.base/share/classes/sun/security/action/GetPropertyAction.java
+++ b/jdk/src/java.base/share/classes/sun/security/action/GetPropertyAction.java
@@ -33,7 +33,7 @@ package sun.security.action;
  * AccessController.doPrivileged.
  *
  * 
The following code retrieves the value of the system
- * property named "prop" as a privileged action: 

+ * property named "prop" as a privileged action:
  *
  * 
  * String s = java.security.AccessController.doPrivileged
@@ -66,7 +66,7 @@ public class GetPropertyAction
      * value of that property.
      *
      * @param theProp the name of the system property.
-     * @param defaulVal the default value.
+     * @param defaultVal the default value.
      */
     public GetPropertyAction(String theProp, String defaultVal) {
         this.theProp = theProp;
diff --git a/jdk/src/java.base/share/classes/sun/security/jca/GetInstance.java b/jdk/src/java.base/share/classes/sun/security/jca/GetInstance.java
index 85ca272edfc..a5e5602dc4d 100644
--- a/jdk/src/java.base/share/classes/sun/security/jca/GetInstance.java
+++ b/jdk/src/java.base/share/classes/sun/security/jca/GetInstance.java
@@ -117,7 +117,7 @@ public class GetInstance {
     /**
      * This method exists for compatibility with JCE only. It will be removed
      * once JCE has been changed to use the replacement method.
-     * @deprecated use getServices(List) instead
+     * @deprecated use {@code getServices(List)} instead
      */
     @Deprecated
     public static List getServices(String type,
diff --git a/jdk/src/java.base/share/classes/sun/security/jca/ProviderList.java b/jdk/src/java.base/share/classes/sun/security/jca/ProviderList.java
index 66c8262418f..511693f734a 100644
--- a/jdk/src/java.base/share/classes/sun/security/jca/ProviderList.java
+++ b/jdk/src/java.base/share/classes/sun/security/jca/ProviderList.java
@@ -353,7 +353,7 @@ public final class ProviderList {
     /**
      * This method exists for compatibility with JCE only. It will be removed
      * once JCE has been changed to use the replacement method.
-     * @deprecated use getServices(List) instead
+     * @deprecated use {@code getServices(List)} instead
      */
     @Deprecated
     public List getServices(String type, List algorithms) {
diff --git a/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java b/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java
index 943ba93cc28..378504c101f 100644
--- a/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java
+++ b/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java
@@ -51,7 +51,6 @@ import sun.misc.HexDumpEncoder;
  * in string form, its value is a (single-valued)
  * byte array that is the SET's encoding.
  *
- * 

  * 
  *
  * 
@@ -476,7 +475,7 @@ public class PKCS9Attribute implements DerEncoder {
      * Construct a PKCS9Attribute from its encoding on an input
      * stream.
      *
-     * @param val the DerValue representing the DER encoding of the attribute.
+     * @param derVal the DerValue representing the DER encoding of the attribute.
      * @exception IOException on parsing error.
      */
     public PKCS9Attribute(DerValue derVal) throws IOException {
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/PolicyFile.java b/jdk/src/java.base/share/classes/sun/security/provider/PolicyFile.java
index b59c4794fda..9b1de6805f9 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/PolicyFile.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/PolicyFile.java
@@ -186,7 +186,7 @@ import sun.net.www.ParseUtil;
  * 
 Case is unimportant for the identifiers (permission,
  * signedBy, codeBase, etc.) but is
  * significant for the Type
- * or for any string that is passed in as a value. 

+ * or for any string that is passed in as a value.
  *
  * 
 An example of two entries in a policy configuration file is
  * 
@@ -212,7 +212,7 @@ import sun.net.www.ParseUtil;
  *  with one or more Principal class/name pairs.  The exact
  *  replacement performed depends upon the contents of the
  *  grant clause to which the permission belongs.
- *

+ * 

  *
  *  If the grant clause does not contain any principal information,
  *  the permission will be ignored (permissions containing
@@ -220,11 +220,11 @@ import sun.net.www.ParseUtil;
  *  of a principal-based grant clause).  For example, BarPermission
  *  will always be ignored in the following grant clause:
  *
- *
+ * 
  *    grant codebase "www.foo.com", signedby "duke" {
  *      permission BarPermission "... ${{self}} ...";
  *    };
- *

+ * 

  *
  *  If the grant clause contains principal information, ${{self}}
  *  will be replaced with that same principal information.
@@ -389,7 +389,7 @@ public class PolicyFile extends java.security.Policy {
      * 
Case is unimportant for the identifiers (permission,
      * signedBy, codeBase, etc.) but is
      * significant for the Type
-     * or for any string that is passed in as a value. 

+     * or for any string that is passed in as a value.
      *
      * 
An example of two entries in a policy configuration file is
      * 
@@ -399,7 +399,7 @@ public class PolicyFile extends java.security.Policy {
      *   grant signedBy "Duke" {
      *          permission java.io.FilePermission "/tmp/*", "read,write";
      *   };
-     * 

+     *
      *   // grant everyone the following permission
      *
      *   grant {
@@ -1044,8 +1044,8 @@ public class PolicyFile extends java.security.Policy {
      * the ProtectionDomain and tests whether the permission is
      * granted.
      *
-     * @param domain the ProtectionDomain to test
-     * @param permission the Permission object to be tested for implication.
+     * @param pd the ProtectionDomain to test
+     * @param p the Permission object to be tested for implication.
      *
      * @return true if "permission" is a proper subset of a permission
      * granted to this ProtectionDomain.
@@ -1093,8 +1093,6 @@ public class PolicyFile extends java.security.Policy {
      * originally granted permission, as well as the Class and name
      * for the respective Principal.
      *
-     * 

-     *
      * @param domain the Permissions granted to this
      *          ProtectionDomain are returned.
      *
@@ -1131,7 +1129,7 @@ public class PolicyFile extends java.security.Policy {
      * Examines this Policy and creates a PermissionCollection object with
      * the set of permissions for the specified CodeSource.
      *
-     * @param CodeSource the codesource associated with the caller.
+     * @param codesource the CodeSource associated with the caller.
      * This encapsulates the original location of the code (where the code
      * came from) and the public key(s) of its signer.
      *
@@ -1430,9 +1428,7 @@ public class PolicyFile extends java.security.Policy {
     }
 
     /**
-     * 

-     *
-     * @param sp the SelfPermission that needs to be expanded 

+     * @param sp the SelfPermission that needs to be expanded.
      *
      * @param entryPs list of principals for the Policy entry.
      *
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/PolicyParser.java b/jdk/src/java.base/share/classes/sun/security/provider/PolicyParser.java
index c22f5a4eac7..2658a9e03ba 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/PolicyParser.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/PolicyParser.java
@@ -45,19 +45,19 @@ import sun.security.util.ResourcesMgr;
  * is represented as a separate
  * persistent configuration.  The configuration may be stored as a
  * flat ASCII file, as a serialized binary file of
- * the Policy class, or as a database. 

+ * the Policy class, or as a database.
  *
  * 
The Java runtime creates one global Policy object, which is used to
  * represent the static policy configuration file.  It is consulted by
  * a ProtectionDomain when the protection domain initializes its set of
- * permissions. 

+ * permissions.
  *
  * 
The Policy init method parses the policy
  * configuration file, and then
  * populates the Policy object.  The Policy object is agnostic in that
  * it is not involved in making policy decisions.  It is merely the
  * Java runtime representation of the persistent policy configuration
- * file. 

+ * file.
  *
  * 
When a protection domain needs to initialize its set of
  * permissions, it executes code such as the following
@@ -842,8 +842,7 @@ public class PolicyParser {
 
     /**
      * Each grant entry in the policy configuration file is
-     * represented by a
-     * GrantEntry object.  

+     * represented by a GrantEntry object.
      *
      * 

      * For example, the entry
@@ -1094,7 +1093,7 @@ public class PolicyParser {
     /**
      * Each permission entry in the policy configuration file is
      * represented by a
-     * PermissionEntry object.  

+     * PermissionEntry object.
      *
      * 

      * For example, the entry
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/SecureRandom.java b/jdk/src/java.base/share/classes/sun/security/provider/SecureRandom.java
index 4f7d7c3aad6..99edb6a89d2 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/SecureRandom.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/SecureRandom.java
@@ -208,7 +208,7 @@ implements java.io.Serializable {
     /**
      * Generates a user-specified number of random bytes.
      *
-     * @param bytes the array to be filled in with random bytes.
+     * @param result the array to be filled in with random bytes.
      */
     @Override
     public synchronized void engineNextBytes(byte[] result) {
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/X509Factory.java b/jdk/src/java.base/share/classes/sun/security/provider/X509Factory.java
index 5fa9416e60d..1789dd62cf5 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/X509Factory.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/X509Factory.java
@@ -41,7 +41,7 @@ import java.util.Base64;
 import sun.security.pkcs.ParsingException;
 
 /**
- * This class defines a certificate factory for X.509 v3 certificates &
+ * This class defines a certificate factory for X.509 v3 certificates {@literal &}
  * certification paths, and X.509 v2 certificate revocation lists (CRLs).
  *
  * @author Jan Luehe
@@ -536,7 +536,7 @@ public class X509Factory extends CertificateFactorySpi {
      * after the newline character after the -----END SOMETHING----- line.
      *
      * @param is the InputStream
-     * @returns byte block or null if end of stream
+     * @return byte block or null if end of stream
      * @throws IOException If any parsing error
      */
     private static byte[] readOneBlock(InputStream is) throws IOException {
@@ -664,7 +664,7 @@ public class X509Factory extends CertificateFactorySpi {
      * @param is    Read from this InputStream
      * @param bout  Write into this OutputStream
      * @param tag   Tag already read (-1 mean not read)
-     * @returns     The current tag, used to check EOC in indefinite-length BER
+     * @return     The current tag, used to check EOC in indefinite-length BER
      * @throws IOException Any parsing error
      */
     private static int readBERInternal(InputStream is,
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/AdjacencyList.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/AdjacencyList.java
index f26919b891f..9039d4fe75b 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/AdjacencyList.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/AdjacencyList.java
@@ -75,10 +75,10 @@ import java.util.List;
  * values SUCCEED and FAIL mean that we've come to
  * the end of the build process, and there will not be any more entries in
  * the list.
- * 

+ *
  * @see sun.security.provider.certpath.BuildStep
  * @see sun.security.provider.certpath.Vertex
- * 

+ *
  * @author  seth proctor
  * @since   1.4
  */
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/BuildStep.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/BuildStep.java
index bf06411e1b4..8ae3a8ecb5d 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/BuildStep.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/BuildStep.java
@@ -93,7 +93,7 @@ public class BuildStep {
     /**
      * return vertex description for this build step
      *
-     * @returns Vertex
+     * @return Vertex
      */
     public Vertex getVertex() {
         return vertex;
@@ -102,7 +102,7 @@ public class BuildStep {
     /**
      * return the certificate associated with this build step
      *
-     * @returns X509Certificate
+     * @return X509Certificate
      */
     public X509Certificate getCertificate() {
         return cert;
@@ -112,7 +112,7 @@ public class BuildStep {
      * return string form of issuer name from certificate associated with this
      * build step
      *
-     * @returns String form of issuer name or null, if no certificate.
+     * @return String form of issuer name or null, if no certificate.
      */
     public String getIssuerName() {
         return getIssuerName(null);
@@ -125,7 +125,7 @@ public class BuildStep {
      *
      * @param defaultName name to use as default if unable to return an issuer
      * name from the certificate, or if no certificate.
-     * @returns String form of issuer name or defaultName, if no certificate or
+     * @return String form of issuer name or defaultName, if no certificate or
      * exception received while trying to extract issuer name from certificate.
      */
     public String getIssuerName(String defaultName) {
@@ -137,7 +137,7 @@ public class BuildStep {
      * return string form of subject name from certificate associated with this
      * build step.
      *
-     * @returns String form of subject name or null, if no certificate.
+     * @return String form of subject name or null, if no certificate.
      */
     public String getSubjectName() {
         return getSubjectName(null);
@@ -151,7 +151,7 @@ public class BuildStep {
      *
      * @param defaultName name to use as default if unable to return a subject
      * name from the certificate, or if no certificate.
-     * @returns String form of subject name or defaultName, if no certificate or
+     * @return String form of subject name or defaultName, if no certificate or
      * if an exception was received while attempting to extract the subject name
      * from the certificate.
      */
@@ -163,7 +163,7 @@ public class BuildStep {
     /**
      * return the exception associated with this build step.
      *
-     * @returns Throwable
+     * @return Throwable
      */
     public Throwable getThrowable() {
         return throwable;
@@ -173,7 +173,7 @@ public class BuildStep {
      * return the result code associated with this build step.  The result codes
      * are POSSIBLE, FOLLOW, BACK, FAIL, SUCCEED.
      *
-     * @returns int result code
+     * @return int result code
      */
     public int getResult() {
         return result;
@@ -184,7 +184,7 @@ public class BuildStep {
      * with this build step.
      *
      * @param   res    result code
-     * @returns String string representing meaning of the result code
+     * @return String string representing meaning of the result code
      */
     public String resultToString(int res) {
         String resultString = "";
@@ -216,7 +216,7 @@ public class BuildStep {
      * return a string representation of this build step, showing minimal
      * detail.
      *
-     * @returns String
+     * @return String
      */
     @Override
     public String toString() {
@@ -243,7 +243,7 @@ public class BuildStep {
      * the vertex state appropriate to the result of this build step, and the
      * certificate contents.
      *
-     * @returns String
+     * @return String
      */
     public String verboseToString() {
         String out = resultToString(getResult());
@@ -269,7 +269,7 @@ public class BuildStep {
      * return a string representation of this build step, including all possible
      * detail of the vertex state, but not including the certificate contents.
      *
-     * @returns String
+     * @return String
      */
     public String fullToString() {
         return resultToString(getResult()) + vertex.toString();
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/PolicyChecker.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/PolicyChecker.java
index dd030d3d9db..74af7bf16f1 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/PolicyChecker.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/PolicyChecker.java
@@ -849,7 +849,7 @@ class PolicyChecker extends PKIXCertPathChecker {
      * @param initPolicies the Set of policies required by the user
      * @param currCertPolicies the CertificatePoliciesExtension of the
      * certificate being processed
-     * @returns the root node of the valid policy tree after modification
+     * @return the root node of the valid policy tree after modification
      * @exception CertPathValidatorException Exception thrown if error occurs.
      */
     private static PolicyNodeImpl removeInvalidNodes(PolicyNodeImpl rootNode,
@@ -909,7 +909,7 @@ class PolicyChecker extends PKIXCertPathChecker {
      * valid policy tree is null. Marks each node of the returned tree
      * immutable and thread-safe.
      *
-     * @returns the root node of the valid policy tree, or null if
+     * @return the root node of the valid policy tree, or null if
      * the valid policy tree is null
      */
     PolicyNode getPolicyTree() {
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/Vertex.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/Vertex.java
index e2503f0112f..06bfb2f111d 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/Vertex.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/Vertex.java
@@ -67,7 +67,7 @@ public class Vertex {
     /**
      * return the certificate for this vertex
      *
-     * @returns X509Certificate
+     * @return X509Certificate
      */
     public X509Certificate getCertificate() {
         return cert;
@@ -78,7 +78,7 @@ public class Vertex {
      * adjacency list that contains certificates that could follow this
      * certificate.
      *
-     * @returns int index for this vertex, or -1 if no following certificates.
+     * @return int index for this vertex, or -1 if no following certificates.
      */
     public int getIndex() {
         return index;
@@ -99,7 +99,7 @@ public class Vertex {
      * return the throwable associated with this vertex;
      * returns null if none.
      *
-     * @returns Throwable
+     * @return Throwable
      */
     public Throwable getThrowable() {
         return throwable;
@@ -118,7 +118,7 @@ public class Vertex {
     /**
      * Return full string representation of vertex
      *
-     * @returns String representation of vertex
+     * @return String representation of vertex
      */
     @Override
     public String toString() {
@@ -129,7 +129,7 @@ public class Vertex {
      * Return string representation of this vertex's
      * certificate information.
      *
-     * @returns String representation of certificate info
+     * @return String representation of certificate info
      */
     public String certToString() {
         StringBuilder sb = new StringBuilder();
@@ -197,7 +197,7 @@ public class Vertex {
      * return Vertex throwable as String compatible with
      * the way toString returns other information
      *
-     * @returns String form of exception (or "none")
+     * @return String form of exception (or "none")
      */
     public String throwableToString() {
         StringBuilder sb = new StringBuilder("Exception:  ");
@@ -214,7 +214,7 @@ public class Vertex {
      * the way other Vertex.xToString() methods display
      * information.
      *
-     * @returns String form of index as "Last cert?  [Yes/No]
+     * @return String form of index as "Last cert?  [Yes/No]
      */
     public String moreToString() {
         StringBuilder sb = new StringBuilder("Last cert?  ");
@@ -227,7 +227,7 @@ public class Vertex {
      * return Vertex index as String compatible with
      * the way other Vertex.xToString() methods displays other information.
      *
-     * @returns String form of index as "Index:     [numeric index]"
+     * @return String form of index as "Index:     [numeric index]"
      */
     public String indexToString() {
         return "Index:      " + index + "\n";
diff --git a/jdk/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java b/jdk/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java
index 54aa0d269f5..fcca14bad2a 100644
--- a/jdk/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java
+++ b/jdk/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java
@@ -133,7 +133,7 @@ public final class RSAKeyFactory extends KeyFactorySpi {
      *
      * @param modulusLen the bit length of the RSA modulus.
      * @param exponent the RSA exponent
-     * @param minModulusLen if > 0, check to see if modulusLen is at
+     * @param minModulusLen if {@literal > 0}, check to see if modulusLen is at
      *        least this long, otherwise unused.
      * @param maxModulusLen caller will allow this max number of bits.
      *        Allow the smaller of the system-defined maximum and this param.
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java b/jdk/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java
index 3bdf728b1f3..dd8110ef27e 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java
@@ -39,11 +39,13 @@ import java.security.CryptoPrimitive;
  *
  * Checks for a particular version number should generally take this form:
  *
+ * 
{@code
  * if (protocolVersion.v >= ProtocolVersion.TLS10) {
  *   // TLS 1.0 code goes here
  * } else {
  *   // SSL 3.0 code here
  * }
+ * }

  *
  * @author  Andreas Sterbenz
  * @since   1.4.1
diff --git a/jdk/src/java.base/share/classes/sun/security/timestamp/HttpTimestamper.java b/jdk/src/java.base/share/classes/sun/security/timestamp/HttpTimestamper.java
index 50cef6ec04b..f0312ca427f 100644
--- a/jdk/src/java.base/share/classes/sun/security/timestamp/HttpTimestamper.java
+++ b/jdk/src/java.base/share/classes/sun/security/timestamp/HttpTimestamper.java
@@ -68,7 +68,7 @@ public class HttpTimestamper implements Timestamper {
     /**
      * Creates a timestamper that connects to the specified TSA.
      *
-     * @param tsa The location of the TSA. It must be an HTTP or HTTPS URI.
+     * @param tsaURI The location of the TSA. It must be an HTTP or HTTPS URI.
      * @throws IllegalArgumentException if tsaURI is not an HTTP or HTTPS URI
      */
     public HttpTimestamper(URI tsaURI) {
diff --git a/jdk/src/java.base/share/classes/sun/security/timestamp/TSRequest.java b/jdk/src/java.base/share/classes/sun/security/timestamp/TSRequest.java
index 086c3b61aaa..290981dc7e8 100644
--- a/jdk/src/java.base/share/classes/sun/security/timestamp/TSRequest.java
+++ b/jdk/src/java.base/share/classes/sun/security/timestamp/TSRequest.java
@@ -112,7 +112,7 @@ public class TSRequest {
     /**
      * Sets an object identifier for the Time-Stamp Protocol policy.
      *
-     * @param version The policy object identifier.
+     * @param policyId The policy object identifier.
      */
     public void setPolicyId(String policyId) {
         this.policyId = policyId;
diff --git a/jdk/src/java.base/share/classes/sun/security/timestamp/TimestampToken.java b/jdk/src/java.base/share/classes/sun/security/timestamp/TimestampToken.java
index 9df8f1c0bd0..be6a6d3821a 100644
--- a/jdk/src/java.base/share/classes/sun/security/timestamp/TimestampToken.java
+++ b/jdk/src/java.base/share/classes/sun/security/timestamp/TimestampToken.java
@@ -83,8 +83,8 @@ public class TimestampToken {
     /**
      * Constructs an object to store a timestamp token.
      *
-     * @param status A buffer containing the ASN.1 BER encoding of the
-     *               TSTInfo element defined in RFC 3161.
+     * @param timestampTokenInfo A buffer containing the ASN.1 BER encoding of the
+     *                           TSTInfo element defined in RFC 3161.
      */
     public TimestampToken(byte[] timestampTokenInfo) throws IOException {
         if (timestampTokenInfo == null) {
diff --git a/jdk/src/java.base/share/classes/sun/security/tools/PathList.java b/jdk/src/java.base/share/classes/sun/security/tools/PathList.java
index f059a5ea1aa..1bd9cb76e41 100644
--- a/jdk/src/java.base/share/classes/sun/security/tools/PathList.java
+++ b/jdk/src/java.base/share/classes/sun/security/tools/PathList.java
@@ -42,7 +42,7 @@ public class PathList {
      * Utility method for appending path from pathFrom to pathTo.
      *
      * @param pathTo the target path
-     * @param pathSource the path to be appended to pathTo
+     * @param pathFrom the path to be appended to pathTo
      * @return the resulting path
      */
     public static String appendPath(String pathTo, String pathFrom) {
diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java
index c1e58b5714f..37ed4105c9c 100644
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java
@@ -1887,7 +1887,7 @@ public final class Main {
 
     /**
      * Load the srckeystore from a stream, used in -importkeystore
-     * @returns the src KeyStore
+     * @return the src KeyStore
      */
     KeyStore loadSourceKeyStore() throws Exception {
         boolean isPkcs11 = false;
@@ -2005,7 +2005,7 @@ public final class Main {
 
     /**
      * Import a single entry named alias from srckeystore
-     * @returns 1 if the import action succeed
+     * @return  1 if the import action succeed
      *          0 if user choose to ignore an alias-dumplicated entry
      *          2 if setEntry throws Exception
      */
@@ -2836,7 +2836,7 @@ public final class Main {
     /**
      * Prompts user for alias name.
      * @param prompt the {0} of "Enter {0} alias name:  " in prompt line
-     * @returns the string entered by the user, without the \n at the end
+     * @return the string entered by the user, without the \n at the end
      */
     private String getAlias(String prompt) throws Exception {
         if (prompt != null) {
@@ -2854,7 +2854,7 @@ public final class Main {
     /**
      * Prompts user for an input string from the command line (System.in)
      * @prompt the prompt string printed
-     * @returns the string entered by the user, without the \n at the end
+     * @return the string entered by the user, without the \n at the end
      */
     private String inputStringFromStdin(String prompt) throws Exception {
         System.err.print(prompt);
diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java
index 0c7b513591e..3b944c3e84e 100644
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * 
 This class represents the ResourceBundle
+ * This class represents the ResourceBundle
  * for the keytool.
  *
  */
@@ -433,8 +433,6 @@ public class Resources_de extends java.util.ListResourceBundle {
     /**
      * Returns the contents of this ResourceBundle.
      *
-     * 

-     *
      * @return the contents of this ResourceBundle.
      */
     @Override
diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_es.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_es.java
index 5348d1a104c..e8e731c2c3e 100644
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_es.java
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_es.java
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * 
 This class represents the ResourceBundle
+ * This class represents the ResourceBundle
  * for the keytool.
  *
  */
@@ -433,8 +433,6 @@ public class Resources_es extends java.util.ListResourceBundle {
     /**
      * Returns the contents of this ResourceBundle.
      *
-     * 

-     *
      * @return the contents of this ResourceBundle.
      */
     @Override
diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_fr.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_fr.java
index 6b22844fe13..84fa8dcd765 100644
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_fr.java
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_fr.java
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * 
 This class represents the ResourceBundle
+ * This class represents the ResourceBundle
  * for the keytool.
  *
  */
@@ -433,8 +433,6 @@ public class Resources_fr extends java.util.ListResourceBundle {
     /**
      * Returns the contents of this ResourceBundle.
      *
-     * 

-     *
      * @return the contents of this ResourceBundle.
      */
     @Override
diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_it.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_it.java
index 2a49fe604fb..5912de860f0 100644
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_it.java
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_it.java
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * 
 This class represents the ResourceBundle
+ * This class represents the ResourceBundle
  * for the keytool.
  *
  */
@@ -433,8 +433,6 @@ public class Resources_it extends java.util.ListResourceBundle {
     /**
      * Returns the contents of this ResourceBundle.
      *
-     * 

-     *
      * @return the contents of this ResourceBundle.
      */
     @Override
diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java
index b5d7bb4d310..65d0285afcb 100644
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * 
 This class represents the ResourceBundle
+ * This class represents the ResourceBundle
  * for the keytool.
  *
  */
@@ -433,8 +433,6 @@ public class Resources_ja extends java.util.ListResourceBundle {
     /**
      * Returns the contents of this ResourceBundle.
      *
-     * 

-     *
      * @return the contents of this ResourceBundle.
      */
     @Override
diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_ko.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_ko.java
index 40ede297df0..b4adfab9f13 100644
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_ko.java
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_ko.java
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * 
 This class represents the ResourceBundle
+ * This class represents the ResourceBundle
  * for the keytool.
  *
  */
@@ -433,8 +433,6 @@ public class Resources_ko extends java.util.ListResourceBundle {
     /**
      * Returns the contents of this ResourceBundle.
      *
-     * 

-     *
      * @return the contents of this ResourceBundle.
      */
     @Override
diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_pt_BR.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_pt_BR.java
index 0b784ce956b..747902a675f 100644
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_pt_BR.java
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_pt_BR.java
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * 
 This class represents the ResourceBundle
+ * This class represents the ResourceBundle
  * for the keytool.
  *
  */
@@ -433,8 +433,6 @@ public class Resources_pt_BR extends java.util.ListResourceBundle {
     /**
      * Returns the contents of this ResourceBundle.
      *
-     * 

-     *
      * @return the contents of this ResourceBundle.
      */
     @Override
diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_sv.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_sv.java
index c6b4a8499a6..a8847f7e6e3 100644
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_sv.java
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_sv.java
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * 
 This class represents the ResourceBundle
+ * This class represents the ResourceBundle
  * for the keytool.
  *
  */
@@ -433,8 +433,6 @@ public class Resources_sv extends java.util.ListResourceBundle {
     /**
      * Returns the contents of this ResourceBundle.
      *
-     * 

-     *
      * @return the contents of this ResourceBundle.
      */
     @Override
diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
index 6ae574e4f34..e9dafbd1594 100644
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * 
 This class represents the ResourceBundle
+ * This class represents the ResourceBundle
  * for the keytool.
  *
  */
@@ -433,8 +433,6 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
     /**
      * Returns the contents of this ResourceBundle.
      *
-     * 

-     *
      * @return the contents of this ResourceBundle.
      */
     @Override
diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_HK.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_HK.java
index 90cb13f86cd..89ef6076a62 100644
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_HK.java
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_HK.java
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * 
 This class represents the ResourceBundle
+ * This class represents the ResourceBundle
  * for the keytool.
  *
  */
@@ -420,8 +420,6 @@ public class Resources_zh_HK extends java.util.ListResourceBundle {
     /**
      * Returns the contents of this ResourceBundle.
      *
-     * 

-     *
      * @return the contents of this ResourceBundle.
      */
     @Override
diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_TW.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_TW.java
index 1f0bb68b63e..60e67f4b426 100644
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_TW.java
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_TW.java
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * 
 This class represents the ResourceBundle
+ * This class represents the ResourceBundle
  * for the keytool.
  *
  */
@@ -433,8 +433,6 @@ public class Resources_zh_TW extends java.util.ListResourceBundle {
     /**
      * Returns the contents of this ResourceBundle.
      *
-     * 

-     *
      * @return the contents of this ResourceBundle.
      */
     @Override
diff --git a/jdk/src/java.base/share/classes/sun/security/util/BitArray.java b/jdk/src/java.base/share/classes/sun/security/util/BitArray.java
index ad5ee5f6ee0..f22f259e15f 100644
--- a/jdk/src/java.base/share/classes/sun/security/util/BitArray.java
+++ b/jdk/src/java.base/share/classes/sun/security/util/BitArray.java
@@ -66,10 +66,10 @@ public class BitArray {
 
     /**
      * Creates a BitArray of the specified size, initialized from the
-     * specified byte array.  The most significant bit of a[0] gets
+     * specified byte array.  The most significant bit of {@code a[0]} gets
      * index zero in the BitArray.  The array a must be large enough
      * to specify a value for every bit in the BitArray.  In other words,
-     * 8*a.length <= length.
+     * {@code 8*a.length <= length}.
      */
     public BitArray(int length, byte[] a) throws IllegalArgumentException {
 
diff --git a/jdk/src/java.base/share/classes/sun/security/util/ByteArrayLexOrder.java b/jdk/src/java.base/share/classes/sun/security/util/ByteArrayLexOrder.java
index f943bc93062..7c8649c3e7f 100644
--- a/jdk/src/java.base/share/classes/sun/security/util/ByteArrayLexOrder.java
+++ b/jdk/src/java.base/share/classes/sun/security/util/ByteArrayLexOrder.java
@@ -44,8 +44,9 @@ public class ByteArrayLexOrder implements Comparator {
      *
      * @param  bytes1 first byte array to compare.
      * @param  bytes2 second byte array to compare.
-     * @return negative number if bytes1 < bytes2, 0 if bytes1 == bytes2,
-     * positive number if bytes1 > bytes2.
+     * @return negative number if {@code bytes1 < bytes2},
+     *         0 if {@code bytes1 == bytes2},
+     *         positive number if {@code bytes1 > bytes2}.
      *
      * @exception ClassCastException
      * if either argument is not a byte array.
diff --git a/jdk/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java b/jdk/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java
index 6ce51efaf58..dd5fae526ac 100644
--- a/jdk/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java
+++ b/jdk/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java
@@ -44,8 +44,9 @@ public class ByteArrayTagOrder implements Comparator {
      *
      * @param  bytes1 first byte array to compare.
      * @param  bytes2 second byte array to compare.
-     * @return negative number if bytes1 < bytes2, 0 if bytes1 == bytes2,
-     * positive number if bytes1 > bytes2.
+     * @return negative number if {@code bytes1 < bytes2},
+     *         0 if {@code bytes1 == bytes2},
+     *         positive number if {@code bytes1 > bytes2}.
      *
      * @exception ClassCastException
      * if either argument is not a byte array.
diff --git a/jdk/src/java.base/share/classes/sun/security/util/DerOutputStream.java b/jdk/src/java.base/share/classes/sun/security/util/DerOutputStream.java
index 05a7b6346a3..29425c79ce6 100644
--- a/jdk/src/java.base/share/classes/sun/security/util/DerOutputStream.java
+++ b/jdk/src/java.base/share/classes/sun/security/util/DerOutputStream.java
@@ -103,7 +103,7 @@ extends ByteArrayOutputStream implements DerEncoder {
      * @param tag the DER value of the context-specific tag that replaces
      * original tag of the value in the output, such as in
      * 
-     *            [N] IMPLICIT 
+     *           {@code  [N] IMPLICIT }
      * 

      * For example, FooLength [1] IMPLICIT INTEGER, with value=4;
      * would be encoded as "81 01 04"  whereas in explicit
@@ -245,7 +245,7 @@ extends ByteArrayOutputStream implements DerEncoder {
      * Marshals a DER bit string on the output stream.
      * The bit strings need not be byte-aligned.
      *
-     * @param bits the bit string, MSB first
+     * @param ba the bit string, MSB first
      */
     public void putUnalignedBitString(BitArray ba) throws IOException {
         byte[] bits = ba.toByteArray();
@@ -260,7 +260,7 @@ extends ByteArrayOutputStream implements DerEncoder {
      * Marshals a truncated DER bit string on the output stream.
      * The bit strings need not be byte-aligned.
      *
-     * @param bits the bit string, MSB first
+     * @param ba the bit string, MSB first
      */
     public void putTruncatedUnalignedBitString(BitArray ba) throws IOException {
         putUnalignedBitString(ba.truncate());
@@ -516,7 +516,7 @@ extends ByteArrayOutputStream implements DerEncoder {
     /**
      * Put the encoding of the length in the stream.
      *
-     * @params len the length of the attribute.
+     * @param len the length of the attribute.
      * @exception IOException on writing errors.
      */
     public void putLength(int len) throws IOException {
@@ -550,11 +550,11 @@ extends ByteArrayOutputStream implements DerEncoder {
     /**
      * Put the tag of the attribute in the stream.
      *
-     * @params class the tag class type, one of UNIVERSAL, CONTEXT,
-     *                            APPLICATION or PRIVATE
-     * @params form if true, the value is constructed, otherwise it is
+     * @param tagClass the tag class type, one of UNIVERSAL, CONTEXT,
+     *        APPLICATION or PRIVATE
+     * @param form if true, the value is constructed, otherwise it is
      * primitive.
-     * @params val the tag value
+     * @param val the tag value
      */
     public void putTag(byte tagClass, boolean form, byte val) {
         byte tag = (byte)(tagClass | val);
diff --git a/jdk/src/java.base/share/classes/sun/security/util/DerValue.java b/jdk/src/java.base/share/classes/sun/security/util/DerValue.java
index 4b142bd4bfd..3ab10839661 100644
--- a/jdk/src/java.base/share/classes/sun/security/util/DerValue.java
+++ b/jdk/src/java.base/share/classes/sun/security/util/DerValue.java
@@ -301,7 +301,7 @@ public class DerValue {
      *
      * @param buf the buffer
      * @param offset start point of the single DER-encoded dataum
-     * @param length how many bytes are in the encoded datum
+     * @param len how many bytes are in the encoded datum
      */
     public DerValue(byte[] buf, int offset, int len) throws IOException {
         data = init(true, new ByteArrayInputStream(buf, offset, len));
@@ -594,7 +594,7 @@ public class DerValue {
      * Returns an ASN.1 BIT STRING value, with the tag assumed implicit
      * based on the parameter.  The bit string must be byte-aligned.
      *
-     * @params tagImplicit if true, the tag is assumed implicit.
+     * @param tagImplicit if true, the tag is assumed implicit.
      * @return the bit string held in this value
      */
     public byte[] getBitString(boolean tagImplicit) throws IOException {
@@ -610,7 +610,7 @@ public class DerValue {
      * Returns an ASN.1 BIT STRING value, with the tag assumed implicit
      * based on the parameter.  The bit string need not be byte-aligned.
      *
-     * @params tagImplicit if true, the tag is assumed implicit.
+     * @param tagImplicit if true, the tag is assumed implicit.
      * @return the bit string held in this value
      */
     public BitArray getUnalignedBitString(boolean tagImplicit)
@@ -750,7 +750,7 @@ public class DerValue {
      * encoding, so that bitwise equality of the encoded values is an
      * efficient way to establish equivalence of the unencoded values.
      *
-     * @param other the object being compared with this one
+     * @param o the object being compared with this one
      */
     @Override
     public boolean equals(Object o) {
@@ -892,11 +892,11 @@ public class DerValue {
     /**
      * Create the tag of the attribute.
      *
-     * @params class the tag class type, one of UNIVERSAL, CONTEXT,
+     * @param tagClass the tag class type, one of UNIVERSAL, CONTEXT,
      *               APPLICATION or PRIVATE
-     * @params form if true, the value is constructed, otherwise it
+     * @param form if true, the value is constructed, otherwise it
      * is primitive.
-     * @params val the tag value
+     * @param val the tag value
      */
     public static byte createTag(byte tagClass, boolean form, byte val) {
         byte tag = (byte)(tagClass | val);
@@ -910,7 +910,7 @@ public class DerValue {
      * Set the tag of the attribute. Commonly used to reset the
      * tag value used for IMPLICIT encodings.
      *
-     * @params tag the tag value
+     * @param tag the tag value
      */
     public void resetTag(byte tag) {
         this.tag = tag;
diff --git a/jdk/src/java.base/share/classes/sun/security/util/KeyUtil.java b/jdk/src/java.base/share/classes/sun/security/util/KeyUtil.java
index 661e3b973b9..5e0f58ca2be 100644
--- a/jdk/src/java.base/share/classes/sun/security/util/KeyUtil.java
+++ b/jdk/src/java.base/share/classes/sun/security/util/KeyUtil.java
@@ -100,11 +100,10 @@ public final class KeyUtil {
      * 

      * Note that this method is only apply to DHPublicKey at present.
      *
-     * @param  publicKey
-     *         the key object, cannot be null
+     * @param  key the key object, cannot be null
      *
-     * @throws NullPointerException if {@code publicKey} is null
-     * @throws InvalidKeyException if {@code publicKey} is invalid
+     * @throws NullPointerException if {@code key} is null
+     * @throws InvalidKeyException if {@code key} is invalid
      */
     public static final void validate(Key key)
             throws InvalidKeyException {
@@ -165,7 +164,8 @@ public final class KeyUtil {
      * version numbers in a manner indistinguishable from correctly
      * formatted RSA blocks.
      *
-     * RFC 5246 describes the approach as :
+     * RFC 5246 describes the approach as:
+     * 
{@literal
      *
      *  1. Generate a string R of 48 random bytes
      *
@@ -183,6 +183,7 @@ public final class KeyUtil {
      *        premaster secret = M
      *
      * Note that #2 should have completed before the call to this method.
+     * }

      *
      * @param  clientVersion the version of the TLS protocol by which the
      *         client wishes to communicate during this session
@@ -190,7 +191,7 @@ public final class KeyUtil {
      *         contains the lower of that suggested by the client in the client
      *         hello and the highest supported by the server.
      * @param  encoded the encoded key in its "RAW" encoding format
-     * @param  isFailover whether or not the previous decryption of the
+     * @param  isFailOver whether or not the previous decryption of the
      *         encrypted PreMasterSecret message run into problem
      * @return the polished PreMasterSecret key in its "RAW" encoding format
      */
diff --git a/jdk/src/java.base/share/classes/sun/security/util/ManifestDigester.java b/jdk/src/java.base/share/classes/sun/security/util/ManifestDigester.java
index 5314e69a14e..568e296f719 100644
--- a/jdk/src/java.base/share/classes/sun/security/util/ManifestDigester.java
+++ b/jdk/src/java.base/share/classes/sun/security/util/ManifestDigester.java
@@ -59,7 +59,7 @@ public class ManifestDigester {
      *
      * @pos set by
      *
-     * @returns false if end of bytes has been reached, otherwise returns
+     * @return false if end of bytes has been reached, otherwise returns
      *          true
      */
     @SuppressWarnings("fallthrough")
diff --git a/jdk/src/java.base/share/classes/sun/security/util/PendingException.java b/jdk/src/java.base/share/classes/sun/security/util/PendingException.java
index 3997f25d866..f510b3ab689 100644
--- a/jdk/src/java.base/share/classes/sun/security/util/PendingException.java
+++ b/jdk/src/java.base/share/classes/sun/security/util/PendingException.java
@@ -47,8 +47,6 @@ public class PendingException extends RuntimeException {
      * A detail message is a String that describes this particular
      * exception.
      *
-     * 

-     *
      * @param msg the detail message.
      */
     public PendingException(String msg) {
diff --git a/jdk/src/java.base/share/classes/sun/security/util/Resources.java b/jdk/src/java.base/share/classes/sun/security/util/Resources.java
index 286acc99e28..5ddbab23140 100644
--- a/jdk/src/java.base/share/classes/sun/security/util/Resources.java
+++ b/jdk/src/java.base/share/classes/sun/security/util/Resources.java
@@ -26,7 +26,7 @@
 package sun.security.util;
 
 /**
- * 
 This class represents the ResourceBundle
+ * This class represents the ResourceBundle
  * for javax.security.auth and sun.security.
  *
  */
@@ -160,8 +160,6 @@ public class Resources extends java.util.ListResourceBundle {
     /**
      * Returns the contents of this ResourceBundle.
      *
-     * 

-     *
      * @return the contents of this ResourceBundle.
      */
     @Override
diff --git a/jdk/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java b/jdk/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
index 51b296544b2..88d0ccb00e4 100644
--- a/jdk/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
+++ b/jdk/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
@@ -159,7 +159,7 @@ public class SignatureFileVerifier {
      * unknown signature related files (those starting with SIG- with
      * an optional [A-Z0-9]{1,3} extension right inside META-INF).
      *
-     * @param s file name
+     * @param name file name
      * @return true if the input file name is signature related
      */
     public static boolean isSigningRelated(String name) {
diff --git a/jdk/src/java.base/share/classes/sun/security/validator/PKIXValidator.java b/jdk/src/java.base/share/classes/sun/security/validator/PKIXValidator.java
index f3e71a793b3..4c941900468 100644
--- a/jdk/src/java.base/share/classes/sun/security/validator/PKIXValidator.java
+++ b/jdk/src/java.base/share/classes/sun/security/validator/PKIXValidator.java
@@ -36,7 +36,7 @@ import sun.security.provider.certpath.AlgorithmChecker;
 
 /**
  * Validator implementation built on the PKIX CertPath API. This
- * implementation will be emphasized going forward.

+ * implementation will be emphasized going forward.
  * 

  * Note that the validate() implementation tries to use a PKIX validator
  * if that appears possible and a PKIX builder otherwise. This increases
diff --git a/jdk/src/java.base/share/classes/sun/security/validator/Validator.java b/jdk/src/java.base/share/classes/sun/security/validator/Validator.java
index dd880a7b2dd..5bb2addbf32 100644
--- a/jdk/src/java.base/share/classes/sun/security/validator/Validator.java
+++ b/jdk/src/java.base/share/classes/sun/security/validator/Validator.java
@@ -228,7 +228,7 @@ public abstract class Validator {
      * used (see JSSE X509TrustManager specification). In the future, it
      * could be used to pass in a PKCS#7 object for code signing to check time
      * stamps.
-     * 

+     *
      * @return a non-empty chain that was used to validate the path. The
      * end entity cert is at index 0, the trust anchor at index n-1.
      */
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/AlgIdDSA.java b/jdk/src/java.base/share/classes/sun/security/x509/AlgIdDSA.java
index dc9c97dc591..c4d2f896b5d 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/AlgIdDSA.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/AlgIdDSA.java
@@ -39,7 +39,7 @@ import sun.security.util.*;
  * NIST/IETF standard DER encoding.  These are used to implement the Digital
  * Signature Standard (DSS), FIPS 186.
  *
- * 
NOTE:  DSS/DSA Algorithm IDs may be created without these
+ * 
NOTE:  DSS/DSA Algorithm IDs may be created without these
  * parameters.  Use of DSS/DSA in modes where parameters are
  * either implicit (e.g. a default applicable to a site or a larger scope),
  * or are derived from some Certificate Authority's DSS certificate, is
@@ -49,8 +49,8 @@ import sun.security.util.*;
  * that we have a certificate called currentCert which doesn't
  * contain DSS/DSA parameters and we need to derive DSS/DSA parameters
  * from a CA's certificate called caCert.
- * 

- * 
+ *
+ * 
{@code
  * // key containing parameters to use
  * DSAPublicKey cAKey = (DSAPublicKey)(caCert.getPublicKey());
  * // key without parameters
@@ -63,7 +63,7 @@ import sun.security.util.*;
  *                                            cAKeyParams.getQ(),
  *                                            cAKeyParams.getG());
  * DSAPublicKey usableKey = kf.generatePublic(ks);
- * 

+ * }

  *
  * @see java.security.interfaces.DSAParams
  * @see java.security.interfaces.DSAPublicKey
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java
index afc642df2f7..69459fb6ef0 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java
@@ -58,7 +58,7 @@ import sun.security.util.DerValue;
  *         accessMethod          OBJECT IDENTIFIER,
  *         accessLocation        GeneralName  }
  * 

- * 

+ *
  * @see Extension
  * @see CertAttrSet
  */
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java
index afd7c99683d..a8b04dea2b8 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java
@@ -117,17 +117,17 @@ implements CertAttrSet {
      * The default constructor for this extension.  Null parameters make
      * the element optional (not present).
      *
-     * @param id the KeyIdentifier associated with this extension.
+     * @param kid the KeyIdentifier associated with this extension.
      * @param names the GeneralNames associated with this extension
-     * @param serialNum the CertificateSerialNumber associated with
-     *         this extension.
+     * @param sn the CertificateSerialNumber associated with
+     *        this extension.
      * @exception IOException on error.
      */
-    public AuthorityKeyIdentifierExtension(KeyIdentifier kid, GeneralNames name,
+    public AuthorityKeyIdentifierExtension(KeyIdentifier kid, GeneralNames names,
                                            SerialNumber sn)
     throws IOException {
         this.id = kid;
-        this.names = name;
+        this.names = names;
         this.serialNum = sn;
 
         this.extensionId = PKIXExtensions.AuthorityKey_Id;
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CRLDistributionPointsExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/CRLDistributionPointsExtension.java
index c3814306978..eb2b0801fb8 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/CRLDistributionPointsExtension.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/CRLDistributionPointsExtension.java
@@ -71,7 +71,7 @@ import sun.security.util.ObjectIdentifier;
  *
  * CRLDistPointsSyntax ::= SEQUENCE SIZE (1..MAX) OF DistributionPoint
  * 

- * 

+ *
  * @author Anne Anderson
  * @author Andreas Sterbenz
  * @since 1.4.2
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CertificateSerialNumber.java b/jdk/src/java.base/share/classes/sun/security/x509/CertificateSerialNumber.java
index 0e47fc87ed9..385c4917bf0 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/CertificateSerialNumber.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/CertificateSerialNumber.java
@@ -57,7 +57,7 @@ public class CertificateSerialNumber implements CertAttrSet {
     /**
      * Default constructor for the certificate attribute.
      *
-     * @param serial the serial number for the certificate.
+     * @param num the serial number for the certificate.
      */
     public CertificateSerialNumber(BigInteger num) {
       this.serial = new SerialNumber(num);
@@ -66,7 +66,7 @@ public class CertificateSerialNumber implements CertAttrSet {
     /**
      * Default constructor for the certificate attribute.
      *
-     * @param serial the serial number for the certificate.
+     * @param num the serial number for the certificate.
      */
     public CertificateSerialNumber(int num) {
       this.serial = new SerialNumber(num);
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/DNSName.java b/jdk/src/java.base/share/classes/sun/security/x509/DNSName.java
index 2a35b86fb35..449d7550043 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/DNSName.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/DNSName.java
@@ -44,7 +44,7 @@ import sun.security.util.*;
  * the DNS representation for Internet mail addresses (wpolk.nist.gov
  * instead of wpolk@nist.gov) is not permitted; such identities are to
  * be encoded as rfc822Name.
- * 

+ *
  * @author Amit Kapoor
  * @author Hemma Prafullchandra
  */
@@ -186,9 +186,9 @@ public class DNSName implements GeneralNameInterface {
      * domain name comparisons for all present domain functions are done in a
      * case-insensitive manner, assuming an ASCII character set, and a high
      * order zero bit.
-     * 

+     *
      * @param inputName to be checked for being constrained
-     * @returns constraint type above
+     * @return constraint type above
      * @throws UnsupportedOperationException if name is not exact match, but narrowing and widening are
      *          not supported for this name type.
      */
@@ -228,7 +228,7 @@ public class DNSName implements GeneralNameInterface {
      * NameConstraints minimum and maximum bounds and for calculating
      * path lengths in name subtrees.
      *
-     * @returns distance of name from root
+     * @return distance of name from root
      * @throws UnsupportedOperationException if not supported for this name type
      */
     public int subtreeDepth() throws UnsupportedOperationException {
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/DistributionPoint.java b/jdk/src/java.base/share/classes/sun/security/x509/DistributionPoint.java
index faca907518c..29b5f933dd3 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/DistributionPoint.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/DistributionPoint.java
@@ -143,9 +143,9 @@ public class DistributionPoint {
      * Constructor for the class using GeneralNames for DistributionPointName
      *
      * @param fullName the GeneralNames of the distribution point; may be null
-     * @param reasons the CRL reasons included in the CRL at this distribution
+     * @param reasonFlags the CRL reasons included in the CRL at this distribution
      *        point; may be null
-     * @param issuer the name(s) of the CRL issuer for the CRL at this
+     * @param crlIssuer the name(s) of the CRL issuer for the CRL at this
      *        distribution point; may be null
      */
     public DistributionPoint(GeneralNames fullName, boolean[] reasonFlags,
@@ -165,9 +165,9 @@ public class DistributionPoint {
      *
      * @param relativeName the RelativeDistinguishedName of the distribution
      *        point; may not be null
-     * @param reasons the CRL reasons included in the CRL at this distribution
+     * @param reasonFlags the CRL reasons included in the CRL at this distribution
      *        point; may be null
-     * @param issuer the name(s) of the CRL issuer for the CRL at this
+     * @param crlIssuer the name(s) of the CRL issuer for the CRL at this
      *        distribution point; may not be null or empty.
      */
     public DistributionPoint(RDN relativeName, boolean[] reasonFlags,
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/EDIPartyName.java b/jdk/src/java.base/share/classes/sun/security/x509/EDIPartyName.java
index feaf30bfd4f..e6a8c3bb076 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/EDIPartyName.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/EDIPartyName.java
@@ -146,7 +146,7 @@ public class EDIPartyName implements GeneralNameInterface {
     /**
      * Return the assignerName
      *
-     * @returns String assignerName
+     * @return String assignerName
      */
     public String getAssignerName() {
         return assigner;
@@ -155,7 +155,7 @@ public class EDIPartyName implements GeneralNameInterface {
     /**
      * Return the partyName
      *
-     * @returns String partyName
+     * @return String partyName
      */
     public String getPartyName() {
         return party;
@@ -166,7 +166,7 @@ public class EDIPartyName implements GeneralNameInterface {
      * comparison without regard to type of the partyName and
      * the assignerName.
      *
-     * @returns true if the two names match
+     * @return true if the two names match
      */
     public boolean equals(Object other) {
         if (!(other instanceof EDIPartyName))
@@ -226,7 +226,7 @@ public class EDIPartyName implements GeneralNameInterface {
      * certification path verification.
      *
      * @param inputName to be checked for being constrained
-     * @returns constraint type above
+     * @return constraint type above
      * @throws UnsupportedOperationException if name is same type, but comparison operations are
      *          not supported for this name type.
      */
@@ -247,7 +247,7 @@ public class EDIPartyName implements GeneralNameInterface {
      * NameConstraints minimum and maximum bounds and for calculating
      * path lengths in name subtrees.
      *
-     * @returns distance of name from root
+     * @return distance of name from root
      * @throws UnsupportedOperationException if not supported for this name type
      */
     public int subtreeDepth() throws UnsupportedOperationException {
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/ExtendedKeyUsageExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/ExtendedKeyUsageExtension.java
index dc820770ef8..c8968448c7f 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/ExtendedKeyUsageExtension.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/ExtendedKeyUsageExtension.java
@@ -75,7 +75,7 @@ import sun.security.util.ObjectIdentifier;
  * processed independently and the certificate MUST only be used for a
  * purpose consistent with both fields.  If there is no purpose
  * consistent with both fields, then the certificate MUST NOT be used
- * for any purpose.

+ * for any purpose.
  *
  * @since       1.4
  */
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/Extension.java b/jdk/src/java.base/share/classes/sun/security/x509/Extension.java
index a5bcc864717..04489d70094 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/Extension.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/Extension.java
@@ -50,11 +50,11 @@ import sun.security.util.*;
  * }
  * 
  * All subclasses need to implement a constructor of the form
- * 
+ * 
{@code
  *      (Boolean, Object)
- * 

+ * }

  * where the Object is typically an array of DER encoded bytes.
- * 

+ *
  * @author Amit Kapoor
  * @author Hemma Prafullchandra
  */
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/GeneralName.java b/jdk/src/java.base/share/classes/sun/security/x509/GeneralName.java
index f8bd1bcd89e..1cc95ce79e6 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/GeneralName.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/GeneralName.java
@@ -202,7 +202,7 @@ public class GeneralName {
      * Compare this GeneralName with another
      *
      * @param other GeneralName to compare to this
-     * @returns true if match
+     * @return true if match
      */
     public boolean equals(Object other) {
         if (this == other) {
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/GeneralNameInterface.java b/jdk/src/java.base/share/classes/sun/security/x509/GeneralNameInterface.java
index 1d81977e697..c26de28cf46 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/GeneralNameInterface.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/GeneralNameInterface.java
@@ -85,7 +85,7 @@ public interface GeneralNameInterface {
      * certification path verification.
      *
      * @param inputName to be checked for being constrained
-     * @returns constraint type above
+     * @return constraint type above
      * @throws UnsupportedOperationException if name is same type, but comparison operations are
      *          not supported for this name type.
      */
@@ -96,7 +96,7 @@ public interface GeneralNameInterface {
      * NameConstraints minimum and maximum bounds and for calculating
      * path lengths in name subtrees.
      *
-     * @returns distance of name from root
+     * @return distance of name from root
      * @throws UnsupportedOperationException if not supported for this name type
      */
     int subtreeDepth() throws UnsupportedOperationException;
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/GeneralNames.java b/jdk/src/java.base/share/classes/sun/security/x509/GeneralNames.java
index 8e081aae6cf..ae9532d5dfa 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/GeneralNames.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/GeneralNames.java
@@ -126,7 +126,7 @@ public class GeneralNames {
     /**
      * compare this GeneralNames to other object for equality
      *
-     * @returns true iff this equals other
+     * @return true if this equals obj
      */
     public boolean equals(Object obj) {
         if (this == obj) {
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/GeneralSubtree.java b/jdk/src/java.base/share/classes/sun/security/x509/GeneralSubtree.java
index 9c12665cfb3..bbd2b2586bd 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/GeneralSubtree.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/GeneralSubtree.java
@@ -56,9 +56,9 @@ public class GeneralSubtree {
     /**
      * The default constructor for the class.
      *
-     * @params name the GeneralName
-     * @params min the minimum BaseDistance
-     * @params max the maximum BaseDistance
+     * @param name the GeneralName
+     * @param min the minimum BaseDistance
+     * @param max the maximum BaseDistance
      */
     public GeneralSubtree(GeneralName name, int min, int max) {
         this.name = name;
@@ -142,7 +142,7 @@ public class GeneralSubtree {
      * Compare this GeneralSubtree with another
      *
      * @param other GeneralSubtree to compare to this
-     * @returns true if match
+     * @return true if match
      */
     public boolean equals(Object other) {
         if (!(other instanceof GeneralSubtree))
@@ -187,7 +187,7 @@ public class GeneralSubtree {
     /**
      * Encode the GeneralSubtree.
      *
-     * @params out the DerOutputStream to encode this object to.
+     * @param out the DerOutputStream to encode this object to.
      */
     public void encode(DerOutputStream out) throws IOException {
         DerOutputStream seq = new DerOutputStream();
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/GeneralSubtrees.java b/jdk/src/java.base/share/classes/sun/security/x509/GeneralSubtrees.java
index 2d6e3a1df21..40c4db15986 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/GeneralSubtrees.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/GeneralSubtrees.java
@@ -37,7 +37,6 @@ import sun.security.util.*;
  * 
  * GeneralSubtrees ::= SEQUENCE SIZE (1..MAX) OF GeneralSubtree
  * 

- * 

  *
  *
  * @author Amit Kapoor
@@ -132,7 +131,7 @@ public class GeneralSubtrees implements Cloneable {
     /**
      * Encode the GeneralSubtrees.
      *
-     * @params out the DerOutputStrean to encode this object to.
+     * @param out the DerOutputStrean to encode this object to.
      */
     public void encode(DerOutputStream out) throws IOException {
         DerOutputStream seq = new DerOutputStream();
@@ -147,8 +146,8 @@ public class GeneralSubtrees implements Cloneable {
      * Compare two general subtrees by comparing the subtrees
      * of each.
      *
-     * @param other GeneralSubtrees to compare to this
-     * @returns true if match
+     * @param obj GeneralSubtrees to compare to this
+     * @return true if match
      */
     public boolean equals(Object obj) {
         if (this == obj) {
@@ -236,8 +235,8 @@ public class GeneralSubtrees implements Cloneable {
      * create a subtree containing an instance of the input
      * name type that widens all other names of that type.
      *
-     * @params name GeneralNameInterface name
-     * @returns GeneralSubtree containing widest name of that type
+     * @param name GeneralNameInterface name
+     * @return GeneralSubtree containing widest name of that type
      * @throws RuntimeException on error (should not occur)
      */
     private GeneralSubtree createWidestSubtree(GeneralNameInterface name) {
@@ -309,10 +308,10 @@ public class GeneralSubtrees implements Cloneable {
      *     the result contains the name in other.  This means that
      *     the name is now constrained in some way, whereas before it was
      *     completely permitted.
-     * 
    
+     * 

      *
      * @param other GeneralSubtrees to be intersected with this
-     * @returns GeneralSubtrees to be merged with excluded; these are
+     * @return  GeneralSubtrees to be merged with excluded; these are
      *          empty-valued name types corresponding to entries that were
      *          of the same type but did not share the same subtree between
      *          this and other. Returns null if no such.
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/IPAddressName.java b/jdk/src/java.base/share/classes/sun/security/x509/IPAddressName.java
index 084a6f3760a..d9dd126baaa 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/IPAddressName.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/IPAddressName.java
@@ -75,7 +75,7 @@ public class IPAddressName implements GeneralNameInterface {
     /**
      * Create the IPAddressName object from the passed encoded Der value.
      *
-     * @params derValue the encoded DER IPAddressName.
+     * @param derValue the encoded DER IPAddressName.
      * @exception IOException on error.
      */
     public IPAddressName(DerValue derValue) throws IOException {
@@ -85,7 +85,7 @@ public class IPAddressName implements GeneralNameInterface {
     /**
      * Create the IPAddressName object with the specified octets.
      *
-     * @params address the IP address
+     * @param address the IP address
      * @throws IOException if address is not a valid IPv4 or IPv6 address
      */
     public IPAddressName(byte[] address) throws IOException {
@@ -106,7 +106,7 @@ public class IPAddressName implements GeneralNameInterface {
 
     /**
      * Create an IPAddressName from a String.
-     * [IETF RFC1338 Supernetting & IETF RFC1519 Classless Inter-Domain
+     * [IETF RFC1338 Supernetting {@literal &} IETF RFC1519 Classless Inter-Domain
      * Routing (CIDR)] For IPv4 addresses, the forms are
      * "b1.b2.b3.b4" or "b1.b2.b3.b4/m1.m2.m3.m4", where b1 - b4 are decimal
      * byte values 0-255 and m1 - m4 are decimal mask values
@@ -118,7 +118,7 @@ public class IPAddressName implements GeneralNameInterface {
      * of the address. If /n is used, n is a decimal number indicating how many
      * of the leftmost contiguous bits of the address comprise the prefix for
      * this subnet. Internally, a mask value is created using the prefix length.
-     * 

+     *
      * @param name String form of IPAddressName
      * @throws IOException if name can not be converted to a valid IPv4 or IPv6
      *     address
@@ -224,7 +224,7 @@ public class IPAddressName implements GeneralNameInterface {
     /**
      * Encode the IPAddress name into the DerOutputStream.
      *
-     * @params out the DER stream to encode the IPAddressName to.
+     * @param out the DER stream to encode the IPAddressName to.
      * @exception IOException on encoding errors.
      */
     public void encode(DerOutputStream out) throws IOException {
@@ -384,9 +384,9 @@ public class IPAddressName implements GeneralNameInterface {
      * constraint for "class C" subnet 10.9.8.0 shall be represented as the
      * octets 0A 09 08 00 FF FF FF 00, representing the CIDR notation
      * 10.9.8.0/255.255.255.0.
-     * 

+     *
      * @param inputName to be checked for being constrained
-     * @returns constraint type above
+     * @return constraint type above
      * @throws UnsupportedOperationException if name is not exact match, but
      * narrowing and widening are not supported for this name type.
      */
@@ -479,7 +479,7 @@ public class IPAddressName implements GeneralNameInterface {
      * NameConstraints minimum and maximum bounds and for calculating
      * path lengths in name subtrees.
      *
-     * @returns distance of name from root
+     * @return distance of name from root
      * @throws UnsupportedOperationException if not supported for this name type
      */
     public int subtreeDepth() throws UnsupportedOperationException {
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java
index 50bf342a17b..a20a1f55803 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java
@@ -50,13 +50,13 @@ import sun.security.util.ObjectIdentifier;
  * This extension MUST be critical.
  * 

  * The ASN.1 syntax for this extension is:
- * 
+ * 
{@code
  * id-ce-inhibitAnyPolicy OBJECT IDENTIFIER ::=  { id-ce 54 }
  *
  * InhibitAnyPolicy ::= SkipCerts
  *
  * SkipCerts ::= INTEGER (0..MAX)
- * 

+ * }

  * @author Anne Anderson
  * @see CertAttrSet
  * @see Extension
@@ -211,7 +211,7 @@ implements CertAttrSet {
      * Get the attribute value.
      *
      * @param name name of attribute to get.  Must be SKIP_CERTS.
-     * @returns value of the attribute.  In this case it will be of type
+     * @return value of the attribute.  In this case it will be of type
      *          Integer.
      * @throws IOException on error
      */
@@ -244,7 +244,7 @@ implements CertAttrSet {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      *
-     * @returns enumeration of elements
+     * @return enumeration of elements
      */
     public Enumeration getElements() {
         AttributeNameEnumeration elements = new AttributeNameEnumeration();
@@ -255,7 +255,7 @@ implements CertAttrSet {
     /**
      * Return the name of this attribute.
      *
-     * @returns name of attribute.
+     * @return name of attribute.
      */
     public String getName() {
         return (NAME);
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/KeyIdentifier.java b/jdk/src/java.base/share/classes/sun/security/x509/KeyIdentifier.java
index 01d4803cecf..f60765f8ace 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/KeyIdentifier.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/KeyIdentifier.java
@@ -69,7 +69,7 @@ public class KeyIdentifier {
      * 
  • The keyIdentifier is composed of the 160-bit SHA-1 hash of the
      * value of the BIT STRING subjectPublicKey (excluding the tag,
      * length, and number of unused bits).
-     * 
    
+     *
      * 
  • The keyIdentifier is composed of a four bit type field with
      * the value 0100 followed by the least significant 60 bits of the
      * SHA-1 hash of the value of the BIT STRING subjectPublicKey.
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/NameConstraintsExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/NameConstraintsExtension.java
index f043183b95c..a8d46a8a8d0 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/NameConstraintsExtension.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/NameConstraintsExtension.java
@@ -328,7 +328,7 @@ implements CertAttrSet, Cloneable {
      * (k)  If excludedSubtrees is present in the certificate, set the
      * excluded subtrees state variable to the union of its previous
      * value and the value indicated in the extension field.
-     * 
    
+     *
      * @param newConstraints additional NameConstraints to be applied
      * @throws IOException on error
      */
@@ -406,7 +406,7 @@ implements CertAttrSet, Cloneable {
      * the excluded subtrees state variables.
      *
      * @param cert X509Certificate to be verified
-     * @returns true if certificate verifies successfully
+     * @return true if certificate verifies successfully
      * @throws IOException on error
      */
     public boolean verify(X509Certificate cert) throws IOException {
@@ -484,7 +484,7 @@ implements CertAttrSet, Cloneable {
      * permitted and excluded subtrees variables.
      *
      * @param name GeneralNameInterface name to be verified
-     * @returns true if certificate verifies successfully
+     * @return true if certificate verifies successfully
      * @throws IOException on error
      */
     public boolean verify(GeneralNameInterface name) throws IOException {
@@ -566,7 +566,7 @@ implements CertAttrSet, Cloneable {
      * NameConstraints.
      *
      * @param subject the certificate's subject name
-     * @returns true if certificate verifies successfully
+     * @return true if certificate verifies successfully
      * @throws IOException on error
      */
     public boolean verifyRFC822SpecialCase(X500Name subject) throws IOException {
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/OIDMap.java b/jdk/src/java.base/share/classes/sun/security/x509/OIDMap.java
index f6358b92fd1..c8f0da3a671 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/OIDMap.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/OIDMap.java
@@ -33,8 +33,8 @@ import java.security.cert.CertificateException;
 import sun.security.util.*;
 
 /**
- * This class defines the mapping from OID & name to classes and vice
- * versa.  Used by CertificateExtensions & PKCS10 to get the java
+ * This class defines the mapping from OID {@literal &} name to classes and vice
+ * versa.  Used by CertificateExtensions {@literal &} PKCS10 to get the java
  * classes associated with a particular OID/name.
  *
  * @author Amit Kapoor
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/OIDName.java b/jdk/src/java.base/share/classes/sun/security/x509/OIDName.java
index 44187b036e0..b5435eb0653 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/OIDName.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/OIDName.java
@@ -55,7 +55,7 @@ public class OIDName implements GeneralNameInterface {
     /**
      * Create the OIDName object with the specified name.
      *
-     * @param name the OIDName.
+     * @param oid the OIDName.
      */
     public OIDName(ObjectIdentifier oid) {
         this.oid = oid;
@@ -143,7 +143,7 @@ public class OIDName implements GeneralNameInterface {
      * certification path verification.
      *
      * @param inputName to be checked for being constrained
-     * @returns constraint type above
+     * @return constraint type above
      * @throws UnsupportedOperationException if name is not exact match, but narrowing and widening are
      *          not supported for this name type.
      */
@@ -166,7 +166,7 @@ public class OIDName implements GeneralNameInterface {
      * NameConstraints minimum and maximum bounds and for calculating
      * path lengths in name subtrees.
      *
-     * @returns distance of name from root
+     * @return distance of name from root
      * @throws UnsupportedOperationException if not supported for this name type
      */
     public int subtreeDepth() throws UnsupportedOperationException {
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/OtherName.java b/jdk/src/java.base/share/classes/sun/security/x509/OtherName.java
index d2b68dae026..5b73fb1a176 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/OtherName.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/OtherName.java
@@ -237,7 +237,7 @@ public class OtherName implements GeneralNameInterface {
      * certification path verification.
      *
      * @param inputName to be checked for being constrained
-     * @returns constraint type above
+     * @return constraint type above
      * @throws UnsupportedOperationException if name is same type, but
      *         comparison operations are not supported for this name type.
      */
@@ -258,7 +258,7 @@ public class OtherName implements GeneralNameInterface {
      * Return subtree depth of this name for purposes of determining
      * NameConstraints minimum and maximum bounds.
      *
-     * @returns distance of name from root
+     * @return distance of name from root
      * @throws UnsupportedOperationException if not supported for this name type
      */
     public int subtreeDepth() {
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/PolicyMappingsExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/PolicyMappingsExtension.java
index d37bafccc1d..175201c732b 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/PolicyMappingsExtension.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/PolicyMappingsExtension.java
@@ -88,9 +88,9 @@ implements CertAttrSet {
      *
      * @param maps the List of CertificatePolicyMap.
      */
-    public PolicyMappingsExtension(List map)
+    public PolicyMappingsExtension(List maps)
             throws IOException {
-        this.maps = map;
+        this.maps = maps;
         this.extensionId = PKIXExtensions.PolicyMappings_Id;
         this.critical = true;
         encodeThis();
@@ -108,8 +108,8 @@ implements CertAttrSet {
     /**
      * Create the extension from the passed DER encoded value.
      *
-     * @params critical true if the extension is to be treated as critical.
-     * @params value an array of DER encoded bytes of the actual value.
+     * @param critical true if the extension is to be treated as critical.
+     * @param value an array of DER encoded bytes of the actual value.
      * @exception ClassCastException if value is not an array of bytes
      * @exception IOException on error.
      */
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/RDN.java b/jdk/src/java.base/share/classes/sun/security/x509/RDN.java
index 4a59176c3e1..aa492e4e127 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/RDN.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/RDN.java
@@ -95,7 +95,7 @@ public class RDN {
      * preceded by '\'.
      *
      * @param name String form of RDN
-     * @param keyword an additional mapping of keywords to OIDs
+     * @param keywordMap an additional mapping of keywords to OIDs
      * @throws IOException on parsing error
      */
     public RDN(String name, Map keywordMap) throws IOException {
@@ -307,7 +307,7 @@ public class RDN {
      * Calculates a hash code value for the object.  Objects
      * which are equal will also have the same hashcode.
      *
-     * @returns int hashCode value
+     * @return int hashCode value
      */
     public int hashCode() {
         return toRFC2253String(true).hashCode();
@@ -316,8 +316,8 @@ public class RDN {
     /*
      * return specified attribute value from RDN
      *
-     * @params oid ObjectIdentifier of attribute to be found
-     * @returns DerValue of attribute value; null if attribute does not exist
+     * @param oid ObjectIdentifier of attribute to be found
+     * @return DerValue of attribute value; null if attribute does not exist
      */
     DerValue findAttribute(ObjectIdentifier oid) {
         for (int i = 0; i < assertion.length; i++) {
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/RFC822Name.java b/jdk/src/java.base/share/classes/sun/security/x509/RFC822Name.java
index e905ae1b7f2..57d5ffdd8a2 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/RFC822Name.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/RFC822Name.java
@@ -174,9 +174,9 @@ public class RFC822Name implements GeneralNameInterface
      * surrounded in parentheses) after it, and is not surrounded by "<" and
      * ">". Note that while upper and lower case letters are allowed in an
      * RFC 822 addr-spec, no significance is attached to the case.
-     * 
    
+     *
      * @param inputName to be checked for being constrained
-     * @returns constraint type above
+     * @return constraint type above
      * @throws UnsupportedOperationException if name is not exact match, but narrowing and widening are
      *          not supported for this name type.
      */
@@ -232,7 +232,7 @@ public class RFC822Name implements GeneralNameInterface
      * Return subtree depth of this name for purposes of determining
      * NameConstraints minimum and maximum bounds.
      *
-     * @returns distance of name from root
+     * @return distance of name from root
      * @throws UnsupportedOperationException if not supported for this name type
      */
     public int subtreeDepth() throws UnsupportedOperationException {
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/SubjectInfoAccessExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/SubjectInfoAccessExtension.java
index 20e6489398b..43defaaa176 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/SubjectInfoAccessExtension.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/SubjectInfoAccessExtension.java
@@ -62,7 +62,7 @@ import sun.security.util.DerValue;
  *          accessMethod          OBJECT IDENTIFIER,
  *          accessLocation        GeneralName  }
  * 
- * 
    
+ *
  * @see Extension
  * @see CertAttrSet
  */
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/URIName.java b/jdk/src/java.base/share/classes/sun/security/x509/URIName.java
index 4331461f1b9..2f3e107ef0b 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/URIName.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/URIName.java
@@ -52,10 +52,10 @@ import sun.security.util.*;
  * 
    
  * [RFC1738] In general, URLs are written as follows:
  * 
    - * :
+ * {@code :}
  * 
    
- * A URL contains the name of the scheme being used () followed
- * by a colon and then a string (the ) whose
+ * A URL contains the name of the scheme being used ({@code }) followed
+ * by a colon and then a string (the {@code }) whose
  * interpretation depends on the scheme.
  * 
    
  * While the syntax for the rest of the URL may vary depending on the
@@ -63,13 +63,13 @@ import sun.security.util.*;
  * of an IP-based protocol to a specified host on the Internet use a
  * common syntax for the scheme-specific data:
  * 
    - * //:@:/
+ * {@code //:@:/}
  * 
    
  * [RFC2732] specifies that an IPv6 address contained inside a URL
  * must be enclosed in square brackets (to allow distinguishing the
  * colons that separate IPv6 components from the colons that separate
  * scheme-specific data.
- * 
    
+ *
  * @author Amit Kapoor
  * @author Hemma Prafullchandra
  * @author Sean Mullan
@@ -246,7 +246,7 @@ public class URIName implements GeneralNameInterface {
     /**
      * Return the scheme name portion of a URIName
      *
-     * @returns scheme portion of full name
+     * @return scheme portion of full name
      */
     public String getScheme() {
         return uri.getScheme();
@@ -255,7 +255,7 @@ public class URIName implements GeneralNameInterface {
     /**
      * Return the host name or IP address portion of the URIName
      *
-     * @returns host name or IP address portion of full name
+     * @return host name or IP address portion of full name
      */
     public String getHost() {
         return host;
@@ -266,7 +266,7 @@ public class URIName implements GeneralNameInterface {
      * DNSName, then this host object does not include any
      * initial "." on the name.
      *
-     * @returns host name as DNSName or IPAddressName
+     * @return host name as DNSName or IPAddressName
      */
     public Object getHostObject() {
         if (hostIP != null) {
@@ -308,9 +308,9 @@ public class URIName implements GeneralNameInterface {
      * abc.def.xyz.com.  However, the constraint ".xyz.com" is not satisfied
      * by "xyz.com".  When the constraint does not begin with a period, it
      * specifies a host.
-     * 
    
+     *
      * @param inputName to be checked for being constrained
-     * @returns constraint type above
+     * @return constraint type above
      * @throws UnsupportedOperationException if name is not exact match, but
      *  narrowing and widening are not supported for this name type.
      */
@@ -377,7 +377,7 @@ public class URIName implements GeneralNameInterface {
      * NameConstraints minimum and maximum bounds and for calculating
      * path lengths in name subtrees.
      *
-     * @returns distance of name from root
+     * @return distance of name from root
      * @throws UnsupportedOperationException if not supported for this name type
      */
     public int subtreeDepth() throws UnsupportedOperationException {
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/UniqueIdentity.java b/jdk/src/java.base/share/classes/sun/security/x509/UniqueIdentity.java
index dc50208a7c2..6060d342196 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/UniqueIdentity.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/UniqueIdentity.java
@@ -73,7 +73,6 @@ public class UniqueIdentity {
      * Create the object, decoding the values from the passed DER stream.
      *
      * @param derVal the DerValue decoded from the stream.
-     * @param tag the tag the value is encoded under.
      * @exception IOException on decoding errors.
      */
     public UniqueIdentity(DerValue derVal) throws IOException {
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/X400Address.java b/jdk/src/java.base/share/classes/sun/security/x509/X400Address.java
index bfa8f94557b..35839e87825 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/X400Address.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X400Address.java
@@ -340,7 +340,7 @@ public class X400Address implements GeneralNameInterface {
     /**
      * Create the X400Address object from the specified byte array
      *
-     * @param nameValue value of the name as a byte array
+     * @param value value of the name as a byte array
      */
     public X400Address(byte[] value) {
         nameValue = value;
@@ -392,7 +392,7 @@ public class X400Address implements GeneralNameInterface {
      * certification path verification.
      *
      * @param inputName to be checked for being constrained
-     * @returns constraint type above
+     * @return constraint type above
      * @throws UnsupportedOperationException if name is same type, but comparison operations are
      *          not supported for this name type.
      */
@@ -413,7 +413,7 @@ public class X400Address implements GeneralNameInterface {
      * NameConstraints minimum and maximum bounds and for calculating
      * path lengths in name subtrees.
      *
-     * @returns distance of name from root
+     * @return distance of name from root
      * @throws UnsupportedOperationException if not supported for this name type
      */
     public int subtreeDepth() throws UnsupportedOperationException {
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/X500Name.java b/jdk/src/java.base/share/classes/sun/security/x509/X500Name.java
index 2b35f7a63af..578f8026666 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/X500Name.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X500Name.java
@@ -84,14 +84,14 @@ import javax.security.auth.x500.X500Principal;
  * 
  • attribute values encoded in different types (e.g.,
  *    PrintableString and BMPString) may be assumed to represent
  *    different strings;
- * 
    
+ *
  * 
  • attribute values in types other than PrintableString are case
  *    sensitive (this permits matching of attribute values as binary
  *    objects);
- * 
    
+ *
  * 
  • attribute values in PrintableString are not case sensitive
  *    (e.g., "Marianne Swanson" is the same as "MARIANNE SWANSON"); and
- * 
    
+ *
  * 
  • attribute values in PrintableString are compared after
  *    removing leading and trailing white space and converting internal
  *    substrings of one or more consecutive white space characters to a
@@ -1242,12 +1242,13 @@ public class X500Name implements GeneralNameInterface, Principal {
      *   
  • NAME_NARROWS = 1: input name narrows this name
      *   
  • NAME_WIDENS = 2: input name widens this name
      *   
  • NAME_SAME_TYPE = 3: input name does not match or narrow this name,
-     &       but is same type
-     * .  These results are used in checking NameConstraints during
+     *       but is same type.
+     * 
+     * These results are used in checking NameConstraints during
      * certification path verification.
      *
      * @param inputName to be checked for being constrained
-     * @returns constraint type above
+     * @return constraint type above
      * @throws UnsupportedOperationException if name is not exact match, but
      *         narrowing and widening are not supported for this name type.
      */
@@ -1313,7 +1314,7 @@ public class X500Name implements GeneralNameInterface, Principal {
      * NameConstraints minimum and maximum bounds and for calculating
      * path lengths in name subtrees.
      *
-     * @returns distance of name from root
+     * @return distance of name from root
      * @throws UnsupportedOperationException if not supported for this name type
      */
     public int subtreeDepth() throws UnsupportedOperationException {
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java b/jdk/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java
index ab7270995fb..ccc7b893430 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java
@@ -125,7 +125,7 @@ public class X509CRLEntryImpl extends X509CRLEntry
     /**
      * Unmarshals a revoked certificate from its encoded form.
      *
-     * @param derVal the DER value containing the revoked certificate.
+     * @param derValue the DER value containing the revoked certificate.
      * @exception CRLException on parsing errors.
      */
     public X509CRLEntryImpl(DerValue derValue) throws CRLException {
@@ -271,7 +271,7 @@ public class X509CRLEntryImpl extends X509CRLEntry
     /**
      * get Reason Code from CRL entry.
      *
-     * @returns Integer or null, if no such extension
+     * @return Integer or null, if no such extension
      * @throws IOException on error
      */
     public Integer getReasonCode() throws IOException {
@@ -432,7 +432,7 @@ public class X509CRLEntryImpl extends X509CRLEntry
      * get an extension
      *
      * @param oid ObjectIdentifier of extension desired
-     * @returns Extension of type  or null, if not found
+     * @return Extension of type {@code } or null, if not found
      */
     public Extension getExtension(ObjectIdentifier oid) {
         if (extensions == null)
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java b/jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java
index ade169e53a8..3797105c770 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java
@@ -185,8 +185,8 @@ public class X509CRLImpl extends X509CRL implements DerEncoder {
      * Initial CRL constructor, no revoked certs, and no extensions.
      *
      * @param issuer the name of the CA issuing this CRL.
-     * @param thisUpdate the Date of this issue.
-     * @param nextUpdate the Date of the next CRL.
+     * @param thisDate the Date of this issue.
+     * @param nextDate the Date of the next CRL.
      */
     public X509CRLImpl(X500Name issuer, Date thisDate, Date nextDate) {
         this.issuer = issuer;
@@ -198,8 +198,8 @@ public class X509CRLImpl extends X509CRL implements DerEncoder {
      * CRL constructor, revoked certs, no extensions.
      *
      * @param issuer the name of the CA issuing this CRL.
-     * @param thisUpdate the Date of this issue.
-     * @param nextUpdate the Date of the next CRL.
+     * @param thisDate the Date of this issue.
+     * @param nextDate the Date of the next CRL.
      * @param badCerts the array of CRL entries.
      *
      * @exception CRLException on parsing/construction errors.
@@ -237,8 +237,8 @@ public class X509CRLImpl extends X509CRL implements DerEncoder {
      * CRL constructor, revoked certs and extensions.
      *
      * @param issuer the name of the CA issuing this CRL.
-     * @param thisUpdate the Date of this issue.
-     * @param nextUpdate the Date of the next CRL.
+     * @param thisDate the Date of this issue.
+     * @param nextDate the Date of the next CRL.
      * @param badCerts the array of CRL entries.
      * @param crlExts the CRL extensions.
      *
@@ -832,8 +832,8 @@ public class X509CRLImpl extends X509CRL implements DerEncoder {
     /**
      * return the AuthorityKeyIdentifier, if any.
      *
-     * @returns AuthorityKeyIdentifier or null
-     *          (if no AuthorityKeyIdentifierExtension)
+     * @return AuthorityKeyIdentifier or null
+     *         (if no AuthorityKeyIdentifierExtension)
      * @throws IOException on error
      */
     public KeyIdentifier getAuthKeyId() throws IOException {
@@ -850,7 +850,7 @@ public class X509CRLImpl extends X509CRL implements DerEncoder {
     /**
      * return the AuthorityKeyIdentifierExtension, if any.
      *
-     * @returns AuthorityKeyIdentifierExtension or null (if no such extension)
+     * @return AuthorityKeyIdentifierExtension or null (if no such extension)
      * @throws IOException on error
      */
     public AuthorityKeyIdentifierExtension getAuthKeyIdExtension()
@@ -862,7 +862,7 @@ public class X509CRLImpl extends X509CRL implements DerEncoder {
     /**
      * return the CRLNumberExtension, if any.
      *
-     * @returns CRLNumberExtension or null (if no such extension)
+     * @return CRLNumberExtension or null (if no such extension)
      * @throws IOException on error
      */
     public CRLNumberExtension getCRLNumberExtension() throws IOException {
@@ -873,7 +873,7 @@ public class X509CRLImpl extends X509CRL implements DerEncoder {
     /**
      * return the CRL number from the CRLNumberExtension, if any.
      *
-     * @returns number or null (if no such extension)
+     * @return number or null (if no such extension)
      * @throws IOException on error
      */
     public BigInteger getCRLNumber() throws IOException {
@@ -889,7 +889,7 @@ public class X509CRLImpl extends X509CRL implements DerEncoder {
     /**
      * return the DeltaCRLIndicatorExtension, if any.
      *
-     * @returns DeltaCRLIndicatorExtension or null (if no such extension)
+     * @return DeltaCRLIndicatorExtension or null (if no such extension)
      * @throws IOException on error
      */
     public DeltaCRLIndicatorExtension getDeltaCRLIndicatorExtension()
@@ -902,7 +902,7 @@ public class X509CRLImpl extends X509CRL implements DerEncoder {
     /**
      * return the base CRL number from the DeltaCRLIndicatorExtension, if any.
      *
-     * @returns number or null (if no such extension)
+     * @return number or null (if no such extension)
      * @throws IOException on error
      */
     public BigInteger getBaseCRLNumber() throws IOException {
@@ -918,7 +918,7 @@ public class X509CRLImpl extends X509CRL implements DerEncoder {
     /**
      * return the IssuerAlternativeNameExtension, if any.
      *
-     * @returns IssuerAlternativeNameExtension or null (if no such extension)
+     * @return IssuerAlternativeNameExtension or null (if no such extension)
      * @throws IOException on error
      */
     public IssuerAlternativeNameExtension getIssuerAltNameExtension()
@@ -930,8 +930,8 @@ public class X509CRLImpl extends X509CRL implements DerEncoder {
     /**
      * return the IssuingDistributionPointExtension, if any.
      *
-     * @returns IssuingDistributionPointExtension or null
-     *          (if no such extension)
+     * @return IssuingDistributionPointExtension or null
+     *         (if no such extension)
      * @throws IOException on error
      */
     public IssuingDistributionPointExtension
@@ -1043,7 +1043,7 @@ public class X509CRLImpl extends X509CRL implements DerEncoder {
      * get an extension
      *
      * @param oid ObjectIdentifier of extension desired
-     * @returns Object of type  or null, if not found
+     * @return Object of type {@code } or null, if not found
      * @throws IOException on error
      */
     public Object getExtension(ObjectIdentifier oid) {
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/X509CertImpl.java b/jdk/src/java.base/share/classes/sun/security/x509/X509CertImpl.java
index 201e10a6cfe..d1142a26336 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/X509CertImpl.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X509CertImpl.java
@@ -247,7 +247,7 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      * read input stream as HEX-encoded DER-encoded bytes
      *
      * @param in InputStream to read
-     * @returns DerValue corresponding to decoded HEX-encoded bytes
+     * @return DerValue corresponding to decoded HEX-encoded bytes
      * @throws IOException if stream can not be interpreted as RFC1421
      *                     encoded bytes
      */
@@ -289,8 +289,8 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      * Construct an initialized X509 Certificate. The certificate is stored
      * in raw form and has to be signed to be useful.
      *
-     * @params info the X509CertificateInfo which the Certificate is to be
-     *              created from.
+     * @param certInfo the X509CertificateInfo which the Certificate is to be
+     *             created from.
      */
     public X509CertImpl(X509CertInfo certInfo) {
         this.info = certInfo;
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/X509CertInfo.java b/jdk/src/java.base/share/classes/sun/security/x509/X509CertInfo.java
index fa64e9d0fc2..9411519eec8 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/X509CertInfo.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X509CertInfo.java
@@ -38,8 +38,9 @@ import sun.misc.HexDumpEncoder;
 /**
  * The X509CertInfo class represents X.509 certificate information.
  *
- * 
    X.509 certificates have several base data elements, including:
      
+ * 
      X.509 certificates have several base data elements, including:
  *
+ * 
        
  * 
      • The Subject Name, an X.500 Distinguished Name for
  *      the entity (subject) for which the certificate was issued.
  *
@@ -54,6 +55,7 @@ import sun.misc.HexDumpEncoder;
  *
  * 
      • A Serial Number assigned by the CA, for use in
  *      certificate revocation and other applications.
+ * 
      
  *
  * @author Amit Kapoor
  * @author Hemma Prafullchandra
@@ -356,8 +358,8 @@ public class X509CertInfo implements CertAttrSet {
     /**
      * Set the certificate attribute.
      *
-     * @params name the name of the Certificate attribute.
-     * @params val the value of the Certificate attribute.
+     * @param name the name of the Certificate attribute.
+     * @param val the value of the Certificate attribute.
      * @exception CertificateException on invalid attributes.
      * @exception IOException on other errors.
      */
@@ -446,7 +448,7 @@ public class X509CertInfo implements CertAttrSet {
     /**
      * Delete the certificate attribute.
      *
-     * @params name the name of the Certificate attribute.
+     * @param name the name of the Certificate attribute.
      * @exception CertificateException on invalid attributes.
      * @exception IOException on other errors.
      */
@@ -525,7 +527,7 @@ public class X509CertInfo implements CertAttrSet {
     /**
      * Get the certificate attribute.
      *
-     * @params name the name of the Certificate attribute.
+     * @param name the name of the Certificate attribute.
      *
      * @exception CertificateException on invalid attributes.
      * @exception IOException on other errors.
@@ -812,7 +814,7 @@ public class X509CertInfo implements CertAttrSet {
     /**
      * Set the version number of the certificate.
      *
-     * @params val the Object class value for the Extensions
+     * @param val the Object class value for the Extensions
      * @exception CertificateException on invalid data.
      */
     private void setVersion(Object val) throws CertificateException {
@@ -825,7 +827,7 @@ public class X509CertInfo implements CertAttrSet {
     /**
      * Set the serial number of the certificate.
      *
-     * @params val the Object class value for the CertificateSerialNumber
+     * @param val the Object class value for the CertificateSerialNumber
      * @exception CertificateException on invalid data.
      */
     private void setSerialNumber(Object val) throws CertificateException {
@@ -838,7 +840,7 @@ public class X509CertInfo implements CertAttrSet {
     /**
      * Set the algorithm id of the certificate.
      *
-     * @params val the Object class value for the AlgorithmId
+     * @param val the Object class value for the AlgorithmId
      * @exception CertificateException on invalid data.
      */
     private void setAlgorithmId(Object val) throws CertificateException {
@@ -852,7 +854,7 @@ public class X509CertInfo implements CertAttrSet {
     /**
      * Set the issuer name of the certificate.
      *
-     * @params val the Object class value for the issuer
+     * @param val the Object class value for the issuer
      * @exception CertificateException on invalid data.
      */
     private void setIssuer(Object val) throws CertificateException {
@@ -866,7 +868,7 @@ public class X509CertInfo implements CertAttrSet {
     /**
      * Set the validity interval of the certificate.
      *
-     * @params val the Object class value for the CertificateValidity
+     * @param val the Object class value for the CertificateValidity
      * @exception CertificateException on invalid data.
      */
     private void setValidity(Object val) throws CertificateException {
@@ -880,7 +882,7 @@ public class X509CertInfo implements CertAttrSet {
     /**
      * Set the subject name of the certificate.
      *
-     * @params val the Object class value for the Subject
+     * @param val the Object class value for the Subject
      * @exception CertificateException on invalid data.
      */
     private void setSubject(Object val) throws CertificateException {
@@ -894,7 +896,7 @@ public class X509CertInfo implements CertAttrSet {
     /**
      * Set the public key in the certificate.
      *
-     * @params val the Object class value for the PublicKey
+     * @param val the Object class value for the PublicKey
      * @exception CertificateException on invalid data.
      */
     private void setKey(Object val) throws CertificateException {
@@ -908,7 +910,7 @@ public class X509CertInfo implements CertAttrSet {
     /**
      * Set the Issuer Unique Identity in the certificate.
      *
-     * @params val the Object class value for the IssuerUniqueId
+     * @param val the Object class value for the IssuerUniqueId
      * @exception CertificateException
      */
     private void setIssuerUniqueId(Object val) throws CertificateException {
@@ -925,7 +927,7 @@ public class X509CertInfo implements CertAttrSet {
     /**
      * Set the Subject Unique Identity in the certificate.
      *
-     * @params val the Object class value for the SubjectUniqueId
+     * @param val the Object class value for the SubjectUniqueId
      * @exception CertificateException
      */
     private void setSubjectUniqueId(Object val) throws CertificateException {
@@ -942,7 +944,7 @@ public class X509CertInfo implements CertAttrSet {
     /**
      * Set the extensions in the certificate.
      *
-     * @params val the Object class value for the Extensions
+     * @param val the Object class value for the Extensions
      * @exception CertificateException
      */
     private void setExtensions(Object val) throws CertificateException {