--- old/src/java.base/share/classes/javax/crypto/Cipher.java 2015-08-18 14:21:02.065018918 +0400 +++ new/src/java.base/share/classes/javax/crypto/Cipher.java 2015-08-18 14:21:01.657018936 +0400 @@ -52,7 +52,7 @@ * Extension (JCE) framework. * *

In order to create a Cipher object, the application calls the - * Cipher's getInstance method, and passes the name of the + * Cipher's {@code getInstance} method, and passes the name of the * requested transformation to it. Optionally, the name of a provider * may be specified. * @@ -78,12 +78,12 @@ * Cipher c = Cipher.getInstance("DES/CBC/PKCS5Padding"); * * - * Using modes such as CFB and OFB, block + * Using modes such as {@code CFB} and {@code OFB}, block * ciphers can encrypt data in units smaller than the cipher's actual * block size. When requesting such a mode, you may optionally specify * the number of bits to be processed at a time by appending this number - * to the mode name as shown in the "DES/CFB8/NoPadding" and - * "DES/OFB32/PKCS5Padding" transformations. If no such + * to the mode name as shown in the "{@code DES/CFB8/NoPadding}" and + * "{@code DES/OFB32/PKCS5Padding}" transformations. If no such * number is specified, a provider-specific default is used. (For * example, the SunJCE provider uses a default of 64 bits for DES.) * Thus, block ciphers can be turned into byte-oriented stream ciphers by @@ -101,8 +101,8 @@ * AEAD modes such as GCM/CCM perform all AAD authenticity calculations * before starting the ciphertext authenticity calculations. To avoid * implementations having to internally buffer ciphertext, all AAD data - * must be supplied to GCM/CCM implementations (via the {@code - * updateAAD} methods) before the ciphertext is processed (via + * must be supplied to GCM/CCM implementations (via the {@code updateAAD} + * methods) before the ciphertext is processed (via * the {@code update} and {@code doFinal} methods). *

* Note that GCM mode has a uniqueness requirement on IVs used in @@ -130,24 +130,24 @@ * * * Every implementation of the Java platform is required to support - * the following standard Cipher transformations with the keysizes + * the following standard {@code Cipher} transformations with the keysizes * in parentheses: *

