--- a/jdk/src/java.base/share/classes/javax/crypto/Mac.java Tue Aug 25 18:40:32 2015 +0300
+++ b/jdk/src/java.base/share/classes/javax/crypto/Mac.java Tue Aug 25 18:45:09 2015 +0300
@@ -54,11 +54,11 @@
* specified in RFC 2104.
*
* <p> Every implementation of the Java platform is required to support
- * the following standard <code>Mac</code> algorithms:
+ * the following standard {@code Mac} algorithms:
* <ul>
- * <li><tt>HmacMD5</tt></li>
- * <li><tt>HmacSHA1</tt></li>
- * <li><tt>HmacSHA256</tt></li>
+ * <li>{@code HmacMD5}</li>
+ * <li>{@code HmacSHA1}</li>
+ * <li>{@code HmacSHA256}</li>
* </ul>
* These algorithms are described in the
* <a href="{@docRoot}/../technotes/guides/security/StandardNames.html#Mac">
@@ -127,20 +127,20 @@
}
/**
- * Returns the algorithm name of this <code>Mac</code> object.
+ * Returns the algorithm name of this {@code Mac} object.
*
* <p>This is the same name that was specified in one of the
- * <code>getInstance</code> calls that created this
- * <code>Mac</code> object.
+ * {@code getInstance} calls that created this
+ * {@code Mac} object.
*
- * @return the algorithm name of this <code>Mac</code> object.
+ * @return the algorithm name of this {@code Mac} object.
*/
public final String getAlgorithm() {
return this.algorithm;
}
/**
- * Returns a <code>Mac</code> object that implements the
+ * Returns a {@code Mac} object that implements the
* specified MAC algorithm.
*
* <p> This method traverses the list of registered security Providers,
@@ -158,7 +158,7 @@
* Java Cryptography Architecture Standard Algorithm Name Documentation</a>
* for information about standard algorithm names.
*
- * @return the new <code>Mac</code> object.
+ * @return the new {@code Mac} object.
*
* @exception NoSuchAlgorithmException if no Provider supports a
* MacSpi implementation for the
@@ -183,7 +183,7 @@
}
/**
- * Returns a <code>Mac</code> object that implements the
+ * Returns a {@code Mac} object that implements the
* specified MAC algorithm.
*
* <p> A new Mac object encapsulating the
@@ -202,7 +202,7 @@
*
* @param provider the name of the provider.
*
- * @return the new <code>Mac</code> object.
+ * @return the new {@code Mac} object.
*
* @exception NoSuchAlgorithmException if a MacSpi
* implementation for the specified algorithm is not
@@ -211,7 +211,7 @@
* @exception NoSuchProviderException if the specified provider is not
* registered in the security provider list.
*
- * @exception IllegalArgumentException if the <code>provider</code>
+ * @exception IllegalArgumentException if the {@code provider}
* is null or empty.
*
* @see java.security.Provider
@@ -224,7 +224,7 @@
}
/**
- * Returns a <code>Mac</code> object that implements the
+ * Returns a {@code Mac} object that implements the
* specified MAC algorithm.
*
* <p> A new Mac object encapsulating the
@@ -240,13 +240,13 @@
*
* @param provider the provider.
*
- * @return the new <code>Mac</code> object.
+ * @return the new {@code Mac} object.
*
* @exception NoSuchAlgorithmException if a MacSpi
* implementation for the specified algorithm is not available
* from the specified Provider object.
*
- * @exception IllegalArgumentException if the <code>provider</code>
+ * @exception IllegalArgumentException if the {@code provider}
* is null.
*
* @see java.security.Provider
@@ -380,9 +380,9 @@
}
/**
- * Returns the provider of this <code>Mac</code> object.
+ * Returns the provider of this {@code Mac} object.
*
- * @return the provider of this <code>Mac</code> object.
+ * @return the provider of this {@code Mac} object.
*/
public final Provider getProvider() {
chooseFirstProvider();
@@ -400,7 +400,7 @@
}
/**
- * Initializes this <code>Mac</code> object with the given key.
+ * Initializes this {@code Mac} object with the given key.
*
* @param key the key.
*
@@ -426,7 +426,7 @@
}
/**
- * Initializes this <code>Mac</code> object with the given key and
+ * Initializes this {@code Mac} object with the given key and
* algorithm parameters.
*
* @param key the key.
@@ -457,7 +457,7 @@
*
* @param input the input byte to be processed.
*
- * @exception IllegalStateException if this <code>Mac</code> has not been
+ * @exception IllegalStateException if this {@code Mac} has not been
* initialized.
*/
public final void update(byte input) throws IllegalStateException {
@@ -473,7 +473,7 @@
*
* @param input the array of bytes to be processed.
*
- * @exception IllegalStateException if this <code>Mac</code> has not been
+ * @exception IllegalStateException if this {@code Mac} has not been
* initialized.
*/
public final void update(byte[] input) throws IllegalStateException {
@@ -487,14 +487,14 @@
}
/**
- * Processes the first <code>len</code> bytes in <code>input</code>,
- * starting at <code>offset</code> inclusive.
+ * Processes the first {@code len} bytes in {@code input},
+ * starting at {@code offset} inclusive.
*
* @param input the input buffer.
- * @param offset the offset in <code>input</code> where the input starts.
+ * @param offset the offset in {@code input} where the input starts.
* @param len the number of bytes to process.
*
- * @exception IllegalStateException if this <code>Mac</code> has not been
+ * @exception IllegalStateException if this {@code Mac} has not been
* initialized.
*/
public final void update(byte[] input, int offset, int len)
@@ -512,14 +512,14 @@
}
/**
- * Processes <code>input.remaining()</code> bytes in the ByteBuffer
- * <code>input</code>, starting at <code>input.position()</code>.
+ * Processes {@code input.remaining()} bytes in the ByteBuffer
+ * {@code input}, starting at {@code input.position()}.
* Upon return, the buffer's position will be equal to its limit;
* its limit will not have changed.
*
* @param input the ByteBuffer
*
- * @exception IllegalStateException if this <code>Mac</code> has not been
+ * @exception IllegalStateException if this {@code Mac} has not been
* initialized.
* @since 1.5
*/
@@ -537,20 +537,20 @@
/**
* Finishes the MAC operation.
*
- * <p>A call to this method resets this <code>Mac</code> object to the
+ * <p>A call to this method resets this {@code Mac} object to the
* state it was in when previously initialized via a call to
- * <code>init(Key)</code> or
- * <code>init(Key, AlgorithmParameterSpec)</code>.
+ * {@code init(Key)} or
+ * {@code init(Key, AlgorithmParameterSpec)}.
* That is, the object is reset and available to generate another MAC from
- * the same key, if desired, via new calls to <code>update</code> and
- * <code>doFinal</code>.
- * (In order to reuse this <code>Mac</code> object with a different key,
- * it must be reinitialized via a call to <code>init(Key)</code> or
- * <code>init(Key, AlgorithmParameterSpec)</code>.
+ * the same key, if desired, via new calls to {@code update} and
+ * {@code doFinal}.
+ * (In order to reuse this {@code Mac} object with a different key,
+ * it must be reinitialized via a call to {@code init(Key)} or
+ * {@code init(Key, AlgorithmParameterSpec)}.
*
* @return the MAC result.
*
- * @exception IllegalStateException if this <code>Mac</code> has not been
+ * @exception IllegalStateException if this {@code Mac} has not been
* initialized.
*/
public final byte[] doFinal() throws IllegalStateException {
@@ -566,27 +566,27 @@
/**
* Finishes the MAC operation.
*
- * <p>A call to this method resets this <code>Mac</code> object to the
+ * <p>A call to this method resets this {@code Mac} object to the
* state it was in when previously initialized via a call to
- * <code>init(Key)</code> or
- * <code>init(Key, AlgorithmParameterSpec)</code>.
+ * {@code init(Key)} or
+ * {@code init(Key, AlgorithmParameterSpec)}.
* That is, the object is reset and available to generate another MAC from
- * the same key, if desired, via new calls to <code>update</code> and
- * <code>doFinal</code>.
- * (In order to reuse this <code>Mac</code> object with a different key,
- * it must be reinitialized via a call to <code>init(Key)</code> or
- * <code>init(Key, AlgorithmParameterSpec)</code>.
+ * the same key, if desired, via new calls to {@code update} and
+ * {@code doFinal}.
+ * (In order to reuse this {@code Mac} object with a different key,
+ * it must be reinitialized via a call to {@code init(Key)} or
+ * {@code init(Key, AlgorithmParameterSpec)}.
*
- * <p>The MAC result is stored in <code>output</code>, starting at
- * <code>outOffset</code> inclusive.
+ * <p>The MAC result is stored in {@code output}, starting at
+ * {@code outOffset} inclusive.
*
* @param output the buffer where the MAC result is stored
- * @param outOffset the offset in <code>output</code> where the MAC is
+ * @param outOffset the offset in {@code output} where the MAC is
* stored
*
* @exception ShortBufferException if the given output buffer is too small
* to hold the result
- * @exception IllegalStateException if this <code>Mac</code> has not been
+ * @exception IllegalStateException if this {@code Mac} has not been
* initialized.
*/
public final void doFinal(byte[] output, int outOffset)
@@ -609,21 +609,21 @@
/**
* Processes the given array of bytes and finishes the MAC operation.
*
- * <p>A call to this method resets this <code>Mac</code> object to the
+ * <p>A call to this method resets this {@code Mac} object to the
* state it was in when previously initialized via a call to
- * <code>init(Key)</code> or
- * <code>init(Key, AlgorithmParameterSpec)</code>.
+ * {@code init(Key)} or
+ * {@code init(Key, AlgorithmParameterSpec)}.
* That is, the object is reset and available to generate another MAC from
- * the same key, if desired, via new calls to <code>update</code> and
- * <code>doFinal</code>.
- * (In order to reuse this <code>Mac</code> object with a different key,
- * it must be reinitialized via a call to <code>init(Key)</code> or
- * <code>init(Key, AlgorithmParameterSpec)</code>.
+ * the same key, if desired, via new calls to {@code update} and
+ * {@code doFinal}.
+ * (In order to reuse this {@code Mac} object with a different key,
+ * it must be reinitialized via a call to {@code init(Key)} or
+ * {@code init(Key, AlgorithmParameterSpec)}.
*
* @param input data in bytes
* @return the MAC result.
*
- * @exception IllegalStateException if this <code>Mac</code> has not been
+ * @exception IllegalStateException if this {@code Mac} has not been
* initialized.
*/
public final byte[] doFinal(byte[] input) throws IllegalStateException
@@ -637,18 +637,18 @@
}
/**
- * Resets this <code>Mac</code> object.
+ * Resets this {@code Mac} object.
*
- * <p>A call to this method resets this <code>Mac</code> object to the
+ * <p>A call to this method resets this {@code Mac} object to the
* state it was in when previously initialized via a call to
- * <code>init(Key)</code> or
- * <code>init(Key, AlgorithmParameterSpec)</code>.
+ * {@code init(Key)} or
+ * {@code init(Key, AlgorithmParameterSpec)}.
* That is, the object is reset and available to generate another MAC from
- * the same key, if desired, via new calls to <code>update</code> and
- * <code>doFinal</code>.
- * (In order to reuse this <code>Mac</code> object with a different key,
- * it must be reinitialized via a call to <code>init(Key)</code> or
- * <code>init(Key, AlgorithmParameterSpec)</code>.
+ * the same key, if desired, via new calls to {@code update} and
+ * {@code doFinal}.
+ * (In order to reuse this {@code Mac} object with a different key,
+ * it must be reinitialized via a call to {@code init(Key)} or
+ * {@code init(Key, AlgorithmParameterSpec)}.
*/
public final void reset() {
chooseFirstProvider();
@@ -661,7 +661,7 @@
* @return a clone if the provider implementation is cloneable.
*
* @exception CloneNotSupportedException if this is called on a
- * delegate that does not support <code>Cloneable</code>.
+ * delegate that does not support {@code Cloneable}.
*/
public final Object clone() throws CloneNotSupportedException {
chooseFirstProvider();