* These transformations are described in the * @@ -466,7 +466,7 @@ } /** - * Returns a Cipher object that implements the specified + * Returns a {@code Cipher} object that implements the specified * transformation. * *

This method traverses the list of registered security Providers, @@ -487,12 +487,12 @@ * * @return a cipher that implements the requested transformation. * - * @exception NoSuchAlgorithmException if transformation + * @exception NoSuchAlgorithmException if {@code transformation} * is null, empty, in an invalid format, * or if no Provider supports a CipherSpi implementation for the * specified algorithm. * - * @exception NoSuchPaddingException if transformation + * @exception NoSuchPaddingException if {@code transformation} * contains a padding scheme that is not available. * * @see java.security.Provider @@ -542,7 +542,7 @@ } /** - * Returns a Cipher object that implements the specified + * Returns a {@code Cipher} object that implements the specified * transformation. * *

A new Cipher object encapsulating the @@ -564,7 +564,7 @@ * * @return a cipher that implements the requested transformation. * - * @exception NoSuchAlgorithmException if transformation + * @exception NoSuchAlgorithmException if {@code transformation} * is null, empty, in an invalid format, * or if a CipherSpi implementation for the specified algorithm * is not available from the specified provider. @@ -572,10 +572,10 @@ * @exception NoSuchProviderException if the specified provider is not * registered in the security provider list. * - * @exception NoSuchPaddingException if transformation + * @exception NoSuchPaddingException if {@code transformation} * contains a padding scheme that is not available. * - * @exception IllegalArgumentException if the provider + * @exception IllegalArgumentException if the {@code provider} * is null or empty. * * @see java.security.Provider @@ -597,7 +597,7 @@ } /** - * Returns a Cipher object that implements the specified + * Returns a {@code Cipher} object that implements the specified * transformation. * *

A new Cipher object encapsulating the @@ -616,15 +616,15 @@ * * @return a cipher that implements the requested transformation. * - * @exception NoSuchAlgorithmException if transformation + * @exception NoSuchAlgorithmException if {@code transformation} * is null, empty, in an invalid format, * or if a CipherSpi implementation for the specified algorithm * is not available from the specified Provider object. * - * @exception NoSuchPaddingException if transformation + * @exception NoSuchPaddingException if {@code transformation} * contains a padding scheme that is not available. * - * @exception IllegalArgumentException if the provider + * @exception IllegalArgumentException if the {@code provider} * is null. * * @see java.security.Provider @@ -897,9 +897,9 @@ } /** - * Returns the provider of this Cipher object. + * Returns the provider of this {@code Cipher} object. * - * @return the provider of this Cipher object + * @return the provider of this {@code Cipher} object */ public final Provider getProvider() { chooseFirstProvider(); @@ -907,13 +907,13 @@ } /** - * Returns the algorithm name of this Cipher object. + * Returns the algorithm name of this {@code Cipher} object. * *

This is the same name that was specified in one of the - * getInstance calls that created this Cipher + * {@code getInstance} calls that created this {@code Cipher} * object.. * - * @return the algorithm name of this Cipher object. + * @return the algorithm name of this {@code Cipher} object. */ public final String getAlgorithm() { return this.transformation; @@ -932,15 +932,15 @@ /** * Returns the length in bytes that an output buffer would need to be in - * order to hold the result of the next update or - * doFinal operation, given the input length - * inputLen (in bytes). + * order to hold the result of the next {@code update} or + * {@code doFinal} operation, given the input length + * {@code inputLen} (in bytes). * *

This call takes into account any unprocessed (buffered) data from a - * previous update call, padding, and AEAD tagging. + * previous {@code update} call, padding, and AEAD tagging. * - *

The actual output length of the next update or - * doFinal call may be smaller than the length returned by + *

The actual output length of the next {@code update} or + * {@code doFinal} call may be smaller than the length returned by * this method. * * @param inputLen the input length (in bytes) @@ -1135,14 +1135,14 @@ * *

The cipher is initialized for one of the following four operations: * encryption, decryption, key wrapping or key unwrapping, depending - * on the value of opmode. + * on the value of {@code opmode}. * *

If this cipher requires any algorithm parameters that cannot be - * derived from the given key, the underlying cipher + * derived from the given {@code key}, the underlying cipher * implementation is supposed to generate the required parameters itself * (using provider-specific default or random values) if it is being * initialized for encryption or key wrapping, and raise an - * InvalidKeyException if it is being + * {@code InvalidKeyException} if it is being * initialized for decryption or key unwrapping. * The generated parameters can be retrieved using * {@link #getParameters() getParameters} or @@ -1168,8 +1168,8 @@ * * @param opmode the operation mode of this cipher (this is one of * the following: - * ENCRYPT_MODE, DECRYPT_MODE, - * WRAP_MODE or UNWRAP_MODE) + * {@code ENCRYPT_MODE}, {@code DECRYPT_MODE}, + * {@code WRAP_MODE} or {@code UNWRAP_MODE}) * @param key the key * * @exception InvalidKeyException if the given key is inappropriate for @@ -1191,14 +1191,14 @@ * *

The cipher is initialized for one of the following four operations: * encryption, decryption, key wrapping or key unwrapping, depending - * on the value of opmode. + * on the value of {@code opmode}. * *

If this cipher requires any algorithm parameters that cannot be - * derived from the given key, the underlying cipher + * derived from the given {@code key}, the underlying cipher * implementation is supposed to generate the required parameters itself * (using provider-specific default or random values) if it is being * initialized for encryption or key wrapping, and raise an - * InvalidKeyException if it is being + * {@code InvalidKeyException} if it is being * initialized for decryption or key unwrapping. * The generated parameters can be retrieved using * {@link #getParameters() getParameters} or @@ -1211,7 +1211,7 @@ * *

If this cipher (including its underlying feedback or padding scheme) * requires any random bytes (e.g., for parameter generation), it will get - * them from random. + * them from {@code random}. * *

Note that when a Cipher object is initialized, it loses all * previously-acquired state. In other words, initializing a Cipher is @@ -1220,8 +1220,8 @@ * * @param opmode the operation mode of this cipher (this is one of the * following: - * ENCRYPT_MODE, DECRYPT_MODE, - * WRAP_MODE or UNWRAP_MODE) + * {@code ENCRYPT_MODE}, {@code DECRYPT_MODE}, + * {@code WRAP_MODE} or {@code UNWRAP_MODE}) * @param key the encryption key * @param random the source of randomness * @@ -1269,14 +1269,14 @@ * *

The cipher is initialized for one of the following four operations: * encryption, decryption, key wrapping or key unwrapping, depending - * on the value of opmode. + * on the value of {@code opmode}. * *

If this cipher requires any algorithm parameters and - * params is null, the underlying cipher implementation is + * {@code params} is null, the underlying cipher implementation is * supposed to generate the required parameters itself (using * provider-specific default or random values) if it is being * initialized for encryption or key wrapping, and raise an - * InvalidAlgorithmParameterException if it is being + * {@code InvalidAlgorithmParameterException} if it is being * initialized for decryption or key unwrapping. * The generated parameters can be retrieved using * {@link #getParameters() getParameters} or @@ -1302,8 +1302,8 @@ * * @param opmode the operation mode of this cipher (this is one of the * following: - * ENCRYPT_MODE, DECRYPT_MODE, - * WRAP_MODE or UNWRAP_MODE) + * {@code ENCRYPT_MODE}, {@code DECRYPT_MODE}, + * {@code WRAP_MODE} or {@code UNWRAP_MODE}) * @param key the encryption key * @param params the algorithm parameters * @@ -1313,7 +1313,7 @@ * @exception InvalidAlgorithmParameterException if the given algorithm * parameters are inappropriate for this cipher, * or this cipher requires - * algorithm parameters and params is null, or the given + * algorithm parameters and {@code params} is null, or the given * algorithm parameters imply a cryptographic strength that would exceed * the legal limits (as determined from the configured jurisdiction * policy files). @@ -1333,14 +1333,14 @@ * *

The cipher is initialized for one of the following four operations: * encryption, decryption, key wrapping or key unwrapping, depending - * on the value of opmode. + * on the value of {@code opmode}. * *

If this cipher requires any algorithm parameters and - * params is null, the underlying cipher implementation is + * {@code params} is null, the underlying cipher implementation is * supposed to generate the required parameters itself (using * provider-specific default or random values) if it is being * initialized for encryption or key wrapping, and raise an - * InvalidAlgorithmParameterException if it is being + * {@code InvalidAlgorithmParameterException} if it is being * initialized for decryption or key unwrapping. * The generated parameters can be retrieved using * {@link #getParameters() getParameters} or @@ -1353,7 +1353,7 @@ * *

If this cipher (including its underlying feedback or padding scheme) * requires any random bytes (e.g., for parameter generation), it will get - * them from random. + * them from {@code random}. * *

Note that when a Cipher object is initialized, it loses all * previously-acquired state. In other words, initializing a Cipher is @@ -1362,8 +1362,8 @@ * * @param opmode the operation mode of this cipher (this is one of the * following: - * ENCRYPT_MODE, DECRYPT_MODE, - * WRAP_MODE or UNWRAP_MODE) + * {@code ENCRYPT_MODE}, {@code DECRYPT_MODE}, + * {@code WRAP_MODE} or {@code UNWRAP_MODE}) * @param key the encryption key * @param params the algorithm parameters * @param random the source of randomness @@ -1374,7 +1374,7 @@ * @exception InvalidAlgorithmParameterException if the given algorithm * parameters are inappropriate for this cipher, * or this cipher requires - * algorithm parameters and params is null, or the given + * algorithm parameters and {@code params} is null, or the given * algorithm parameters imply a cryptographic strength that would exceed * the legal limits (as determined from the configured jurisdiction * policy files). @@ -1412,14 +1412,14 @@ * *

The cipher is initialized for one of the following four operations: * encryption, decryption, key wrapping or key unwrapping, depending - * on the value of opmode. + * on the value of {@code opmode}. * *

If this cipher requires any algorithm parameters and - * params is null, the underlying cipher implementation is + * {@code params} is null, the underlying cipher implementation is * supposed to generate the required parameters itself (using * provider-specific default or random values) if it is being * initialized for encryption or key wrapping, and raise an - * InvalidAlgorithmParameterException if it is being + * {@code InvalidAlgorithmParameterException} if it is being * initialized for decryption or key unwrapping. * The generated parameters can be retrieved using * {@link #getParameters() getParameters} or @@ -1444,9 +1444,9 @@ * it. * * @param opmode the operation mode of this cipher (this is one of the - * following: ENCRYPT_MODE, - * DECRYPT_MODE, WRAP_MODE - * or UNWRAP_MODE) + * following: {@code ENCRYPT_MODE}, + * {@code DECRYPT_MODE}, {@code WRAP_MODE} + * or {@code UNWRAP_MODE}) * @param key the encryption key * @param params the algorithm parameters * @@ -1456,7 +1456,7 @@ * @exception InvalidAlgorithmParameterException if the given algorithm * parameters are inappropriate for this cipher, * or this cipher requires - * algorithm parameters and params is null, or the given + * algorithm parameters and {@code params} is null, or the given * algorithm parameters imply a cryptographic strength that would exceed * the legal limits (as determined from the configured jurisdiction * policy files). @@ -1476,14 +1476,14 @@ * *

The cipher is initialized for one of the following four operations: * encryption, decryption, key wrapping or key unwrapping, depending - * on the value of opmode. + * on the value of {@code opmode}. * *

If this cipher requires any algorithm parameters and - * params is null, the underlying cipher implementation is + * {@code params} is null, the underlying cipher implementation is * supposed to generate the required parameters itself (using * provider-specific default or random values) if it is being * initialized for encryption or key wrapping, and raise an - * InvalidAlgorithmParameterException if it is being + * {@code InvalidAlgorithmParameterException} if it is being * initialized for decryption or key unwrapping. * The generated parameters can be retrieved using * {@link #getParameters() getParameters} or @@ -1496,7 +1496,7 @@ * *

If this cipher (including its underlying feedback or padding scheme) * requires any random bytes (e.g., for parameter generation), it will get - * them from random. + * them from {@code random}. * *

Note that when a Cipher object is initialized, it loses all * previously-acquired state. In other words, initializing a Cipher is @@ -1504,9 +1504,9 @@ * it. * * @param opmode the operation mode of this cipher (this is one of the - * following: ENCRYPT_MODE, - * DECRYPT_MODE, WRAP_MODE - * or UNWRAP_MODE) + * following: {@code ENCRYPT_MODE}, + * {@code DECRYPT_MODE}, {@code WRAP_MODE} + * or {@code UNWRAP_MODE}) * @param key the encryption key * @param params the algorithm parameters * @param random the source of randomness @@ -1517,7 +1517,7 @@ * @exception InvalidAlgorithmParameterException if the given algorithm * parameters are inappropriate for this cipher, * or this cipher requires - * algorithm parameters and params is null, or the given + * algorithm parameters and {@code params} is null, or the given * algorithm parameters imply a cryptographic strength that would exceed * the legal limits (as determined from the configured jurisdiction * policy files). @@ -1553,15 +1553,15 @@ * Initializes this cipher with the public key from the given certificate. *

The cipher is initialized for one of the following four operations: * encryption, decryption, key wrapping or key unwrapping, depending - * on the value of opmode. + * on the value of {@code opmode}. * *

If the certificate is of type X.509 and has a key usage * extension field marked as critical, and the value of the key usage * extension field implies that the public key in * the certificate and its corresponding private key are not * supposed to be used for the operation represented by the value - * of opmode, - * an InvalidKeyException + * of {@code opmode}, + * an {@code InvalidKeyException} * is thrown. * *

If this cipher requires any algorithm parameters that cannot be @@ -1569,8 +1569,8 @@ * cipher * implementation is supposed to generate the required parameters itself * (using provider-specific default or random values) if it is being - * initialized for encryption or key wrapping, and raise an - * InvalidKeyException if it is being initialized for decryption or + * initialized for encryption or key wrapping, and raise an + * {@code InvalidKeyException} if it is being initialized for decryption or * key unwrapping. * The generated parameters can be retrieved using * {@link #getParameters() getParameters} or @@ -1584,7 +1584,7 @@ *

If this cipher (including its underlying feedback or padding scheme) * requires any random bytes (e.g., for parameter generation), it will get * them using the - * SecureRandom + * {@code SecureRandom} * implementation of the highest-priority * installed provider as the source of randomness. * (If none of the installed providers supply an implementation of @@ -1597,8 +1597,8 @@ * * @param opmode the operation mode of this cipher (this is one of the * following: - * ENCRYPT_MODE, DECRYPT_MODE, - * WRAP_MODE or UNWRAP_MODE) + * {@code ENCRYPT_MODE}, {@code DECRYPT_MODE}, + * {@code WRAP_MODE} or {@code UNWRAP_MODE}) * @param certificate the certificate * * @exception InvalidKeyException if the public key in the given @@ -1626,24 +1626,24 @@ *

The cipher is initialized for one of the following four operations: * encryption, decryption, key wrapping * or key unwrapping, depending on - * the value of opmode. + * the value of {@code opmode}. * *

If the certificate is of type X.509 and has a key usage * extension field marked as critical, and the value of the key usage * extension field implies that the public key in * the certificate and its corresponding private key are not * supposed to be used for the operation represented by the value of - * opmode, - * an InvalidKeyException + * {@code opmode}, + * an {@code InvalidKeyException} * is thrown. * *

If this cipher requires any algorithm parameters that cannot be - * derived from the public key in the given certificate, + * derived from the public key in the given {@code certificate}, * the underlying cipher * implementation is supposed to generate the required parameters itself * (using provider-specific default or random values) if it is being * initialized for encryption or key wrapping, and raise an - * InvalidKeyException if it is being + * {@code InvalidKeyException} if it is being * initialized for decryption or key unwrapping. * The generated parameters can be retrieved using * {@link #getParameters() getParameters} or @@ -1656,7 +1656,7 @@ * *

If this cipher (including its underlying feedback or padding scheme) * requires any random bytes (e.g., for parameter generation), it will get - * them from random. + * them from {@code random}. * *

Note that when a Cipher object is initialized, it loses all * previously-acquired state. In other words, initializing a Cipher is @@ -1665,8 +1665,8 @@ * * @param opmode the operation mode of this cipher (this is one of the * following: - * ENCRYPT_MODE, DECRYPT_MODE, - * WRAP_MODE or UNWRAP_MODE) + * {@code ENCRYPT_MODE}, {@code DECRYPT_MODE}, + * {@code WRAP_MODE} or {@code UNWRAP_MODE}) * @param certificate the certificate * @param random the source of randomness * @@ -1762,11 +1762,11 @@ * (depending on how this cipher was initialized), processing another data * part. * - *

The bytes in the input buffer are processed, and the + *

The bytes in the {@code input} buffer are processed, and the * result is stored in a new buffer. * - *

If input has a length of zero, this method returns - * null. + *

If {@code input} has a length of zero, this method returns + * {@code null}. * * @param input the input buffer * @@ -1797,15 +1797,15 @@ * (depending on how this cipher was initialized), processing another data * part. * - *

The first inputLen bytes in the input - * buffer, starting at inputOffset inclusive, are processed, + *

The first {@code inputLen} bytes in the {@code input} + * buffer, starting at {@code inputOffset} inclusive, are processed, * and the result is stored in a new buffer. * - *

If inputLen is zero, this method returns - * null. + *

If {@code inputLen} is zero, this method returns + * {@code null}. * * @param input the input buffer - * @param inputOffset the offset in input where the input + * @param inputOffset the offset in {@code input} where the input * starts * @param inputLen the input length * @@ -1837,31 +1837,31 @@ * (depending on how this cipher was initialized), processing another data * part. * - *

The first inputLen bytes in the input - * buffer, starting at inputOffset inclusive, are processed, - * and the result is stored in the output buffer. + *

The first {@code inputLen} bytes in the {@code input} + * buffer, starting at {@code inputOffset} inclusive, are processed, + * and the result is stored in the {@code output} buffer. * - *

If the output buffer is too small to hold the result, - * a ShortBufferException is thrown. In this case, repeat this + *

If the {@code output} buffer is too small to hold the result, + * a {@code ShortBufferException} is thrown. In this case, repeat this * call with a larger output buffer. Use * {@link #getOutputSize(int) getOutputSize} to determine how big * the output buffer should be. * - *

If inputLen is zero, this method returns + *

If {@code inputLen} is zero, this method returns * a length of zero. * *

Note: this method should be copy-safe, which means the - * input and output buffers can reference + * {@code input} and {@code output} buffers can reference * the same byte array and no unprocessed input data is overwritten * when the result is copied into the output buffer. * * @param input the input buffer - * @param inputOffset the offset in input where the input + * @param inputOffset the offset in {@code input} where the input * starts * @param inputLen the input length * @param output the buffer for the result * - * @return the number of bytes stored in output + * @return the number of bytes stored in {@code output} * * @exception IllegalStateException if this cipher is in a wrong state * (e.g., has not been initialized) @@ -1892,34 +1892,34 @@ * (depending on how this cipher was initialized), processing another data * part. * - *

The first inputLen bytes in the input - * buffer, starting at inputOffset inclusive, are processed, - * and the result is stored in the output buffer, starting at - * outputOffset inclusive. + *

The first {@code inputLen} bytes in the {@code input} + * buffer, starting at {@code inputOffset} inclusive, are processed, + * and the result is stored in the {@code output} buffer, starting at + * {@code outputOffset} inclusive. * - *

If the output buffer is too small to hold the result, - * a ShortBufferException is thrown. In this case, repeat this + *

If the {@code output} buffer is too small to hold the result, + * a {@code ShortBufferException} is thrown. In this case, repeat this * call with a larger output buffer. Use * {@link #getOutputSize(int) getOutputSize} to determine how big * the output buffer should be. * - *

If inputLen is zero, this method returns + *

If {@code inputLen} is zero, this method returns * a length of zero. * *

Note: this method should be copy-safe, which means the - * input and output buffers can reference + * {@code input} and {@code output} buffers can reference * the same byte array and no unprocessed input data is overwritten * when the result is copied into the output buffer. * * @param input the input buffer - * @param inputOffset the offset in input where the input + * @param inputOffset the offset in {@code input} where the input * starts * @param inputLen the input length * @param output the buffer for the result - * @param outputOffset the offset in output where the result + * @param outputOffset the offset in {@code output} where the result * is stored * - * @return the number of bytes stored in output + * @return the number of bytes stored in {@code output} * * @exception IllegalStateException if this cipher is in a wrong state * (e.g., has not been initialized) @@ -1951,29 +1951,29 @@ * (depending on how this cipher was initialized), processing another data * part. * - *

All input.remaining() bytes starting at - * input.position() are processed. The result is stored + *

All {@code input.remaining()} bytes starting at + * {@code input.position()} are processed. The result is stored * in the output buffer. * Upon return, the input buffer's position will be equal * to its limit; its limit will not have changed. The output buffer's * position will have advanced by n, where n is the value returned * by this method; the output buffer's limit will not have changed. * - *

If output.remaining() bytes are insufficient to - * hold the result, a ShortBufferException is thrown. + *

If {@code output.remaining()} bytes are insufficient to + * hold the result, a {@code ShortBufferException} is thrown. * In this case, repeat this call with a larger output buffer. Use * {@link #getOutputSize(int) getOutputSize} to determine how big * the output buffer should be. * *

Note: this method should be copy-safe, which means the - * input and output buffers can reference + * {@code input} and {@code output} buffers can reference * the same block of memory and no unprocessed input data is overwritten * when the result is copied into the output buffer. * * @param input the input ByteBuffer * @param output the output ByteByffer * - * @return the number of bytes stored in output + * @return the number of bytes stored in {@code output} * * @exception IllegalStateException if this cipher is in a wrong state * (e.g., has not been initialized) @@ -2008,7 +2008,7 @@ * on how this cipher was initialized. * *

Input data that may have been buffered during a previous - * update operation is processed, with padding (if requested) + * {@code update} operation is processed, with padding (if requested) * being applied. * If an AEAD mode such as GCM/CCM is being used, the authentication * tag is appended in the case of encryption, or verified in the @@ -2016,10 +2016,10 @@ * The result is stored in a new buffer. * *

Upon finishing, this method resets this cipher object to the state - * it was in when previously initialized via a call to init. + * it was in when previously initialized via a call to {@code init}. * That is, the object is reset and available to encrypt or decrypt * (depending on the operation mode that was specified in the call to - * init) more data. + * {@code init}) more data. * *

Note: if any exception is thrown, this cipher object may need to * be reset before it can be used again. @@ -2053,34 +2053,34 @@ * on how this cipher was initialized. * *

Input data that may have been buffered during a previous - * update operation is processed, with padding (if requested) + * {@code update} operation is processed, with padding (if requested) * being applied. * If an AEAD mode such as GCM/CCM is being used, the authentication * tag is appended in the case of encryption, or verified in the * case of decryption. - * The result is stored in the output buffer, starting at - * outputOffset inclusive. + * The result is stored in the {@code output} buffer, starting at + * {@code outputOffset} inclusive. * - *

If the output buffer is too small to hold the result, - * a ShortBufferException is thrown. In this case, repeat this + *

If the {@code output} buffer is too small to hold the result, + * a {@code ShortBufferException} is thrown. In this case, repeat this * call with a larger output buffer. Use * {@link #getOutputSize(int) getOutputSize} to determine how big * the output buffer should be. * *

Upon finishing, this method resets this cipher object to the state - * it was in when previously initialized via a call to init. + * it was in when previously initialized via a call to {@code init}. * That is, the object is reset and available to encrypt or decrypt * (depending on the operation mode that was specified in the call to - * init) more data. + * {@code init}) more data. * *

Note: if any exception is thrown, this cipher object may need to * be reset before it can be used again. * * @param output the buffer for the result - * @param outputOffset the offset in output where the result + * @param outputOffset the offset in {@code output} where the result * is stored * - * @return the number of bytes stored in output + * @return the number of bytes stored in {@code output} * * @exception IllegalStateException if this cipher is in a wrong state * (e.g., has not been initialized) @@ -2117,8 +2117,8 @@ * multiple-part operation. The data is encrypted or decrypted, * depending on how this cipher was initialized. * - *

The bytes in the input buffer, and any input bytes that - * may have been buffered during a previous update operation, + *

The bytes in the {@code input} buffer, and any input bytes that + * may have been buffered during a previous {@code update} operation, * are processed, with padding (if requested) being applied. * If an AEAD mode such as GCM/CCM is being used, the authentication * tag is appended in the case of encryption, or verified in the @@ -2126,10 +2126,10 @@ * The result is stored in a new buffer. * *

Upon finishing, this method resets this cipher object to the state - * it was in when previously initialized via a call to init. + * it was in when previously initialized via a call to {@code init}. * That is, the object is reset and available to encrypt or decrypt * (depending on the operation mode that was specified in the call to - * init) more data. + * {@code init}) more data. * *

Note: if any exception is thrown, this cipher object may need to * be reset before it can be used again. @@ -2170,9 +2170,9 @@ * multiple-part operation. The data is encrypted or decrypted, * depending on how this cipher was initialized. * - *

The first inputLen bytes in the input - * buffer, starting at inputOffset inclusive, and any input - * bytes that may have been buffered during a previous update + *

The first {@code inputLen} bytes in the {@code input} + * buffer, starting at {@code inputOffset} inclusive, and any input + * bytes that may have been buffered during a previous {@code update} * operation, are processed, with padding (if requested) being applied. * If an AEAD mode such as GCM/CCM is being used, the authentication * tag is appended in the case of encryption, or verified in the @@ -2180,16 +2180,16 @@ * The result is stored in a new buffer. * *

Upon finishing, this method resets this cipher object to the state - * it was in when previously initialized via a call to init. + * it was in when previously initialized via a call to {@code init}. * That is, the object is reset and available to encrypt or decrypt * (depending on the operation mode that was specified in the call to - * init) more data. + * {@code init}) more data. * *

Note: if any exception is thrown, this cipher object may need to * be reset before it can be used again. * * @param input the input buffer - * @param inputOffset the offset in input where the input + * @param inputOffset the offset in {@code input} where the input * starts * @param inputLen the input length * @@ -2228,42 +2228,42 @@ * multiple-part operation. The data is encrypted or decrypted, * depending on how this cipher was initialized. * - *

The first inputLen bytes in the input - * buffer, starting at inputOffset inclusive, and any input - * bytes that may have been buffered during a previous update + *

The first {@code inputLen} bytes in the {@code input} + * buffer, starting at {@code inputOffset} inclusive, and any input + * bytes that may have been buffered during a previous {@code update} * operation, are processed, with padding (if requested) being applied. * If an AEAD mode such as GCM/CCM is being used, the authentication * tag is appended in the case of encryption, or verified in the * case of decryption. - * The result is stored in the output buffer. + * The result is stored in the {@code output} buffer. * - *

If the output buffer is too small to hold the result, - * a ShortBufferException is thrown. In this case, repeat this + *

If the {@code output} buffer is too small to hold the result, + * a {@code ShortBufferException} is thrown. In this case, repeat this * call with a larger output buffer. Use * {@link #getOutputSize(int) getOutputSize} to determine how big * the output buffer should be. * *

Upon finishing, this method resets this cipher object to the state - * it was in when previously initialized via a call to init. + * it was in when previously initialized via a call to {@code init}. * That is, the object is reset and available to encrypt or decrypt * (depending on the operation mode that was specified in the call to - * init) more data. + * {@code init}) more data. * *

Note: if any exception is thrown, this cipher object may need to * be reset before it can be used again. * *

Note: this method should be copy-safe, which means the - * input and output buffers can reference + * {@code input} and {@code output} buffers can reference * the same byte array and no unprocessed input data is overwritten * when the result is copied into the output buffer. * * @param input the input buffer - * @param inputOffset the offset in input where the input + * @param inputOffset the offset in {@code input} where the input * starts * @param inputLen the input length * @param output the buffer for the result * - * @return the number of bytes stored in output + * @return the number of bytes stored in {@code output} * * @exception IllegalStateException if this cipher is in a wrong state * (e.g., has not been initialized) @@ -2303,46 +2303,46 @@ * multiple-part operation. The data is encrypted or decrypted, * depending on how this cipher was initialized. * - *

The first inputLen bytes in the input - * buffer, starting at inputOffset inclusive, and any input + *

The first {@code inputLen} bytes in the {@code input} + * buffer, starting at {@code inputOffset} inclusive, and any input * bytes that may have been buffered during a previous - * update operation, are processed, with padding + * {@code update} operation, are processed, with padding * (if requested) being applied. * If an AEAD mode such as GCM/CCM is being used, the authentication * tag is appended in the case of encryption, or verified in the * case of decryption. - * The result is stored in the output buffer, starting at - * outputOffset inclusive. + * The result is stored in the {@code output} buffer, starting at + * {@code outputOffset} inclusive. * - *

If the output buffer is too small to hold the result, - * a ShortBufferException is thrown. In this case, repeat this + *

If the {@code output} buffer is too small to hold the result, + * a {@code ShortBufferException} is thrown. In this case, repeat this * call with a larger output buffer. Use * {@link #getOutputSize(int) getOutputSize} to determine how big * the output buffer should be. * *

Upon finishing, this method resets this cipher object to the state - * it was in when previously initialized via a call to init. + * it was in when previously initialized via a call to {@code init}. * That is, the object is reset and available to encrypt or decrypt * (depending on the operation mode that was specified in the call to - * init) more data. + * {@code init}) more data. * *

Note: if any exception is thrown, this cipher object may need to * be reset before it can be used again. * *

Note: this method should be copy-safe, which means the - * input and output buffers can reference + * {@code input} and {@code output} buffers can reference * the same byte array and no unprocessed input data is overwritten * when the result is copied into the output buffer. * * @param input the input buffer - * @param inputOffset the offset in input where the input + * @param inputOffset the offset in {@code input} where the input * starts * @param inputLen the input length * @param output the buffer for the result - * @param outputOffset the offset in output where the result + * @param outputOffset the offset in {@code output} where the result * is stored * - * @return the number of bytes stored in output + * @return the number of bytes stored in {@code output} * * @exception IllegalStateException if this cipher is in a wrong state * (e.g., has not been initialized) @@ -2383,8 +2383,8 @@ * multiple-part operation. The data is encrypted or decrypted, * depending on how this cipher was initialized. * - *

All input.remaining() bytes starting at - * input.position() are processed. + *

All {@code input.remaining()} bytes starting at + * {@code input.position()} are processed. * If an AEAD mode such as GCM/CCM is being used, the authentication * tag is appended in the case of encryption, or verified in the * case of decryption. @@ -2394,30 +2394,30 @@ * position will have advanced by n, where n is the value returned * by this method; the output buffer's limit will not have changed. * - *

If output.remaining() bytes are insufficient to - * hold the result, a ShortBufferException is thrown. + *

If {@code output.remaining()} bytes are insufficient to + * hold the result, a {@code ShortBufferException} is thrown. * In this case, repeat this call with a larger output buffer. Use * {@link #getOutputSize(int) getOutputSize} to determine how big * the output buffer should be. * *

Upon finishing, this method resets this cipher object to the state - * it was in when previously initialized via a call to init. + * it was in when previously initialized via a call to {@code init}. * That is, the object is reset and available to encrypt or decrypt * (depending on the operation mode that was specified in the call to - * init) more data. + * {@code init}) more data. * *

Note: if any exception is thrown, this cipher object may need to * be reset before it can be used again. * *

Note: this method should be copy-safe, which means the - * input and output buffers can reference + * {@code input} and {@code output} buffers can reference * the same byte array and no unprocessed input data is overwritten * when the result is copied into the output buffer. * * @param input the input ByteBuffer * @param output the output ByteBuffer * - * @return the number of bytes stored in output + * @return the number of bytes stored in {@code output} * * @exception IllegalStateException if this cipher is in a wrong state * (e.g., has not been initialized) @@ -2507,8 +2507,8 @@ * key. * * @param wrappedKeyType the type of the wrapped key. This must be one of - * SECRET_KEY, PRIVATE_KEY, or - * PUBLIC_KEY. + * {@code SECRET_KEY}, {@code PRIVATE_KEY}, or + * {@code PUBLIC_KEY}. * * @return the unwrapped key. * @@ -2516,12 +2516,12 @@ * (e.g., has not been initialized). * * @exception NoSuchAlgorithmException if no installed providers - * can create keys of type wrappedKeyType for the - * wrappedKeyAlgorithm. + * can create keys of type {@code wrappedKeyType} for the + * {@code wrappedKeyAlgorithm}. * - * @exception InvalidKeyException if wrappedKey does not - * represent a wrapped key of type wrappedKeyType for - * the wrappedKeyAlgorithm. + * @exception InvalidKeyException if {@code wrappedKey} does not + * represent a wrapped key of type {@code wrappedKeyType} for + * the {@code wrappedKeyAlgorithm}. * * @throws UnsupportedOperationException if the corresponding method in the * {@code CipherSpi} is not supported. @@ -2600,8 +2600,8 @@ * * @param transformation the cipher transformation. * @return the maximum key length in bits or Integer.MAX_VALUE. - * @exception NullPointerException if transformation is null. - * @exception NoSuchAlgorithmException if transformation + * @exception NullPointerException if {@code transformation} is null. + * @exception NoSuchAlgorithmException if {@code transformation} * is not a valid transformation, i.e. in the form of "algorithm" or * "algorithm/mode/padding". * @since 1.5 @@ -2623,9 +2623,9 @@ * @param transformation the cipher transformation. * @return an AlgorithmParameterSpec which holds the maximum * value or null. - * @exception NullPointerException if transformation + * @exception NullPointerException if {@code transformation} * is null. - * @exception NoSuchAlgorithmException if transformation + * @exception NoSuchAlgorithmException if {@code transformation} * is not a valid transformation, i.e. in the form of "algorithm" or * "algorithm/mode/padding". * @since 1.5 @@ -2643,8 +2643,8 @@ * Calls to this method provide AAD to the cipher when operating in * modes such as AEAD (GCM/CCM). If this cipher is operating in * either GCM or CCM mode, all AAD must be supplied before beginning - * operations on the ciphertext (via the {@code update} and {@code - * doFinal} methods). + * operations on the ciphertext (via the {@code update} and + * {@code doFinal} methods). * * @param src the buffer containing the Additional Authentication Data * @@ -2676,8 +2676,8 @@ * Calls to this method provide AAD to the cipher when operating in * modes such as AEAD (GCM/CCM). If this cipher is operating in * either GCM or CCM mode, all AAD must be supplied before beginning - * operations on the ciphertext (via the {@code update} and {@code - * doFinal} methods). + * operations on the ciphertext (via the {@code update} + * and {@code doFinal} methods). * * @param src the buffer containing the AAD * @param offset the offset in {@code src} where the AAD input starts @@ -2722,8 +2722,8 @@ * Calls to this method provide AAD to the cipher when operating in * modes such as AEAD (GCM/CCM). If this cipher is operating in * either GCM or CCM mode, all AAD must be supplied before beginning - * operations on the ciphertext (via the {@code update} and {@code - * doFinal} methods). + * operations on the ciphertext (via the {@code update} + * and {@code doFinal} methods). *

* All {@code src.remaining()} bytes starting at * {@code src.position()} are processed. --- old/src/java.base/share/classes/javax/crypto/KeyAgreement.java 2015-08-18 14:21:02.721018888 +0400 +++ new/src/java.base/share/classes/javax/crypto/KeyAgreement.java 2015-08-18 14:21:02.513018898 +0400 @@ -40,24 +40,24 @@ * exchange) protocol. *

* The keys involved in establishing a shared secret are created by one of the - * key generators (KeyPairGenerator or - * KeyGenerator), a KeyFactory, or as a result from + * key generators ({@code KeyPairGenerator} or + * {@code KeyGenerator}), a {@code KeyFactory}, or as a result from * an intermediate phase of the key agreement protocol. * - *

For each of the correspondents in the key exchange, doPhase + *

For each of the correspondents in the key exchange, {@code doPhase} * needs to be called. For example, if this key exchange is with one other - * party, doPhase needs to be called once, with the - * lastPhase flag set to true. + * party, {@code doPhase} needs to be called once, with the + * {@code lastPhase} flag set to {@code true}. * If this key exchange is - * with two other parties, doPhase needs to be called twice, - * the first time setting the lastPhase flag to - * false, and the second time setting it to true. + * with two other parties, {@code doPhase} needs to be called twice, + * the first time setting the {@code lastPhase} flag to + * {@code false}, and the second time setting it to {@code true}. * There may be any number of parties involved in a key exchange. * *

Every implementation of the Java platform is required to support the - * following standard KeyAgreement algorithm: + * following standard {@code KeyAgreement} algorithm: *

* This algorithm is described in the @@ -125,20 +125,20 @@ } /** - * Returns the algorithm name of this KeyAgreement object. + * Returns the algorithm name of this {@code KeyAgreement} object. * *

This is the same name that was specified in one of the - * getInstance calls that created this - * KeyAgreement object. + * {@code getInstance} calls that created this + * {@code KeyAgreement} object. * - * @return the algorithm name of this KeyAgreement object. + * @return the algorithm name of this {@code KeyAgreement} object. */ public final String getAlgorithm() { return this.algorithm; } /** - * Returns a KeyAgreement object that implements the + * Returns a {@code KeyAgreement} object that implements the * specified key agreement algorithm. * *

This method traverses the list of registered security Providers, @@ -157,7 +157,7 @@ * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * - * @return the new KeyAgreement object. + * @return the new {@code KeyAgreement} object. * * @exception NullPointerException if the specified algorithm * is null. @@ -186,7 +186,7 @@ } /** - * Returns a KeyAgreement object that implements the + * Returns a {@code KeyAgreement} object that implements the * specified key agreement algorithm. * *

A new KeyAgreement object encapsulating the @@ -206,7 +206,7 @@ * * @param provider the name of the provider. * - * @return the new KeyAgreement object. + * @return the new {@code KeyAgreement} object. * * @exception NullPointerException if the specified algorithm * is null. @@ -218,7 +218,7 @@ * @exception NoSuchProviderException if the specified provider is not * registered in the security provider list. * - * @exception IllegalArgumentException if the provider + * @exception IllegalArgumentException if the {@code provider} * is null or empty. * * @see java.security.Provider @@ -233,7 +233,7 @@ } /** - * Returns a KeyAgreement object that implements the + * Returns a {@code KeyAgreement} object that implements the * specified key agreement algorithm. * *

A new KeyAgreement object encapsulating the @@ -250,7 +250,7 @@ * * @param provider the provider. * - * @return the new KeyAgreement object. + * @return the new {@code KeyAgreement} object. * * @exception NullPointerException if the specified algorithm * is null. @@ -259,7 +259,7 @@ * implementation for the specified algorithm is not available * from the specified Provider object. * - * @exception IllegalArgumentException if the provider + * @exception IllegalArgumentException if the {@code provider} * is null. * * @see java.security.Provider @@ -408,9 +408,9 @@ } /** - * Returns the provider of this KeyAgreement object. + * Returns the provider of this {@code KeyAgreement} object. * - * @return the provider of this KeyAgreement object + * @return the provider of this {@code KeyAgreement} object */ public final Provider getProvider() { chooseFirstProvider(); @@ -447,10 +447,10 @@ * parameters required for this key agreement. * *

If the key agreement algorithm requires random bytes, it gets them - * from the given source of randomness, random. + * from the given source of randomness, {@code random}. * However, if the underlying * algorithm implementation does not require any random bytes, - * random is ignored. + * {@code random} is ignored. * * @param key the party's private information. For example, in the case * of the Diffie-Hellman key agreement, this would be the party's own @@ -570,9 +570,9 @@ /** * Generates the shared secret and returns it in a new buffer. * - *

This method resets this KeyAgreement object, so that it + *

This method resets this {@code KeyAgreement} object, so that it * can be reused for further key agreements. Unless this key agreement is - * reinitialized with one of the init methods, the same + * reinitialized with one of the {@code init} methods, the same * private information and algorithm parameters will be used for * subsequent key agreements. * @@ -588,23 +588,23 @@ /** * Generates the shared secret, and places it into the buffer - * sharedSecret, beginning at offset inclusive. + * {@code sharedSecret}, beginning at {@code offset} inclusive. * - *

If the sharedSecret buffer is too small to hold the - * result, a ShortBufferException is thrown. + *

If the {@code sharedSecret} buffer is too small to hold the + * result, a {@code ShortBufferException} is thrown. * In this case, this call should be repeated with a larger output buffer. * - *

This method resets this KeyAgreement object, so that it + *

This method resets this {@code KeyAgreement} object, so that it * can be reused for further key agreements. Unless this key agreement is - * reinitialized with one of the init methods, the same + * reinitialized with one of the {@code init} methods, the same * private information and algorithm parameters will be used for * subsequent key agreements. * * @param sharedSecret the buffer for the shared secret - * @param offset the offset in sharedSecret where the + * @param offset the offset in {@code sharedSecret} where the * shared secret will be stored * - * @return the number of bytes placed into sharedSecret + * @return the number of bytes placed into {@code sharedSecret} * * @exception IllegalStateException if this key agreement has not been * completed yet @@ -619,12 +619,12 @@ } /** - * Creates the shared secret and returns it as a SecretKey + * Creates the shared secret and returns it as a {@code SecretKey} * object of the specified algorithm. * - *

This method resets this KeyAgreement object, so that it + *

This method resets this {@code KeyAgreement} object, so that it * can be reused for further key agreements. Unless this key agreement is - * reinitialized with one of the init methods, the same + * reinitialized with one of the {@code init} methods, the same * private information and algorithm parameters will be used for * subsequent key agreements. * --- old/src/java.base/share/classes/javax/crypto/KeyGenerator.java 2015-08-18 14:21:03.341018860 +0400 +++ new/src/java.base/share/classes/javax/crypto/KeyGenerator.java 2015-08-18 14:21:03.125018870 +0400 @@ -38,7 +38,7 @@ /** * This class provides the functionality of a secret (symmetric) key generator. * - *

Key generators are constructed using one of the getInstance + *

Key generators are constructed using one of the {@code getInstance} * class methods of this class. * *

KeyGenerator objects are reusable, i.e., after a key has been @@ -57,14 +57,14 @@ * {@link #init(int, java.security.SecureRandom) init} * method in this KeyGenerator class that takes these two universally * shared types of arguments. There is also one that takes just a - * keysize argument, and uses the SecureRandom implementation + * {@code keysize} argument, and uses the SecureRandom implementation * of the highest-priority installed provider as the source of randomness * (or a system-provided source of randomness if none of the installed * providers supply a SecureRandom implementation), and one that takes just a * source of randomness. * *

Since no other parameters are specified when you call the above - * algorithm-independent init methods, it is up to the + * algorithm-independent {@code init} methods, it is up to the * provider what to do about the algorithm-specific parameters (if any) to be * associated with each of the keys. * @@ -72,8 +72,8 @@ *

For situations where a set of algorithm-specific parameters already * exists, there are two * {@link #init(java.security.spec.AlgorithmParameterSpec) init} - * methods that have an AlgorithmParameterSpec - * argument. One also has a SecureRandom argument, while the + * methods that have an {@code AlgorithmParameterSpec} + * argument. One also has a {@code SecureRandom} argument, while the * other uses the SecureRandom implementation * of the highest-priority installed provider as the source of randomness * (or a system-provided source of randomness if none of the installed @@ -81,18 +81,18 @@ * * *

In case the client does not explicitly initialize the KeyGenerator - * (via a call to an init method), each provider must + * (via a call to an {@code init} method), each provider must * supply (and document) a default initialization. * *

Every implementation of the Java platform is required to support the - * following standard KeyGenerator algorithms with the keysizes in + * following standard {@code KeyGenerator} algorithms with the keysizes in * parentheses: *

* These algorithms are described in the @@ -177,20 +177,20 @@ } /** - * Returns the algorithm name of this KeyGenerator object. + * Returns the algorithm name of this {@code KeyGenerator} object. * *

This is the same name that was specified in one of the - * getInstance calls that created this - * KeyGenerator object. + * {@code getInstance} calls that created this + * {@code KeyGenerator} object. * - * @return the algorithm name of this KeyGenerator object. + * @return the algorithm name of this {@code KeyGenerator} object. */ public final String getAlgorithm() { return this.algorithm; } /** - * Returns a KeyGenerator object that generates secret keys + * Returns a {@code KeyGenerator} object that generates secret keys * for the specified algorithm. * *

This method traverses the list of registered security Providers, @@ -208,7 +208,7 @@ * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * - * @return the new KeyGenerator object. + * @return the new {@code KeyGenerator} object. * * @exception NullPointerException if the specified algorithm is null. * @@ -224,7 +224,7 @@ } /** - * Returns a KeyGenerator object that generates secret keys + * Returns a {@code KeyGenerator} object that generates secret keys * for the specified algorithm. * *

A new KeyGenerator object encapsulating the @@ -243,7 +243,7 @@ * * @param provider the name of the provider. * - * @return the new KeyGenerator object. + * @return the new {@code KeyGenerator} object. * * @exception NullPointerException if the specified algorithm is null. * @@ -254,7 +254,7 @@ * @exception NoSuchProviderException if the specified provider is not * registered in the security provider list. * - * @exception IllegalArgumentException if the provider + * @exception IllegalArgumentException if the {@code provider} * is null or empty. * * @see java.security.Provider @@ -269,7 +269,7 @@ } /** - * Returns a KeyGenerator object that generates secret keys + * Returns a {@code KeyGenerator} object that generates secret keys * for the specified algorithm. * *

A new KeyGenerator object encapsulating the @@ -285,7 +285,7 @@ * * @param provider the provider. * - * @return the new KeyGenerator object. + * @return the new {@code KeyGenerator} object. * * @exception NullPointerException if the specified algorithm is null. * @@ -293,7 +293,7 @@ * implementation for the specified algorithm is not available * from the specified Provider object. * - * @exception IllegalArgumentException if the provider + * @exception IllegalArgumentException if the {@code provider} * is null. * * @see java.security.Provider @@ -307,9 +307,9 @@ } /** - * Returns the provider of this KeyGenerator object. + * Returns the provider of this {@code KeyGenerator} object. * - * @return the provider of this KeyGenerator object + * @return the provider of this {@code KeyGenerator} object */ public final Provider getProvider() { synchronized (lock) { @@ -437,7 +437,7 @@ * @param params the key generation parameters * @param random the source of randomness for this key generator * - * @exception InvalidAlgorithmParameterException if params is + * @exception InvalidAlgorithmParameterException if {@code params} is * inappropriate for this key generator */ public final void init(AlgorithmParameterSpec params, SecureRandom random) --- old/src/java.base/share/classes/javax/crypto/Mac.java 2015-08-18 14:21:03.893018836 +0400 +++ new/src/java.base/share/classes/javax/crypto/Mac.java 2015-08-18 14:21:03.685018845 +0400 @@ -54,11 +54,11 @@ * specified in RFC 2104. * *

Every implementation of the Java platform is required to support - * the following standard Mac algorithms: + * the following standard {@code Mac} algorithms: *

* These algorithms are described in the * @@ -127,20 +127,20 @@ } /** - * Returns the algorithm name of this Mac object. + * Returns the algorithm name of this {@code Mac} object. * *

This is the same name that was specified in one of the - * getInstance calls that created this - * Mac object. + * {@code getInstance} calls that created this + * {@code Mac} object. * - * @return the algorithm name of this Mac object. + * @return the algorithm name of this {@code Mac} object. */ public final String getAlgorithm() { return this.algorithm; } /** - * Returns a Mac object that implements the + * Returns a {@code Mac} object that implements the * specified MAC algorithm. * *

This method traverses the list of registered security Providers, @@ -158,7 +158,7 @@ * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * - * @return the new Mac object. + * @return the new {@code Mac} object. * * @exception NoSuchAlgorithmException if no Provider supports a * MacSpi implementation for the @@ -183,7 +183,7 @@ } /** - * Returns a Mac object that implements the + * Returns a {@code Mac} object that implements the * specified MAC algorithm. * *

A new Mac object encapsulating the @@ -202,7 +202,7 @@ * * @param provider the name of the provider. * - * @return the new Mac 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 provider + * @exception IllegalArgumentException if the {@code provider} * is null or empty. * * @see java.security.Provider @@ -224,7 +224,7 @@ } /** - * Returns a Mac object that implements the + * Returns a {@code Mac} object that implements the * specified MAC algorithm. * *

A new Mac object encapsulating the @@ -240,13 +240,13 @@ * * @param provider the provider. * - * @return the new Mac 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 provider + * @exception IllegalArgumentException if the {@code provider} * is null. * * @see java.security.Provider @@ -380,9 +380,9 @@ } /** - * Returns the provider of this Mac object. + * Returns the provider of this {@code Mac} object. * - * @return the provider of this Mac object. + * @return the provider of this {@code Mac} object. */ public final Provider getProvider() { chooseFirstProvider(); @@ -400,7 +400,7 @@ } /** - * Initializes this Mac object with the given key. + * Initializes this {@code Mac} object with the given key. * * @param key the key. * @@ -426,7 +426,7 @@ } /** - * Initializes this Mac 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 Mac 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 Mac 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 len bytes in input, - * starting at offset 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 input 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 Mac 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 input.remaining() bytes in the ByteBuffer - * input, starting at input.position(). + * 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 Mac has not been + * @exception IllegalStateException if this {@code Mac} has not been * initialized. * @since 1.5 */ @@ -537,20 +537,20 @@ /** * Finishes the MAC operation. * - *

A call to this method resets this Mac object to the + *

A call to this method resets this {@code Mac} object to the * state it was in when previously initialized via a call to - * init(Key) or - * init(Key, AlgorithmParameterSpec). + * {@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 update and - * doFinal. - * (In order to reuse this Mac object with a different key, - * it must be reinitialized via a call to init(Key) or - * init(Key, AlgorithmParameterSpec). + * 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 Mac 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. * - *

A call to this method resets this Mac object to the + *

A call to this method resets this {@code Mac} object to the * state it was in when previously initialized via a call to - * init(Key) or - * init(Key, AlgorithmParameterSpec). + * {@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 update and - * doFinal. - * (In order to reuse this Mac object with a different key, - * it must be reinitialized via a call to init(Key) or - * init(Key, AlgorithmParameterSpec). + * 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)}. * - *

The MAC result is stored in output, starting at - * outOffset inclusive. + *

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 output 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 Mac 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. * - *

A call to this method resets this Mac object to the + *

A call to this method resets this {@code Mac} object to the * state it was in when previously initialized via a call to - * init(Key) or - * init(Key, AlgorithmParameterSpec). + * {@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 update and - * doFinal. - * (In order to reuse this Mac object with a different key, - * it must be reinitialized via a call to init(Key) or - * init(Key, AlgorithmParameterSpec). + * 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 Mac 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 Mac object. + * Resets this {@code Mac} object. * - *

A call to this method resets this Mac object to the + *

A call to this method resets this {@code Mac} object to the * state it was in when previously initialized via a call to - * init(Key) or - * init(Key, AlgorithmParameterSpec). + * {@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 update and - * doFinal. - * (In order to reuse this Mac object with a different key, - * it must be reinitialized via a call to init(Key) or - * init(Key, AlgorithmParameterSpec). + * 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 Cloneable. + * delegate that does not support {@code Cloneable}. */ public final Object clone() throws CloneNotSupportedException { chooseFirstProvider(); --- old/src/java.base/share/classes/javax/crypto/SecretKeyFactory.java 2015-08-18 14:21:04.453018810 +0400 +++ new/src/java.base/share/classes/javax/crypto/SecretKeyFactory.java 2015-08-18 14:21:04.245018820 +0400 @@ -38,7 +38,7 @@ * This class represents a factory for secret keys. * *

Key factories are used to convert keys (opaque - * cryptographic keys of type Key) into key specifications + * cryptographic keys of type {@code Key}) into key specifications * (transparent representations of the underlying key material), and vice * versa. * Secret key factories operate only on secret (symmetric) keys. @@ -53,16 +53,16 @@ * {@link #getKeySpec(javax.crypto.SecretKey, java.lang.Class) getKeySpec} * methods. * For example, the DES secret-key factory supplied by the "SunJCE" provider - * supports DESKeySpec as a transparent representation of DES + * supports {@code DESKeySpec} as a transparent representation of DES * keys, and that provider's secret-key factory for Triple DES keys supports - * DESedeKeySpec as a transparent representation of Triple DES + * {@code DESedeKeySpec} as a transparent representation of Triple DES * keys. * *

Every implementation of the Java platform is required to support the - * following standard SecretKeyFactory algorithms: + * following standard {@code SecretKeyFactory} algorithms: *

* These algorithms are described in the @@ -125,7 +125,7 @@ } /** - * Returns a SecretKeyFactory object that converts + * Returns a {@code SecretKeyFactory} object that converts * secret keys of the specified algorithm. * *

This method traverses the list of registered security Providers, @@ -144,7 +144,7 @@ * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * - * @return the new SecretKeyFactory object. + * @return the new {@code SecretKeyFactory} object. * * @exception NullPointerException if the specified algorithm * is null. @@ -161,7 +161,7 @@ } /** - * Returns a SecretKeyFactory object that converts + * Returns a {@code SecretKeyFactory} object that converts * secret keys of the specified algorithm. * *

A new SecretKeyFactory object encapsulating the @@ -181,7 +181,7 @@ * * @param provider the name of the provider. * - * @return the new SecretKeyFactory object. + * @return the new {@code SecretKeyFactory} object. * * @exception NoSuchAlgorithmException if a SecretKeyFactorySpi * implementation for the specified algorithm is not @@ -193,7 +193,7 @@ * @throws NoSuchProviderException if the specified provider is not * registered in the security provider list. * - * @exception IllegalArgumentException if the provider + * @exception IllegalArgumentException if the {@code provider} * is null or empty. * * @see java.security.Provider @@ -208,7 +208,7 @@ } /** - * Returns a SecretKeyFactory object that converts + * Returns a {@code SecretKeyFactory} object that converts * secret keys of the specified algorithm. * *

A new SecretKeyFactory object encapsulating the @@ -225,7 +225,7 @@ * * @param provider the provider. * - * @return the new SecretKeyFactory object. + * @return the new {@code SecretKeyFactory} object. * * @exception NullPointerException if the specified algorithm * is null. @@ -234,7 +234,7 @@ * implementation for the specified algorithm is not available * from the specified Provider object. * - * @exception IllegalArgumentException if the provider + * @exception IllegalArgumentException if the {@code provider} * is null. * * @see java.security.Provider @@ -248,9 +248,9 @@ } /** - * Returns the provider of this SecretKeyFactory object. + * Returns the provider of this {@code SecretKeyFactory} object. * - * @return the provider of this SecretKeyFactory object + * @return the provider of this {@code SecretKeyFactory} object */ public final Provider getProvider() { synchronized (lock) { @@ -261,13 +261,13 @@ } /** - * Returns the algorithm name of this SecretKeyFactory object. + * Returns the algorithm name of this {@code SecretKeyFactory} object. * *

This is the same name that was specified in one of the - * getInstance calls that created this - * SecretKeyFactory object. + * {@code getInstance} calls that created this + * {@code SecretKeyFactory} object. * - * @return the algorithm name of this SecretKeyFactory + * @return the algorithm name of this {@code SecretKeyFactory} * object. */ public final String getAlgorithm() { @@ -314,7 +314,7 @@ } /** - * Generates a SecretKey object from the provided key + * Generates a {@code SecretKey} object from the provided key * specification (key material). * * @param keySpec the specification (key material) of the secret key @@ -361,9 +361,9 @@ * * @exception InvalidKeySpecException if the requested key specification is * inappropriate for the given key (e.g., the algorithms associated with - * key and keySpec do not match, or - * key references a key on a cryptographic hardware device - * whereas keySpec is the specification of a software-based + * {@code key} and {@code keySpec} do not match, or + * {@code key} references a key on a cryptographic hardware device + * whereas {@code keySpec} is the specification of a software-based * key), or the given key cannot be dealt with * (e.g., the given key has an algorithm or format not supported by this * secret-key factory). --- old/src/java.base/share/classes/javax/crypto/spec/RC2ParameterSpec.java 2015-08-18 14:21:05.021018785 +0400 +++ new/src/java.base/share/classes/javax/crypto/spec/RC2ParameterSpec.java 2015-08-18 14:21:04.797018795 +0400 @@ -35,7 +35,7 @@ *

The parameters consist of an effective key size and optionally * an 8-byte initialization vector (IV) (only in feedback mode). * - *

This class can be used to initialize a Cipher object that + *

This class can be used to initialize a {@code Cipher} object that * implements the RC2 algorithm. * * @author Jan Luehe @@ -62,12 +62,12 @@ * (in bits) and an 8-byte IV. * *

The bytes that constitute the IV are those between - * iv[0] and iv[7] inclusive. + * {@code iv[0]} and {@code iv[7]} inclusive. * * @param effectiveKeyBits the effective key size in bits. * @param iv the buffer with the 8-byte IV. The first 8 bytes of * the buffer are copied to protect against subsequent modification. - * @exception IllegalArgumentException if iv is null. + * @exception IllegalArgumentException if {@code iv} is null. */ public RC2ParameterSpec(int effectiveKeyBits, byte[] iv) { this(effectiveKeyBits, iv, 0); @@ -77,18 +77,18 @@ * Constructs a parameter set for RC2 from the given effective key size * (in bits) and IV. * - *

The IV is taken from iv, starting at - * offset inclusive. + *

The IV is taken from {@code iv}, starting at + * {@code offset} inclusive. * The bytes that constitute the IV are those between - * iv[offset] and iv[offset+7] inclusive. + * {@code iv[offset]} and {@code iv[offset+7]} inclusive. * * @param effectiveKeyBits the effective key size in bits. * @param iv the buffer with the IV. The first 8 bytes - * of the buffer beginning at offset inclusive + * of the buffer beginning at {@code offset} inclusive * are copied to protect against subsequent modification. - * @param offset the offset in iv where the 8-byte IV + * @param offset the offset in {@code iv} where the 8-byte IV * starts. - * @exception IllegalArgumentException if iv is null. + * @exception IllegalArgumentException if {@code iv} is null. */ public RC2ParameterSpec(int effectiveKeyBits, byte[] iv, int offset) { this.effectiveKeyBits = effectiveKeyBits; @@ -124,12 +124,12 @@ * Tests for equality between the specified object and this * object. Two RC2ParameterSpec objects are considered equal if their * effective key sizes and IVs are equal. - * (Two IV references are considered equal if both are null.) + * (Two IV references are considered equal if both are {@code null}.) * * @param obj the object to test for equality with this object. * * @return true if the objects are considered equal, false if - * obj is null or otherwise. + * {@code obj} is null or otherwise. */ public boolean equals(Object obj) { if (obj == this) { --- old/src/java.base/share/classes/javax/crypto/spec/RC5ParameterSpec.java 2015-08-18 14:21:05.581018760 +0400 +++ new/src/java.base/share/classes/javax/crypto/spec/RC5ParameterSpec.java 2015-08-18 14:21:05.369018769 +0400 @@ -35,7 +35,7 @@ *

The parameters consist of a version number, a rounds count, a word * size, and optionally an initialization vector (IV) (only in feedback mode). * - *

This class can be used to initialize a Cipher object that + *

This class can be used to initialize a {@code Cipher} object that * implements the RC5 algorithm as supplied by * RSA Security LLC, * or any parties authorized by RSA Security. @@ -71,16 +71,16 @@ * *

Note that the size of the IV (block size) must be twice the word * size. The bytes that constitute the IV are those between - * iv[0] and iv[2*(wordSize/8)-1] inclusive. + * {@code iv[0]} and {@code iv[2*(wordSize/8)-1]} inclusive. * * @param version the version. * @param rounds the number of rounds. * @param wordSize the word size in bits. - * @param iv the buffer with the IV. The first 2*(wordSize/8) - * bytes of the buffer are copied to protect against subsequent + * @param iv the buffer with the IV. The first {@code 2*(wordSize/8) + * } bytes of the buffer are copied to protect against subsequent * modification. - * @exception IllegalArgumentException if iv is - * null or {@code (iv.length < 2 * (wordSize / 8))} + * @exception IllegalArgumentException if {@code iv} is + * {@code null} or {@code (iv.length < 2 * (wordSize / 8))} */ public RC5ParameterSpec(int version, int rounds, int wordSize, byte[] iv) { this(version, rounds, wordSize, iv, 0); @@ -90,23 +90,23 @@ * Constructs a parameter set for RC5 from the given version, number of * rounds, word size (in bits), and IV. * - *

The IV is taken from iv, starting at - * offset inclusive. + *

The IV is taken from {@code iv}, starting at + * {@code offset} inclusive. * Note that the size of the IV (block size), starting at - * offset inclusive, must be twice the word size. + * {@code offset} inclusive, must be twice the word size. * The bytes that constitute the IV are those between - * iv[offset] and iv[offset+2*(wordSize/8)-1] + * {@code iv[offset]} and {@code iv[offset+2*(wordSize/8)-1]} * inclusive. * * @param version the version. * @param rounds the number of rounds. * @param wordSize the word size in bits. - * @param iv the buffer with the IV. The first 2*(wordSize/8) - * bytes of the buffer beginning at offset + * @param iv the buffer with the IV. The first {@code 2*(wordSize/8) + * } bytes of the buffer beginning at {@code offset} * inclusive are copied to protect against subsequent modification. - * @param offset the offset in iv where the IV starts. - * @exception IllegalArgumentException if iv is - * null or + * @param offset the offset in {@code iv} where the IV starts. + * @exception IllegalArgumentException if {@code iv} is + * {@code null} or * {@code (iv.length - offset < 2 * (wordSize / 8))} */ public RC5ParameterSpec(int version, int rounds, int wordSize, @@ -164,12 +164,12 @@ * Tests for equality between the specified object and this * object. Two RC5ParameterSpec objects are considered equal if their * version numbers, number of rounds, word sizes, and IVs are equal. - * (Two IV references are considered equal if both are null.) + * (Two IV references are considered equal if both are {@code null}.) * * @param obj the object to test for equality with this object. * * @return true if the objects are considered equal, false if - * obj is null or otherwise. + * {@code obj} is null or otherwise. */ public boolean equals(Object obj) { if (obj == this) { --- old/src/java.base/share/classes/sun/security/pkcs/PKCS7.java 2015-08-18 14:21:06.201018732 +0400 +++ new/src/java.base/share/classes/sun/security/pkcs/PKCS7.java 2015-08-18 14:21:05.941018744 +0400 @@ -46,9 +46,9 @@ /** * PKCS7 as defined in RSA Laboratories PKCS7 Technical Note. Profile - * Supports only SignedData ContentInfo + * Supports only {@code SignedData} ContentInfo * type, where to the type of data signed is plain Data. - * For signedData, crls, attributes and + * For signedData, {@code crls}, {@code attributes} and * PKCS#6 Extended Certificates are not supported. * * @author Benjamin Renaud --- old/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java 2015-08-18 14:21:06.753018707 +0400 +++ new/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java 2015-08-18 14:21:06.541018717 +0400 @@ -180,7 +180,7 @@ /** * DER encode this object onto an output stream. - * Implements the DerEncoder interface. + * Implements the {@code DerEncoder} interface. * * @param out * the output stream on which to write the DER encoding. @@ -454,7 +454,7 @@ * Extracts a timestamp from a PKCS7 SignerInfo. * * Examines the signer's unsigned attributes for a - * signatureTimestampToken attribute. If present, + * {@code signatureTimestampToken} attribute. If present, * then it is parsed to extract the date and time at which the * timestamp was generated. * --- old/src/java.base/share/classes/sun/security/pkcs10/PKCS10Attributes.java 2015-08-18 14:21:07.325018681 +0400 +++ new/src/java.base/share/classes/sun/security/pkcs10/PKCS10Attributes.java 2015-08-18 14:21:07.093018692 +0400 @@ -98,7 +98,7 @@ /** * Encode the attributes in DER form to the stream. - * Implements the DerEncoder interface. + * Implements the {@code DerEncoder} interface. * * @param out the OutputStream to marshal the contents to. * @exception IOException on encoding errors. @@ -157,8 +157,8 @@ /** * Compares this PKCS10Attributes for equality with the specified - * object. If the other object is an - * instanceof PKCS10Attributes, then + * object. If the {@code other} object is an + * {@code instanceof PKCS10Attributes}, then * all the entries are compared with the entries from this. * * @param other the object to test for equality with this PKCS10Attributes. @@ -205,10 +205,10 @@ } /** - * Returns a string representation of this PKCS10Attributes object + * Returns a string representation of this {@code PKCS10Attributes} object * in the form of a set of entries, enclosed in braces and separated - * by the ASCII characters ", " (comma and space). - *

Overrides the toString method of Object. + * by the ASCII characters ", " (comma and space). + *

Overrides the {@code toString} method of {@code Object}. * * @return a string representation of this PKCS10Attributes. */ --- old/src/java.base/share/classes/sun/security/x509/CRLExtensions.java 2015-08-18 14:21:07.885018656 +0400 +++ new/src/java.base/share/classes/sun/security/x509/CRLExtensions.java 2015-08-18 14:21:07.661018666 +0400 @@ -238,8 +238,8 @@ /** * Compares this CRLExtensions for equality with the specified - * object. If the other object is an - * instanceof CRLExtensions, then + * object. If the {@code other} object is an + * {@code instanceof} {@code CRLExtensions}, then * all the entries are compared with the entries from this. * * @param other the object to test for equality with this CRLExtensions. @@ -286,10 +286,10 @@ } /** - * Returns a string representation of this CRLExtensions object + * Returns a string representation of this {@code CRLExtensions} object * in the form of a set of entries, enclosed in braces and separated - * by the ASCII characters ", " (comma and space). - *

Overrides to toString method of Object. + * by the ASCII characters ", " (comma and space). + *

Overrides to {@code toString} method of {@code Object}. * * @return a string representation of this CRLExtensions. */ --- old/src/java.base/share/classes/sun/security/x509/CertificateExtensions.java 2015-08-18 14:21:08.437018632 +0400 +++ new/src/java.base/share/classes/sun/security/x509/CertificateExtensions.java 2015-08-18 14:21:08.225018641 +0400 @@ -289,8 +289,8 @@ /** * Compares this CertificateExtensions for equality with the specified - * object. If the other object is an - * instanceof CertificateExtensions, then + * object. If the {@code other} object is an + * {@code instanceof} {@code CertificateExtensions}, then * all the entries are compared with the entries from this. * * @param other the object to test for equality with this @@ -339,10 +339,10 @@ } /** - * Returns a string representation of this CertificateExtensions + * Returns a string representation of this {@code CertificateExtensions} * object in the form of a set of entries, enclosed in braces and separated - * by the ASCII characters ", " (comma and space). - *

Overrides to toString method of Object. + * by the ASCII characters ", " (comma and space). + *

Overrides to {@code toString} method of {@code Object}. * * @return a string representation of this CertificateExtensions. */ --- old/src/java.security.jgss/share/classes/sun/security/krb5/Realm.java 2015-08-18 14:21:09.017018606 +0400 +++ new/src/java.security.jgss/share/classes/sun/security/krb5/Realm.java 2015-08-18 14:21:08.777018616 +0400 @@ -296,7 +296,7 @@ * * @param cRealm the initiating realm * @param sRealm the target realm, not the same as cRealm - * @returns array of realms including at least cRealm as the first + * @return array of realms including at least cRealm as the first * element * @throws KrbException if the config does not contain a sub-stanza * for cRealm in [capaths] or the sub-stanza does not contain @@ -347,7 +347,7 @@ * for a service in the target realm sRealm. * @param cRealm the initiating realm * @param sRealm the target realm, not the same as cRealm - * @returns array of realms including cRealm as the first element + * @return array of realms including cRealm as the first element */ private static String[] parseHierarchy(String cRealm, String sRealm) { --- old/src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Base.java 2015-08-18 14:21:09.581018580 +0400 +++ new/src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Base.java 2015-08-18 14:21:09.345018591 +0400 @@ -103,8 +103,8 @@ /** * Retrieves the negotiated property. * This method can be called only after the authentication exchange has - * completed (i.e., when isComplete() returns true); otherwise, a - * SaslException is thrown. + * completed (i.e., when {@code isComplete()} returns true); otherwise, a + * {@code SaslException} is thrown. * * @return value of property; only QOP is applicable to CRAM-MD5. * @exception IllegalStateException if this authentication exchange has not completed --- old/src/java.security.sasl/share/classes/com/sun/security/sasl/ExternalClient.java 2015-08-18 14:21:10.125018556 +0400 +++ new/src/java.security.sasl/share/classes/com/sun/security/sasl/ExternalClient.java 2015-08-18 14:21:09.913018565 +0400 @@ -141,8 +141,8 @@ /** * Retrieves the negotiated property. * This method can be called only after the authentication exchange has - * completed (i.e., when isComplete() returns true); otherwise, a - * IllegalStateException is thrown. + * completed (i.e., when {@code isComplete()} returns true); + * otherwise, an {@code IllegalStateException} is thrown. * * @return null No property is applicable to this mechanism. * @exception IllegalStateException if this authentication exchange --- old/src/java.security.sasl/share/classes/com/sun/security/sasl/PlainClient.java 2015-08-18 14:21:10.673018531 +0400 +++ new/src/java.security.sasl/share/classes/com/sun/security/sasl/PlainClient.java 2015-08-18 14:21:10.461018541 +0400 @@ -170,8 +170,8 @@ /** * Retrieves the negotiated property. * This method can be called only after the authentication exchange has - * completed (i.e., when isComplete() returns true); otherwise, a - * SaslException is thrown. + * completed (i.e., when {@code isComplete()} returns true); otherwise, a + * {@code SaslException} is thrown. * * @return value of property; only QOP is applicable to PLAIN. * @exception IllegalStateException if this authentication exchange --- old/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java 2015-08-18 14:21:11.233018506 +0400 +++ new/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java 2015-08-18 14:21:11.017018516 +0400 @@ -567,7 +567,7 @@ * username-value * cnonce-value * authzid-value - * @returns digest-response in a byte array + * @return {@code digest-response} in a byte array * @throws SaslException if there is an error generating the * response value or the cnonce value. */ --- old/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/AgreementMethod.java 2015-08-18 14:21:11.905018476 +0400 +++ new/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/AgreementMethod.java 2015-08-18 14:21:11.673018486 +0400 @@ -31,38 +31,38 @@ * based on a shared secret computed from certain types of compatible public * keys from both the sender and the recipient. Information from the originator * to determine the secret is indicated by an optional OriginatorKeyInfo - * parameter child of an AgreementMethod element while that + * parameter child of an {@code AgreementMethod} element while that * associated with the recipient is indicated by an optional RecipientKeyInfo. A * shared key is derived from this shared secret by a method determined by the * Key Agreement algorithm. *

* Note: XML Encryption does not provide an on-line key agreement - * negotiation protocol. The AgreementMethod element can be used by + * negotiation protocol. The {@code AgreementMethod} element can be used by * the originator to identify the keys and computational procedure that were * used to obtain a shared encryption key. The method used to obtain or select * the keys or algorithm used for the agreement computation is beyond the scope * of this specification. *

- * The AgreementMethod element appears as the content of a - * ds:KeyInfo since, like other ds:KeyInfo children, - * it yields a key. This ds:KeyInfo is in turn a child of an - * EncryptedData or EncryptedKey element. The - * Algorithm attribute and KeySize child of the EncryptionMethod - * element under this EncryptedData or EncryptedKey + * The {@code AgreementMethod} element appears as the content of a + * {@code ds:KeyInfo} since, like other {@code ds:KeyInfo} children, + * it yields a key. This {@code ds:KeyInfo} is in turn a child of an + * {@code EncryptedData} or {@code EncryptedKey} element. The + * Algorithm attribute and KeySize child of the {@code EncryptionMethod} + * element under this {@code EncryptedData} or {@code EncryptedKey} * element are implicit parameters to the key agreement computation. In cases - * where this EncryptionMethod algorithm URI is + * where this {@code EncryptionMethod} algorithm {@code URI} is * insufficient to determine the key length, a KeySize MUST have been included. * In addition, the sender may place a KA-Nonce element under - * AgreementMethod to assure that different keying material is + * {@code AgreementMethod} to assure that different keying material is * generated even for repeated agreements using the same sender and recipient * public keys. *

* If the agreed key is being used to wrap a key, then - * AgreementMethod would appear inside a ds:KeyInfo - * inside an EncryptedKey element. + * {@code AgreementMethod} would appear inside a {@code ds:KeyInfo} + * inside an {@code EncryptedKey} element. *

* The Schema for AgreementMethod is as follows: - *

+ * <pre>{@code * <element name="AgreementMethod" type="xenc:AgreementMethodType"/> * <complexType name="AgreementMethodType" mixed="true"> * <sequence> @@ -74,15 +74,15 @@ * </sequence> * <attribute name="Algorithm" type="anyURI" use="required"/> * </complexType> - * + * } * * @author Axl Mattheus */ public interface AgreementMethod { /** - * Returns a byte array. - * @return a byte array. + * Returns a {@code byte} array. + * @return a {@code byte} array. */ byte[] getKANonce(); @@ -93,30 +93,30 @@ void setKANonce(byte[] kanonce); /** - * Returns additional information regarding the AgreementMethod. - * @return additional information regarding the AgreementMethod. + * Returns additional information regarding the {@code AgreementMethod}. + * @return additional information regarding the {@code AgreementMethod}. */ Iterator getAgreementMethodInformation(); /** - * Adds additional AgreementMethod information. + * Adds additional {@code AgreementMethod} information. * - * @param info a Element that represents additional information + * @param info a {@code Element} that represents additional information * specified by - * + * <pre>{@code * <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/> - * + * } */ void addAgreementMethodInformation(Element info); /** - * Removes additional AgreementMethod information. + * Removes additional {@code AgreementMethod} information. * - * @param info a Element that represents additional information + * @param info a {@code Element} that represents additional information * specified by - * + * <pre>{@code * <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/> - * + * } */ void revoveAgreementMethodInformation(Element info); @@ -149,9 +149,9 @@ void setRecipientKeyInfo(KeyInfo keyInfo); /** - * Returns the algorithm URI of this CryptographicMethod. + * Returns the algorithm URI of this {@code CryptographicMethod}. * - * @return the algorithm URI of this CryptographicMethod + * @return the algorithm URI of this {@code CryptographicMethod} */ String getAlgorithm(); } --- old/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherData.java 2015-08-18 14:21:12.453018451 +0400 +++ new/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherData.java 2015-08-18 14:21:12.237018461 +0400 @@ -23,14 +23,14 @@ package com.sun.org.apache.xml.internal.security.encryption; /** - * CipherData provides encrypted data. It must either contain the + * {@code CipherData} provides encrypted data. It must either contain the * encrypted octet sequence as base64 encoded text of the - * CipherValue element, or provide a reference to an external + * {@code CipherValue} element, or provide a reference to an external * location containing the encrypted octet sequence via the - * CipherReference element. + * {@code CipherReference} element. *

* The schema definition is as follows: - *

+ * <pre>{@code * <element name='CipherData' type='xenc:CipherDataType'/> * <complexType name='CipherDataType'> * <choice> @@ -38,7 +38,7 @@ * <element ref='xenc:CipherReference'/> * </choice> * </complexType> - * + * } * * @author Axl Mattheus */ @@ -52,32 +52,32 @@ /** * Returns the type of encrypted data contained in the - * CipherData. + * {@code CipherData}. * - * @return VALUE_TYPE if the encrypted data is contained as - * CipherValue or REFERENCE_TYPE if the - * encrypted data is contained as CipherReference. + * @return {@code VALUE_TYPE} if the encrypted data is contained as + * {@code CipherValue} or {@code REFERENCE_TYPE} if the + * encrypted data is contained as {@code CipherReference}. */ int getDataType(); /** - * Returns the cipher value as a base64 encoded byte array. + * Returns the cipher value as a base64 encoded {@code byte} array. * - * @return the CipherData's value. + * @return the {@code CipherData}'s value. */ CipherValue getCipherValue(); /** - * Sets the CipherData's value. + * Sets the {@code CipherData}'s value. * - * @param value the value of the CipherData. + * @param value the value of the {@code CipherData}. * @throws XMLEncryptionException */ void setCipherValue(CipherValue value) throws XMLEncryptionException; /** * Returns a reference to an external location containing the encrypted - * octet sequence (byte array). + * octet sequence ({@code byte} array). * * @return the reference to an external location containing the encrypted * octet sequence. @@ -85,7 +85,7 @@ CipherReference getCipherReference(); /** - * Sets the CipherData's reference. + * Sets the {@code CipherData}'s reference. * * @param reference an external location containing the encrypted octet sequence. * @throws XMLEncryptionException --- old/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java 2015-08-18 14:21:13.021018426 +0400 +++ new/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java 2015-08-18 14:21:12.789018436 +0400 @@ -25,18 +25,18 @@ import org.w3c.dom.Attr; /** - * CipherReference identifies a source which, when processed, + * {@code CipherReference} identifies a source which, when processed, * yields the encrypted octet sequence. *

- * The actual value is obtained as follows. The CipherReference URI + * The actual value is obtained as follows. The {@code CipherReference URI} * contains an identifier that is dereferenced. Should the - * Transforms, the data resulting from dereferencing the URI is + * Transforms, the data resulting from dereferencing the {@code URI} is * transformed as specified so as to yield the intended cipher value. For * example, if the value is base64 encoded within an XML document; the * transforms could specify an XPath expression followed by a base64 decoding so * as to extract the octets. *

- * The syntax of the URI and Transforms is similar to that of + * The syntax of the {@code URI} and Transforms is similar to that of * [XML-DSIG]. However, there is a difference between signature and encryption * processing. In [XML-DSIG] both generation and validation processing start * with the same source data and perform that transform in the same order. In @@ -46,7 +46,7 @@ * the &xenc; namespace. *

* The schema definition is as follows: - *

+ * <pre>{@code * <element name='CipherReference' type='xenc:CipherReferenceType'/> * <complexType name='CipherReferenceType'> * <sequence> @@ -54,15 +54,15 @@ * </sequence> * <attribute name='URI' type='anyURI' use='required'/> * </complexType> - * + * } * * @author Axl Mattheus */ public interface CipherReference { /** - * Returns an URI that contains an identifier that should be + * Returns an {@code URI} that contains an identifier that should be * dereferenced. - * @return an URI that contains an identifier that should be + * @return an {@code URI} that contains an identifier that should be * dereferenced. */ String getURI(); @@ -75,8 +75,8 @@ Attr getURIAsAttr(); /** - * Returns the Transforms that specifies how to transform the - * URI to yield the appropriate cipher value. + * Returns the {@code Transforms} that specifies how to transform the + * {@code URI} to yield the appropriate cipher value. * * @return the transform that specifies how to transform the reference to * yield the intended cipher value. @@ -84,10 +84,10 @@ Transforms getTransforms(); /** - * Sets the Transforms that specifies how to transform the - * URI to yield the appropriate cipher value. + * Sets the {@code Transforms} that specifies how to transform the + * {@code URI} to yield the appropriate cipher value. * - * @param transforms the set of Transforms that specifies how + * @param transforms the set of {@code Transforms} that specifies how * to transform the reference to yield the intended cipher value. */ void setTransforms(Transforms transforms); --- old/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedData.java 2015-08-18 14:21:13.573018401 +0400 +++ new/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedData.java 2015-08-18 14:21:13.357018411 +0400 @@ -23,21 +23,21 @@ package com.sun.org.apache.xml.internal.security.encryption; /** - * The EncryptedData element is the core element in the syntax. Not - * only does its CipherData child contain the encrypted data, but + * The {@code EncryptedData} element is the core element in the syntax. Not + * only does its {@code CipherData} child contain the encrypted data, but * it's also the element that replaces the encrypted element, or serves as the * new document root. *

* It's schema definition is as follows: *

- *

+ * <pre>{@code * <element name='EncryptedData' type='xenc:EncryptedDataType'/> * <complexType name='EncryptedDataType'> * <complexContent> * <extension base='xenc:EncryptedType'/> * </complexContent> * </complexType> - * + * } * * @author Axl Mattheus */ --- old/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedKey.java 2015-08-18 14:21:14.121018376 +0400 +++ new/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedKey.java 2015-08-18 14:21:13.905018386 +0400 @@ -23,17 +23,17 @@ package com.sun.org.apache.xml.internal.security.encryption; /** - * The EncryptedKey element is used to transport encryption keys + * The {@code EncryptedKey} element is used to transport encryption keys * from the originator to a known recipient(s). It may be used as a stand-alone * XML document, be placed within an application document, or appear inside an - * EncryptedData element as a child of a ds:KeyInfo + * {@code EncryptedData} element as a child of a {@code ds:KeyInfo} * element. The key value is always encrypted to the recipient(s). When - * EncryptedKey is decrypted the resulting octets are made - * available to the EncryptionMethod algorithm without any + * {@code EncryptedKey} is decrypted the resulting octets are made + * available to the {@code EncryptionMethod} algorithm without any * additional processing. *

* Its schema definition is as follows: - *

+ * <pre>{@code * <element name='EncryptedKey' type='xenc:EncryptedKeyType'/> * <complexType name='EncryptedKeyType'> * <complexContent> @@ -46,7 +46,7 @@ * </extension> * </complexContent> * </complexType> - * + * } * * @author Axl Mattheus */ @@ -55,31 +55,31 @@ /** * Returns a hint as to which recipient this encrypted key value is intended for. * - * @return the recipient of the EncryptedKey. + * @return the recipient of the {@code EncryptedKey}. */ String getRecipient(); /** - * Sets the recipient for this EncryptedKey. + * Sets the recipient for this {@code EncryptedKey}. * - * @param recipient the recipient for this EncryptedKey. + * @param recipient the recipient for this {@code EncryptedKey}. */ void setRecipient(String recipient); /** * Returns pointers to data and keys encrypted using this key. The reference - * list may contain multiple references to EncryptedKey and - * EncryptedData elements. This is done using - * KeyReference and DataReference elements + * list may contain multiple references to {@code EncryptedKey} and + * {@code EncryptedData} elements. This is done using + * {@code KeyReference} and {@code DataReference} elements * respectively. * - * @return an Iterator over all the ReferenceLists - * contained in this EncryptedKey. + * @return an {@code Iterator} over all the {@code ReferenceList}s + * contained in this {@code EncryptedKey}. */ ReferenceList getReferenceList(); /** - * Sets the ReferenceList to the EncryptedKey. + * Sets the {@code ReferenceList} to the {@code EncryptedKey}. * * @param list a list of pointers to data elements encrypted using this key. */ @@ -87,19 +87,19 @@ /** * Returns a user readable name with the key value. This may then be used to - * reference the key using the ds:KeyName element within - * ds:KeyInfo. The same CarriedKeyName label, + * reference the key using the {@code ds:KeyName} element within + * {@code ds:KeyInfo}. The same {@code CarriedKeyName} label, * unlike an ID type, may occur multiple times within a single document. The - * value of the key is to be the same in all EncryptedKey - * elements identified with the same CarriedKeyName label + * value of the key is to be the same in all {@code EncryptedKey} + * elements identified with the same {@code CarriedKeyName} label * within a single XML document. *
* Note that because whitespace is significant in the value of - * the ds:KeyName element, whitespace is also significant in - * the value of the CarriedKeyName element. + * the {@code ds:KeyName} element, whitespace is also significant in + * the value of the {@code CarriedKeyName} element. * * @return over all the carried names contained in - * this EncryptedKey. + * this {@code EncryptedKey}. */ String getCarriedName(); --- old/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java 2015-08-18 14:21:14.669018352 +0400 +++ new/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java 2015-08-18 14:21:14.453018361 +0400 @@ -25,13 +25,13 @@ import com.sun.org.apache.xml.internal.security.keys.KeyInfo; /** - * EncryptedType is the abstract type from which EncryptedData and - * EncryptedKey are derived. While these two latter element types + * EncryptedType is the abstract type from which {@code EncryptedData} and + * {@code EncryptedKey} are derived. While these two latter element types * are very similar with respect to their content models, a syntactical * distinction is useful to processing. *

* Its schema definition is as follows: - *

+ * <pre>{@code * <complexType name='EncryptedType' abstract='true'> * <sequence> * <element name='EncryptionMethod' type='xenc:EncryptionMethodType' @@ -45,17 +45,17 @@ * <attribute name='MimeType' type='string' use='optional'/> * <attribute name='Encoding' type='anyURI' use='optional'/> * </complexType> - * + * } * * @author Axl Mattheus */ public interface EncryptedType { /** - * Returns a String providing for the standard method of + * Returns a {@code String} providing for the standard method of * assigning an id to the element within the document context. * - * @return the id for the EncryptedType. + * @return the id for the {@code EncryptedType}. */ String getId(); @@ -67,11 +67,11 @@ void setId(String id); /** - * Returns an URI identifying type information about the + * Returns an {@code URI} identifying type information about the * plaintext form of the encrypted content. While optional, this * specification takes advantage of it for mandatory processing described in * Processing Rules: Decryption (section 4.2). If the - * EncryptedData element contains data of Type 'element' or + * {@code EncryptedData} element contains data of Type 'element' or * element 'content', and replaces that data in an XML document context, it * is strongly recommended the Type attribute be provided. Without this * information, the decryptor will be unable to automatically restore the @@ -85,13 +85,13 @@ /** * Sets the type. * - * @param type an URI identifying type information about the + * @param type an {@code URI} identifying type information about the * plaintext form of the encrypted content. */ void setType(String type); /** - * Returns a String which describes the media type of the data + * Returns a {@code String} which describes the media type of the data * which has been encrypted. The value of this attribute has values defined * by [MIME]. For example, if the data that is encrypted is a base64 encoded * PNG, the transfer Encoding may be specified as @@ -112,29 +112,29 @@ /** * Sets the mime type. * - * @param type a String which describes the media type of the + * @param type a {@code String} which describes the media type of the * data which has been encrypted. */ void setMimeType(String type); /** - * Return an URI representing the encoding of the - * EncryptedType. + * Return an {@code URI} representing the encoding of the + * {@code EncryptedType}. * - * @return the encoding of this EncryptedType. + * @return the encoding of this {@code EncryptedType}. */ String getEncoding(); /** - * Sets the URI representing the encoding of the - * EncryptedType. + * Sets the {@code URI} representing the encoding of the + * {@code EncryptedType}. * * @param encoding */ void setEncoding(String encoding); /** - * Returns an EncryptionMethod that describes the encryption + * Returns an {@code EncryptionMethod} that describes the encryption * algorithm applied to the cipher data. If the element is absent, the * encryption algorithm must be known by the recipient or the decryption * will fail. @@ -144,17 +144,17 @@ EncryptionMethod getEncryptionMethod(); /** - * Sets the EncryptionMethod used to encrypt the cipher data. + * Sets the {@code EncryptionMethod} used to encrypt the cipher data. * - * @param method the EncryptionMethod. + * @param method the {@code EncryptionMethod}. */ void setEncryptionMethod(EncryptionMethod method); /** - * Returns the ds:KeyInfo, that carries information about the + * Returns the {@code ds:KeyInfo}, that carries information about the * key used to encrypt the data. Subsequent sections of this specification * define new elements that may appear as children of - * ds:KeyInfo. + * {@code ds:KeyInfo}. * * @return information about the key that encrypted the cipher data. */ @@ -163,14 +163,14 @@ /** * Sets the encryption key information. * - * @param info the ds:KeyInfo, that carries information about + * @param info the {@code ds:KeyInfo}, that carries information about * the key used to encrypt the data. */ void setKeyInfo(KeyInfo info); /** - * Returns the CipherReference that contains the - * CipherValue or CipherReference with the + * Returns the {@code CipherReference} that contains the + * {@code CipherValue} or {@code CipherReference} with the * encrypted data. * * @return the cipher data for the encrypted type. @@ -179,16 +179,16 @@ /** * Returns additional information concerning the generation of the - * EncryptedType. + * {@code EncryptedType}. * * @return information relating to the generation of the - * EncryptedType. + * {@code EncryptedType}. */ EncryptionProperties getEncryptionProperties(); /** - * Sets the EncryptionProperties that supplies additional - * information about the generation of the EncryptedType. + * Sets the {@code EncryptionProperties} that supplies additional + * information about the generation of the {@code EncryptedType}. * * @param properties */ --- old/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionMethod.java 2015-08-18 14:21:15.217018327 +0400 +++ new/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionMethod.java 2015-08-18 14:21:15.005018337 +0400 @@ -26,12 +26,12 @@ import org.w3c.dom.Element; /** - * EncryptionMethod describes the encryption algorithm applied to + * {@code EncryptionMethod} describes the encryption algorithm applied to * the cipher data. If the element is absent, the encryption algorithm must be * known by the recipient or the decryption will fail. *

* It is defined as follows: - *

+ * <pre>{@code * <complexType name='EncryptionMethodType' mixed='true'> * <sequence> * <element name='KeySize' minOccurs='0' type='xenc:KeySizeType'/> @@ -40,7 +40,7 @@ * </sequence> * <attribute name='Algorithm' type='anyURI' use='required'/> * </complexType> - * + * } * * @author Axl Mattheus */ @@ -108,10 +108,10 @@ /** * Returns an iterator over all the additional elements contained in the - * EncryptionMethod. + * {@code EncryptionMethod}. * - * @return an Iterator over all the additional information - * about the EncryptionMethod. + * @return an {@code Iterator} over all the additional information + * about the {@code EncryptionMethod}. */ Iterator getEncryptionMethodInformation(); @@ -126,7 +126,7 @@ * Removes encryption method information. * * @param information the information to remove from the - * EncryptionMethod. + * {@code EncryptionMethod}. */ void removeEncryptionMethodInformation(Element information); } --- old/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java 2015-08-18 14:21:15.785018302 +0400 +++ new/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java 2015-08-18 14:21:15.569018311 +0400 @@ -25,15 +25,15 @@ import java.util.Iterator; /** - * EncryptionProperties can hold additional information concerning - * the generation of the EncryptedData or - * EncryptedKey. This information is wraped int an - * EncryptionProperty element. Examples of additional information + * {@code EncryptionProperties} can hold additional information concerning + * the generation of the {@code EncryptedData} or + * {@code EncryptedKey}. This information is wraped int an + * {@code EncryptionProperty} element. Examples of additional information * is e.g., a date/time stamp or the serial number of cryptographic hardware * used during encryption). *

* It is defined as follows: - *

+ * <pre>{@code * <element name='EncryptionProperties' type='xenc:EncryptionPropertiesType'/> * <complexType name='EncryptionPropertiesType'> * <sequence> @@ -41,14 +41,14 @@ * </sequence> * <attribute name='Id' type='ID' use='optional'/> * </complexType> - * + * } * * @author Axl Mattheus */ public interface EncryptionProperties { /** - * Returns the EncryptionProperties' id. + * Returns the {@code EncryptionProperties}' id. * * @return the id. */ @@ -62,23 +62,23 @@ void setId(String id); /** - * Returns an Iterator over all the - * EncryptionPropterty elements contained in this - * EncryptionProperties. + * Returns an {@code Iterator} over all the + * {@code EncryptionPropterty} elements contained in this + * {@code EncryptionProperties}. * - * @return an Iterator over all the encryption properties. + * @return an {@code Iterator} over all the encryption properties. */ Iterator getEncryptionProperties(); /** - * Adds an EncryptionProperty. + * Adds an {@code EncryptionProperty}. * * @param property */ void addEncryptionProperty(EncryptionProperty property); /** - * Removes the specified EncryptionProperty. + * Removes the specified {@code EncryptionProperty}. * * @param property */ --- old/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperty.java 2015-08-18 14:21:16.337018277 +0400 +++ new/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperty.java 2015-08-18 14:21:16.121018286 +0400 @@ -27,16 +27,16 @@ /** * Additional information items concerning the generation of the - * EncryptedData or EncryptedKey can be placed in an - * EncryptionProperty element (e.g., date/time stamp or the serial + * {@code EncryptedData} or {@code EncryptedKey} can be placed in an + * {@code EncryptionProperty} element (e.g., date/time stamp or the serial * number of cryptographic hardware used during encryption). The Target - * attribute identifies the EncryptedType structure being + * attribute identifies the {@code EncryptedType} structure being * described. anyAttribute permits the inclusion of attributes from the XML - * namespace to be included (i.e., xml:space, - * xml:lang, and xml:base). + * namespace to be included (i.e., {@code xml:space}, + * {@code xml:lang}, and {@code xml:base}). *

* It is defined as follows: - *

+ * <pre>{@code * <element name='EncryptionProperty' type='xenc:EncryptionPropertyType'/> * <complexType name='EncryptionPropertyType' mixed='true'> * <choice maxOccurs='unbounded'> @@ -46,17 +46,17 @@ * <attribute name='Id' type='ID' use='optional'/> * <anyAttribute namespace="http://www.w3.org/XML/1998/namespace"/> * </complexType> - * + * } * * @author Axl Mattheus */ public interface EncryptionProperty { /** - * Returns the EncryptedType being described. + * Returns the {@code EncryptedType} being described. * - * @return the EncryptedType being described by this - * EncryptionProperty. + * @return the {@code EncryptedType} being described by this + * {@code EncryptionProperty}. */ String getTarget(); @@ -68,7 +68,7 @@ void setTarget(String target); /** - * Returns the id of the EncryptionProperty. + * Returns the id of the {@code EncryptionProperty}. * * @return the id. */ @@ -82,7 +82,7 @@ void setId(String id); /** - * Returns the attribute's value in the xml namespace. + * Returns the attribute's value in the {@code xml} namespace. * * @param attribute * @return the attribute's value. @@ -98,9 +98,9 @@ void setAttribute(String attribute, String value); /** - * Returns the properties of the EncryptionProperty. + * Returns the properties of the {@code EncryptionProperty}. * - * @return an Iterator over all the additional encryption + * @return an {@code Iterator} over all the additional encryption * information contained in this class. */ Iterator getEncryptionInformation(); --- old/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Reference.java 2015-08-18 14:21:16.885018252 +0400 +++ new/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Reference.java 2015-08-18 14:21:16.669018262 +0400 @@ -26,55 +26,55 @@ import org.w3c.dom.Element; /** - * A wrapper for a pointer from a key value of an EncryptedKey to - * items encrypted by that key value (EncryptedData or - * EncryptedKey elements). + * A wrapper for a pointer from a key value of an {@code EncryptedKey} to + * items encrypted by that key value ({@code EncryptedData} or + * {@code EncryptedKey} elements). *

* It is defined as follows: - *

+ * <pre>{@code * <complexType name='ReferenceType'> * <sequence> * <any namespace='##other' minOccurs='0' maxOccurs='unbounded'/> * </sequence> * <attribute name='URI' type='anyURI' use='required'/> * </complexType> - * + * } * * @author Axl Mattheus * @see ReferenceList */ public interface Reference { /** - * Returns the Element tag name for this Reference. + * Returns the {@code Element} tag name for this {@code Reference}. * - * @return the tag name of this Reference. + * @return the tag name of this {@code Reference}. */ String getType(); /** - * Returns a URI that points to an Element that + * Returns a {@code URI} that points to an {@code Element} that * were encrypted using the key defined in the enclosing - * EncryptedKey element. + * {@code EncryptedKey} element. * * @return an Uniform Resource Identifier that qualifies an - * EncryptedType. + * {@code EncryptedType}. */ String getURI(); /** - * Sets a URI that points to an Element that + * Sets a {@code URI} that points to an {@code Element} that * were encrypted using the key defined in the enclosing - * EncryptedKey element. + * {@code EncryptedKey} element. * * @param uri the Uniform Resource Identifier that qualifies an - * EncryptedType. + * {@code EncryptedType}. */ void setURI(String uri); /** - * Returns an Iterator over all the child elements contained in - * this Reference that will aid the recipient in retrieving the - * EncryptedKey and/or EncryptedData elements. + * Returns an {@code Iterator} over all the child elements contained in + * this {@code Reference} that will aid the recipient in retrieving the + * {@code EncryptedKey} and/or {@code EncryptedData} elements. * These could include information such as XPath transforms, decompression * transforms, or information on how to retrieve the elements from a * document storage facility. --- old/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/ReferenceList.java 2015-08-18 14:21:17.433018228 +0400 +++ new/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/ReferenceList.java 2015-08-18 14:21:17.221018237 +0400 @@ -25,12 +25,12 @@ import java.util.Iterator; /** - * ReferenceList is an element that contains pointers from a key - * value of an EncryptedKey to items encrypted by that key value - * (EncryptedData or EncryptedKey elements). + * {@code ReferenceList} is an element that contains pointers from a key + * value of an {@code EncryptedKey} to items encrypted by that key value + * ({@code EncryptedData} or {@code EncryptedKey} elements). *

* It is defined as follows: - *

+ * <pre>{@code * <element name='ReferenceList'> * <complexType> * <choice minOccurs='1' maxOccurs='unbounded'> @@ -39,7 +39,7 @@ * </choice> * </complexType> * </element> - * + * } * * @author Axl Mattheus * @see Reference @@ -56,54 +56,54 @@ * Adds a reference to this reference list. * * @param reference the reference to add. - * @throws IllegalAccessException if the Reference is not an - * instance of DataReference or KeyReference. + * @throws IllegalAccessException if the {@code Reference} is not an + * instance of {@code DataReference} or {@code KeyReference}. */ void add(Reference reference); /** - * Removes a reference from the ReferenceList. + * Removes a reference from the {@code ReferenceList}. * * @param reference the reference to remove. */ void remove(Reference reference); /** - * Returns the size of the ReferenceList. + * Returns the size of the {@code ReferenceList}. * - * @return the size of the ReferenceList. + * @return the size of the {@code ReferenceList}. */ int size(); /** - * Indicates if the ReferenceList is empty. + * Indicates if the {@code ReferenceList} is empty. * - * @return true if the ReferenceList is - * empty, else false. + * @return {@code true} if the {@code ReferenceList} is + * empty, else {@code false}. */ boolean isEmpty(); /** - * Returns an Iterator over all the References - * contained in this ReferenceList. + * Returns an {@code Iterator} over all the {@code Reference}s + * contained in this {@code ReferenceList}. * * @return Iterator. */ Iterator getReferences(); /** - * DataReference factory method. Returns a - * DataReference. + * {@code DataReference} factory method. Returns a + * {@code DataReference}. * @param uri - * @return a DataReference. + * @return a {@code DataReference}. */ Reference newDataReference(String uri); /** - * KeyReference factory method. Returns a - * KeyReference. + * {@code KeyReference} factory method. Returns a + * {@code KeyReference}. * @param uri - * @return a KeyReference. + * @return a {@code KeyReference}. */ Reference newKeyReference(String uri); } --- old/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Transforms.java 2015-08-18 14:21:18.029018201 +0400 +++ new/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Transforms.java 2015-08-18 14:21:17.813018210 +0400 @@ -23,16 +23,16 @@ package com.sun.org.apache.xml.internal.security.encryption; /** - * A container for ds:Transforms. + * A container for {@code ds:Transform}s. *

* It is defined as follows: - *

+ * <pre>{@code * <complexType name='TransformsType'> * <sequence> * <element ref='ds:Transform' maxOccurs='unbounded'/> * </sequence> * </complexType> - * + * } * * @author Axl Mattheus * @see com.sun.org.apache.xml.internal.security.encryption.CipherReference --- old/src/java.xml.crypto/share/classes/javax/xml/crypto/KeySelectorException.java 2015-08-18 14:21:18.593018175 +0400 +++ new/src/java.xml.crypto/share/classes/javax/xml/crypto/KeySelectorException.java 2015-08-18 14:21:18.377018185 +0400 @@ -33,8 +33,8 @@ /** * Indicates an exceptional condition thrown by a {@link KeySelector}. * - *

A KeySelectorException can contain a cause: another - * throwable that caused this KeySelectorException to get thrown. + *

A {@code KeySelectorException} can contain a cause: another + * throwable that caused this {@code KeySelectorException} to get thrown. * * @author Sean Mullan * @author JSR 105 Expert Group @@ -46,7 +46,7 @@ /** * The throwable that caused this exception to get thrown, or - * null if this exception was not caused by another throwable + * {@code null} if this exception was not caused by another throwable * or if the causative throwable is unknown. * * @serial @@ -54,15 +54,15 @@ private Throwable cause; /** - * Constructs a new KeySelectorException with - * null as its detail message. + * Constructs a new {@code KeySelectorException} with + * {@code null} as its detail message. */ public KeySelectorException() { super(); } /** - * Constructs a new KeySelectorException with the specified + * Constructs a new {@code KeySelectorException} with the specified * detail message. * * @param message the detail message @@ -72,14 +72,14 @@ } /** - * Constructs a new KeySelectorException with the + * Constructs a new {@code KeySelectorException} with the * specified detail message and cause. *

Note that the detail message associated with - * cause is not automatically incorporated in + * {@code cause} is not automatically incorporated in * this exception's detail message. * * @param message the detail message - * @param cause the cause (A null value is permitted, and + * @param cause the cause (A {@code null} value is permitted, and * indicates that the cause is nonexistent or unknown.) */ public KeySelectorException(String message, Throwable cause) { @@ -88,13 +88,13 @@ } /** - * Constructs a new KeySelectorException with the specified + * Constructs a new {@code KeySelectorException} with the specified * cause and a detail message of - * (cause==null ? null : cause.toString()) + * {@code (cause==null ? null : cause.toString())} * (which typically contains the class and detail message of - * cause). + * {@code cause}). * - * @param cause the cause (A null value is permitted, and + * @param cause the cause (A {@code null} value is permitted, and * indicates that the cause is nonexistent or unknown.) */ public KeySelectorException(Throwable cause) { @@ -103,20 +103,20 @@ } /** - * Returns the cause of this KeySelectorException or - * null if the cause is nonexistent or unknown. (The + * Returns the cause of this {@code KeySelectorException} or + * {@code null} if the cause is nonexistent or unknown. (The * cause is the throwable that caused this - * KeySelectorException to get thrown.) + * {@code KeySelectorException} to get thrown.) * - * @return the cause of this KeySelectorException or - * null if the cause is nonexistent or unknown. + * @return the cause of this {@code KeySelectorException} or + * {@code null} if the cause is nonexistent or unknown. */ public Throwable getCause() { return cause; } /** - * Prints this KeySelectorException, its backtrace and + * Prints this {@code KeySelectorException}, its backtrace and * the cause's backtrace to the standard error stream. */ public void printStackTrace() { @@ -125,10 +125,10 @@ } /** - * Prints this KeySelectorException, its backtrace and + * Prints this {@code KeySelectorException}, its backtrace and * the cause's backtrace to the specified print stream. * - * @param s PrintStream to use for output + * @param s {@code PrintStream} to use for output */ public void printStackTrace(PrintStream s) { super.printStackTrace(s); @@ -136,10 +136,10 @@ } /** - * Prints this KeySelectorException, its backtrace and + * Prints this {@code KeySelectorException}, its backtrace and * the cause's backtrace to the specified print writer. * - * @param s PrintWriter to use for output + * @param s {@code PrintWriter} to use for output */ public void printStackTrace(PrintWriter s) { super.printStackTrace(s); --- old/src/java.xml.crypto/share/classes/javax/xml/crypto/MarshalException.java 2015-08-18 14:21:19.141018151 +0400 +++ new/src/java.xml.crypto/share/classes/javax/xml/crypto/MarshalException.java 2015-08-18 14:21:18.929018160 +0400 @@ -39,8 +39,8 @@ * Indicates an exceptional condition that occurred during the XML * marshalling or unmarshalling process. * - *

A MarshalException can contain a cause: another - * throwable that caused this MarshalException to get thrown. + *

A {@code MarshalException} can contain a cause: another + * throwable that caused this {@code MarshalException} to get thrown. * * @author Sean Mullan * @author JSR 105 Expert Group @@ -62,15 +62,15 @@ private Throwable cause; /** - * Constructs a new MarshalException with - * null as its detail message. + * Constructs a new {@code MarshalException} with + * {@code null} as its detail message. */ public MarshalException() { super(); } /** - * Constructs a new MarshalException with the specified + * Constructs a new {@code MarshalException} with the specified * detail message. * * @param message the detail message @@ -80,14 +80,14 @@ } /** - * Constructs a new MarshalException with the + * Constructs a new {@code MarshalException} with the * specified detail message and cause. *

Note that the detail message associated with - * cause is not automatically incorporated in + * {@code cause} is not automatically incorporated in * this exception's detail message. * * @param message the detail message - * @param cause the cause (A null value is permitted, and + * @param cause the cause (A {@code null} value is permitted, and * indicates that the cause is nonexistent or unknown.) */ public MarshalException(String message, Throwable cause) { @@ -96,12 +96,11 @@ } /** - * Constructs a new MarshalException with the specified cause - * and a detail message of (cause==null ? null : cause.toString()) - * (which typically contains the class and detail message of - * cause). + * Constructs a new {@code MarshalException} with the specified cause + * and a detail message of {@code (cause==null ? null : cause.toString())} + * (which typically contains the class and detail message of {@code cause}). * - * @param cause the cause (A null value is permitted, and + * @param cause the cause (A {@code null} value is permitted, and * indicates that the cause is nonexistent or unknown.) */ public MarshalException(Throwable cause) { @@ -110,20 +109,20 @@ } /** - * Returns the cause of this MarshalException or - * null if the cause is nonexistent or unknown. (The + * Returns the cause of this {@code MarshalException} or + * {@code null} if the cause is nonexistent or unknown. (The * cause is the throwable that caused this - * MarshalException to get thrown.) + * {@code MarshalException} to get thrown.) * - * @return the cause of this MarshalException or - * null if the cause is nonexistent or unknown. + * @return the cause of this {@code MarshalException} or + * {@code null} if the cause is nonexistent or unknown. */ public Throwable getCause() { return cause; } /** - * Prints this MarshalException, its backtrace and + * Prints this {@code MarshalException}, its backtrace and * the cause's backtrace to the standard error stream. */ public void printStackTrace() { @@ -132,10 +131,10 @@ } /** - * Prints this MarshalException, its backtrace and + * Prints this {@code MarshalException}, its backtrace and * the cause's backtrace to the specified print stream. * - * @param s PrintStream to use for output + * @param s {@code PrintStream} to use for output */ public void printStackTrace(PrintStream s) { super.printStackTrace(s); @@ -143,10 +142,10 @@ } /** - * Prints this MarshalException, its backtrace and + * Prints this {@code MarshalException}, its backtrace and * the cause's backtrace to the specified print writer. * - * @param s PrintWriter to use for output + * @param s {@code PrintWriter} to use for output */ public void printStackTrace(PrintWriter s) { super.printStackTrace(s); --- old/src/java.xml.crypto/share/classes/javax/xml/crypto/NoSuchMechanismException.java 2015-08-18 14:21:19.693018126 +0400 +++ new/src/java.xml.crypto/share/classes/javax/xml/crypto/NoSuchMechanismException.java 2015-08-18 14:21:19.477018136 +0400 @@ -39,8 +39,8 @@ * This exception is thrown when a particular XML mechanism is requested but * is not available in the environment. * - *

A NoSuchMechanismException can contain a cause: another - * throwable that caused this NoSuchMechanismException to get + *

A {@code NoSuchMechanismException} can contain a cause: another + * throwable that caused this {@code NoSuchMechanismException} to get * thrown. * * @author Sean Mullan @@ -63,15 +63,15 @@ private Throwable cause; /** - * Constructs a new NoSuchMechanismException with - * null as its detail message. + * Constructs a new {@code NoSuchMechanismException} with + * {@code null} as its detail message. */ public NoSuchMechanismException() { super(); } /** - * Constructs a new NoSuchMechanismException with the + * Constructs a new {@code NoSuchMechanismException} with the * specified detail message. * * @param message the detail message @@ -81,14 +81,14 @@ } /** - * Constructs a new NoSuchMechanismException with the + * Constructs a new {@code NoSuchMechanismException} with the * specified detail message and cause. *

Note that the detail message associated with - * cause is not automatically incorporated in + * {@code cause} is not automatically incorporated in * this exception's detail message. * * @param message the detail message - * @param cause the cause (A null value is permitted, and + * @param cause the cause (A {@code null} value is permitted, and * indicates that the cause is nonexistent or unknown.) */ public NoSuchMechanismException(String message, Throwable cause) { @@ -97,12 +97,12 @@ } /** - * Constructs a new NoSuchMechanismException with the + * Constructs a new {@code NoSuchMechanismException} with the * specified cause and a detail message of - * (cause==null ? null : cause.toString()) (which typically - * contains the class and detail message of cause). + * {@code (cause==null ? null : cause.toString())} (which typically + * contains the class and detail message of {@code cause}). * - * @param cause the cause (A null value is permitted, and + * @param cause the cause (A {@code null} value is permitted, and * indicates that the cause is nonexistent or unknown.) */ public NoSuchMechanismException(Throwable cause) { @@ -111,20 +111,20 @@ } /** - * Returns the cause of this NoSuchMechanismException or - * null if the cause is nonexistent or unknown. (The + * Returns the cause of this {@code NoSuchMechanismException} or + * {@code null} if the cause is nonexistent or unknown. (The * cause is the throwable that caused this - * NoSuchMechanismException to get thrown.) + * {@code NoSuchMechanismException} to get thrown.) * - * @return the cause of this NoSuchMechanismException or - * null if the cause is nonexistent or unknown. + * @return the cause of this {@code NoSuchMechanismException} or + * {@code null} if the cause is nonexistent or unknown. */ public Throwable getCause() { return cause; } /** - * Prints this NoSuchMechanismException, its backtrace and + * Prints this {@code NoSuchMechanismException}, its backtrace and * the cause's backtrace to the standard error stream. */ public void printStackTrace() { @@ -133,10 +133,10 @@ } /** - * Prints this NoSuchMechanismException, its backtrace and + * Prints this {@code NoSuchMechanismException}, its backtrace and * the cause's backtrace to the specified print stream. * - * @param s PrintStream to use for output + * @param s {@code PrintStream} to use for output */ public void printStackTrace(PrintStream s) { super.printStackTrace(s); @@ -144,10 +144,10 @@ } /** - * Prints this NoSuchMechanismException, its backtrace and + * Prints this {@code NoSuchMechanismException}, its backtrace and * the cause's backtrace to the specified print writer. * - * @param s PrintWriter to use for output + * @param s {@code PrintWriter} to use for output */ public void printStackTrace(PrintWriter s) { super.printStackTrace(s); --- old/src/java.xml.crypto/share/classes/javax/xml/crypto/URIReferenceException.java 2015-08-18 14:21:20.241018101 +0400 +++ new/src/java.xml.crypto/share/classes/javax/xml/crypto/URIReferenceException.java 2015-08-18 14:21:20.029018111 +0400 @@ -35,8 +35,8 @@ * Indicates an exceptional condition thrown while dereferencing a * {@link URIReference}. * - *

A URIReferenceException can contain a cause: another - * throwable that caused this URIReferenceException to get thrown. + *

A {@code URIReferenceException} can contain a cause: another + * throwable that caused this {@code URIReferenceException} to get thrown. * * @author Sean Mullan * @author JSR 105 Expert Group @@ -60,15 +60,15 @@ private URIReference uriReference; /** - * Constructs a new URIReferenceException with - * null as its detail message. + * Constructs a new {@code URIReferenceException} with + * {@code null} as its detail message. */ public URIReferenceException() { super(); } /** - * Constructs a new URIReferenceException with the specified + * Constructs a new {@code URIReferenceException} with the specified * detail message. * * @param message the detail message @@ -78,14 +78,14 @@ } /** - * Constructs a new URIReferenceException with the + * Constructs a new {@code URIReferenceException} with the * specified detail message and cause. *

Note that the detail message associated with - * cause is not automatically incorporated in + * {@code cause} is not automatically incorporated in * this exception's detail message. * * @param message the detail message - * @param cause the cause (A null value is permitted, and + * @param cause the cause (A {@code null} value is permitted, and * indicates that the cause is nonexistent or unknown.) */ public URIReferenceException(String message, Throwable cause) { @@ -94,19 +94,19 @@ } /** - * Constructs a new URIReferenceException with the - * specified detail message, cause and URIReference. + * Constructs a new {@code URIReferenceException} with the + * specified detail message, cause and {@code URIReference}. *

Note that the detail message associated with - * cause is not automatically incorporated in + * {@code cause} is not automatically incorporated in * this exception's detail message. * * @param message the detail message - * @param cause the cause (A null value is permitted, and + * @param cause the cause (A {@code null} value is permitted, and * indicates that the cause is nonexistent or unknown.) - * @param uriReference the URIReference that was being + * @param uriReference the {@code URIReference} that was being * dereferenced when the error was encountered - * @throws NullPointerException if uriReference is - * null + * @throws NullPointerException if {@code uriReference} is + * {@code null} */ public URIReferenceException(String message, Throwable cause, URIReference uriReference) { @@ -118,12 +118,12 @@ } /** - * Constructs a new URIReferenceException with the specified - * cause and a detail message of (cause==null ? null : - * cause.toString()) (which typically contains the class and detail - * message of cause). + * Constructs a new {@code URIReferenceException} with the specified + * cause and a detail message of {@code (cause==null ? null : + * cause.toString())} (which typically contains the class and detail + * message of {@code cause}). * - * @param cause the cause (A null value is permitted, and + * @param cause the cause (A {@code null} value is permitted, and * indicates that the cause is nonexistent or unknown.) */ public URIReferenceException(Throwable cause) { @@ -132,31 +132,31 @@ } /** - * Returns the URIReference that was being dereferenced + * Returns the {@code URIReference} that was being dereferenced * when the exception was thrown. * - * @return the URIReference that was being dereferenced - * when the exception was thrown, or null if not specified + * @return the {@code URIReference} that was being dereferenced + * when the exception was thrown, or {@code null} if not specified */ public URIReference getURIReference() { return uriReference; } /** - * Returns the cause of this URIReferenceException or - * null if the cause is nonexistent or unknown. (The + * Returns the cause of this {@code URIReferenceException} or + * {@code null} if the cause is nonexistent or unknown. (The * cause is the throwable that caused this - * URIReferenceException to get thrown.) + * {@code URIReferenceException} to get thrown.) * - * @return the cause of this URIReferenceException or - * null if the cause is nonexistent or unknown. + * @return the cause of this {@code URIReferenceException} or + * {@code null} if the cause is nonexistent or unknown. */ public Throwable getCause() { return cause; } /** - * Prints this URIReferenceException, its backtrace and + * Prints this {@code URIReferenceException}, its backtrace and * the cause's backtrace to the standard error stream. */ public void printStackTrace() { @@ -165,10 +165,10 @@ } /** - * Prints this URIReferenceException, its backtrace and + * Prints this {@code URIReferenceException}, its backtrace and * the cause's backtrace to the specified print stream. * - * @param s PrintStream to use for output + * @param s {@code PrintStream} to use for output */ public void printStackTrace(PrintStream s) { super.printStackTrace(s); @@ -176,10 +176,10 @@ } /** - * Prints this URIReferenceException, its backtrace and + * Prints this {@code URIReferenceException}, its backtrace and * the cause's backtrace to the specified print writer. * - * @param s PrintWriter to use for output + * @param s {@code PrintWriter} to use for output */ public void printStackTrace(PrintWriter s) { super.printStackTrace(s); --- old/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/TransformException.java 2015-08-18 14:21:20.805018076 +0400 +++ new/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/TransformException.java 2015-08-18 14:21:20.593018086 +0400 @@ -34,8 +34,8 @@ * Indicates an exceptional condition that occurred while executing a * transform algorithm. * - *

A TransformException can contain a cause: another - * throwable that caused this TransformException to get thrown. + *

A {@code TransformException} can contain a cause: another + * throwable that caused this {@code TransformException} to get thrown. * * @see Transform#transform * @author Sean Mullan @@ -56,15 +56,15 @@ private Throwable cause; /** - * Constructs a new TransformException with - * null as its detail message. + * Constructs a new {@code TransformException} with + * {@code null} as its detail message. */ public TransformException() { super(); } /** - * Constructs a new TransformException with the specified + * Constructs a new {@code TransformException} with the specified * detail message. * * @param message the detail message @@ -74,14 +74,14 @@ } /** - * Constructs a new TransformException with the + * Constructs a new {@code TransformException} with the * specified detail message and cause. *

Note that the detail message associated with - * cause is not automatically incorporated in + * {@code cause} is not automatically incorporated in * this exception's detail message. * * @param message the detail message - * @param cause the cause (A null value is permitted, and + * @param cause the cause (A {@code null} value is permitted, and * indicates that the cause is nonexistent or unknown.) */ public TransformException(String message, Throwable cause) { @@ -90,13 +90,13 @@ } /** - * Constructs a new TransformException with the specified + * Constructs a new {@code TransformException} with the specified * cause and a detail message of - * (cause==null ? null : cause.toString()) + * {@code (cause==null ? null : cause.toString())} * (which typically contains the class and detail message of - * cause). + * {@code cause}). * - * @param cause the cause (A null value is permitted, and + * @param cause the cause (A {@code null} value is permitted, and * indicates that the cause is nonexistent or unknown.) */ public TransformException(Throwable cause) { @@ -105,20 +105,20 @@ } /** - * Returns the cause of this TransformException or - * null if the cause is nonexistent or unknown. (The + * Returns the cause of this {@code TransformException} or + * {@code null} if the cause is nonexistent or unknown. (The * cause is the throwable that caused this - * TransformException to get thrown.) + * {@code TransformException} to get thrown.) * - * @return the cause of this TransformException or - * null if the cause is nonexistent or unknown. + * @return the cause of this {@code TransformException} or + * {@code null} if the cause is nonexistent or unknown. */ public Throwable getCause() { return cause; } /** - * Prints this TransformException, its backtrace and + * Prints this {@code TransformException}, its backtrace and * the cause's backtrace to the standard error stream. */ public void printStackTrace() { @@ -129,10 +129,10 @@ } /** - * Prints this TransformException, its backtrace and + * Prints this {@code TransformException}, its backtrace and * the cause's backtrace to the specified print stream. * - * @param s PrintStream to use for output + * @param s {@code PrintStream} to use for output */ public void printStackTrace(PrintStream s) { super.printStackTrace(s); @@ -142,10 +142,10 @@ } /** - * Prints this TransformException, its backtrace and + * Prints this {@code TransformException}, its backtrace and * the cause's backtrace to the specified print writer. * - * @param s PrintWriter to use for output + * @param s {@code PrintWriter} to use for output */ public void printStackTrace(PrintWriter s) { super.printStackTrace(s); --- old/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignatureException.java 2015-08-18 14:21:21.353018052 +0400 +++ new/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignatureException.java 2015-08-18 14:21:21.141018061 +0400 @@ -34,8 +34,8 @@ * Indicates an exceptional condition that occurred during the XML * signature generation or validation process. * - *

An XMLSignatureException can contain a cause: another - * throwable that caused this XMLSignatureException to get thrown. + *

An {@code XMLSignatureException} can contain a cause: another + * throwable that caused this {@code XMLSignatureException} to get thrown. * * @since 1.6 */ @@ -53,15 +53,15 @@ private Throwable cause; /** - * Constructs a new XMLSignatureException with - * null as its detail message. + * Constructs a new {@code XMLSignatureException} with + * {@code null} as its detail message. */ public XMLSignatureException() { super(); } /** - * Constructs a new XMLSignatureException with the specified + * Constructs a new {@code XMLSignatureException} with the specified * detail message. * * @param message the detail message @@ -71,14 +71,14 @@ } /** - * Constructs a new XMLSignatureException with the + * Constructs a new {@code XMLSignatureException} with the * specified detail message and cause. *

Note that the detail message associated with - * cause is not automatically incorporated in + * {@code cause} is not automatically incorporated in * this exception's detail message. * * @param message the detail message - * @param cause the cause (A null value is permitted, and + * @param cause the cause (A {@code null} value is permitted, and * indicates that the cause is nonexistent or unknown.) */ public XMLSignatureException(String message, Throwable cause) { @@ -87,13 +87,13 @@ } /** - * Constructs a new XMLSignatureException with the specified + * Constructs a new {@code XMLSignatureException} with the specified * cause and a detail message of - * (cause==null ? null : cause.toString()) + * {@code (cause==null ? null : cause.toString())} * (which typically contains the class and detail message of - * cause). + * {@code cause}). * - * @param cause the cause (A null value is permitted, and + * @param cause the cause (A {@code null} value is permitted, and * indicates that the cause is nonexistent or unknown.) */ public XMLSignatureException(Throwable cause) { @@ -102,20 +102,20 @@ } /** - * Returns the cause of this XMLSignatureException or - * null if the cause is nonexistent or unknown. (The + * Returns the cause of this {@code XMLSignatureException} or + * {@code null} if the cause is nonexistent or unknown. (The * cause is the throwable that caused this - * XMLSignatureException to get thrown.) + * {@code XMLSignatureException} to get thrown.) * - * @return the cause of this XMLSignatureException or - * null if the cause is nonexistent or unknown. + * @return the cause of this {@code XMLSignatureException} or + * {@code null} if the cause is nonexistent or unknown. */ public Throwable getCause() { return cause; } /** - * Prints this XMLSignatureException, its backtrace and + * Prints this {@code XMLSignatureException}, its backtrace and * the cause's backtrace to the standard error stream. */ public void printStackTrace() { @@ -126,10 +126,10 @@ } /** - * Prints this XMLSignatureException, its backtrace and + * Prints this {@code XMLSignatureException}, its backtrace and * the cause's backtrace to the specified print stream. * - * @param s PrintStream to use for output + * @param s {@code PrintStream} to use for output */ public void printStackTrace(PrintStream s) { super.printStackTrace(s); @@ -139,10 +139,10 @@ } /** - * Prints this XMLSignatureException, its backtrace and + * Prints this {@code XMLSignatureException}, its backtrace and * the cause's backtrace to the specified print writer. * - * @param s PrintWriter to use for output + * @param s {@code PrintWriter} to use for output */ public void printStackTrace(PrintWriter s) { super.printStackTrace(s); --- old/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeCipher.java 2015-08-18 14:21:21.985018023 +0400 +++ new/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeCipher.java 2015-08-18 14:21:21.753018034 +0400 @@ -474,7 +474,7 @@ /** * calls ucrypto_encrypt_update(...) or ucrypto_decrypt_update(...) - * @returns the length of output or if negative, an error status code + * @return the length of output or if negative, an error status code */ private native static int nativeUpdate(long pContext, boolean encrypt, byte[] in, int inOfs, int inLen, @@ -482,7 +482,7 @@ /** * calls ucrypto_encrypt_final(...) or ucrypto_decrypt_final(...) - * @returns the length of output or if negative, an error status code + * @return the length of output or if negative, an error status code */ native static int nativeFinal(long pContext, boolean encrypt, byte[] out, int outOfs); --- old/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSACipher.java 2015-08-18 14:21:22.537017998 +0400 +++ new/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSACipher.java 2015-08-18 14:21:22.321018008 +0400 @@ -377,7 +377,7 @@ /** * calls ucrypto_encrypt(...) or ucrypto_decrypt(...) - * @returns the length of output or an negative error status code + * @return the length of output or an negative error status code */ private native static int nativeAtomic(int mech, boolean encrypt, long keyValue, int keyLength, --- old/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSASignature.java 2015-08-18 14:21:23.085017974 +0400 +++ new/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSASignature.java 2015-08-18 14:21:22.869017983 +0400 @@ -353,20 +353,20 @@ /** * calls ucrypto_sign_update(...) or ucrypto_verify_update(...) - * @returns an error status code (0 means SUCCESS) + * @return an error status code (0 means SUCCESS) */ private native static int nativeUpdate(long pContext, boolean sign, byte[] in, int inOfs, int inLen); /** * calls ucrypto_sign_update(...) or ucrypto_verify_update(...) - * @returns an error status code (0 means SUCCESS) + * @return an error status code (0 means SUCCESS) */ private native static int nativeUpdate(long pContext, boolean sign, long pIn, int inLen); /** * calls ucrypto_sign_final(...) or ucrypto_verify_final(...) - * @returns the length of signature bytes or verification status. + * @return the length of signature bytes or verification status. * If negative, it indicates an error status code */ private native static int nativeFinal(long pContext, boolean sign, --- old/src/jdk.jartool/share/classes/com/sun/jarsigner/package-info.java 2015-08-18 14:21:23.653017948 +0400 +++ new/src/jdk.jartool/share/classes/com/sun/jarsigner/package-info.java 2015-08-18 14:21:23.421017959 +0400 @@ -24,9 +24,9 @@ */ /** * This package comprises the interfaces and classes used to define the - * signing mechanism used by the jarsigner tool. + * signing mechanism used by the {@code jarsigner} tool. *

- * Clients may override the default signing mechanism of the jarsigner + * Clients may override the default signing mechanism of the {@code jarsigner} * tool by supplying an alternative implementation of * {@link com.sun.jarsigner.ContentSigner}. * --- old/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java 2015-08-18 14:21:24.221017923 +0400 +++ new/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java 2015-08-18 14:21:23.985017933 +0400 @@ -141,9 +141,9 @@ /** * Examine the certificate for a Subject Information Access extension * (RFC 5280). - * The extension's accessMethod field should contain the object + * The extension's {@code accessMethod} field should contain the object * identifier defined for timestamping: 1.3.6.1.5.5.7.48.3 and its - * accessLocation field should contain an HTTP or HTTPS URL. + * {@code accessLocation} field should contain an HTTP or HTTPS URL. * * @param tsaCertificate An X.509 certificate for the TSA. * @return An HTTP or HTTPS URI or null if none was found.