Index: src/main/java/common/org/apache/harmony/security/asn1/ASN1GeneralizedTime.java =================================================================== --- src/main/java/common/org/apache/harmony/security/asn1/ASN1GeneralizedTime.java (revision 494820) +++ src/main/java/common/org/apache/harmony/security/asn1/ASN1GeneralizedTime.java (working copy) @@ -30,9 +30,6 @@ /** * This class represents ASN.1 GeneralizedTime type. * - * According to X.680 specification this type is defined as follows: - * GeneralizedTime ::= [UNIVERSAL 24] IMPLICIT VisibleString - * * @see http://asn1.elibel.tm.fr/en/standards/index.htm */ Index: src/main/java/common/org/apache/harmony/security/asn1/ASN1UTCTime.java =================================================================== --- src/main/java/common/org/apache/harmony/security/asn1/ASN1UTCTime.java (revision 494820) +++ src/main/java/common/org/apache/harmony/security/asn1/ASN1UTCTime.java (working copy) @@ -30,9 +30,6 @@ /** * This class represents ASN.1 UTCTime type * - * According to X.680 specification this type is defined as follows: - * UTCTime ::= [UNIVERSAL 23] IMPLICIT VisibleString - * * @see http://asn1.elibel.tm.fr/en/standards/index.htm */ public class ASN1UTCTime extends ASN1Time { Index: src/main/java/common/org/apache/harmony/security/provider/crypto/DSAKeyFactoryImpl.java =================================================================== --- src/main/java/common/org/apache/harmony/security/provider/crypto/DSAKeyFactoryImpl.java (revision 542786) +++ src/main/java/common/org/apache/harmony/security/provider/crypto/DSAKeyFactoryImpl.java (working copy) @@ -38,7 +38,7 @@ public class DSAKeyFactoryImpl extends KeyFactorySpi { /** - * The method generates a DSAPrivateKey object from the provided key specification. + * This method generates a DSAPrivateKey object from the provided key specification. * * @param * keySpec - the specification (key material) for the DSAPrivateKey. @@ -66,7 +66,7 @@ } /** - * The method generates a DSAPublicKey object from the provided key specification. + * This method generates a DSAPublicKey object from the provided key specification. * * @param * keySpec - the specification (key material) for the DSAPublicKey. @@ -92,28 +92,23 @@ } throw new InvalidKeySpecException(Messages.getString("security.19D")); //$NON-NLS-1$ } - + /** - * The method returns a specification (key material) of the given key object. - * 'keySpec' identifies the specification class - * in which the key material should be returned. - * - * If it is DSAPublicKeySpec.class, the key material should be returned - * in an instance of the DSAPublicKeySpec class; - * if it is DSAPrivateKeySpec.class, the key material should be returned - * in an instance of the DSAPrivateKeySpec class. - * - * @param - * key - either DSAPrivateKey or DSAPublicKey - * @param - * keySpec - either DSAPublicKeySpec.class or DSAPublicKeySpec.class - * - * @return - * either DSAPublicKeySpec object or DSAPublicKeySpec object - * + * This method returns a specification for the supplied key. + * + * The specification will be returned in the form of an object of the type + * specified by keySpec. + * + * @param key - + * either DSAPrivateKey or DSAPublicKey + * @param keySpec - + * either DSAPrivateKeySpec.class or DSAPublicKeySpec.class + * + * @return either a DSAPrivateKeySpec or a DSAPublicKeySpec + * * @throws InvalidKeySpecException - * if "keySpec" is not s specification for DSAPublicKey or DSAPrivateKey - * + * if "keySpec" is not a specification for DSAPublicKey or + * DSAPrivateKey */ protected T engineGetKeySpec(Key key, Class keySpec) throws InvalidKeySpecException { Index: src/main/java/common/org/apache/harmony/security/utils/AlgNameMapper.java =================================================================== --- src/main/java/common/org/apache/harmony/security/utils/AlgNameMapper.java (revision 494820) +++ src/main/java/common/org/apache/harmony/security/utils/AlgNameMapper.java (working copy) @@ -32,40 +32,9 @@ import org.apache.harmony.security.asn1.ObjectIdentifier; /** - * Provides Algorithm Name to OID - * and OID to Algorithm Name mappings. - * Some known mappings are hardcoded. - * Tries to obtain additional mappings - * from installed providers during initialization. - * - * Hardcoded mappings - * (source: http://asn1.elibel.tm.fr): - * - * 1.2.840.10040.4.1 -> DSA - * - * 1.2.840.113549.1.1.1 -> RSA - * - * 1.2.840.113549.1.3.1 -> DiffieHellman - * - * 1.2.840.113549.1.5.3 -> PBEWithMD5AndDES - * - * 1.2.840.113549.1.12.1.3 -> pbeWithSHAAnd3-KeyTripleDES-CBC - * 1.2.840.113549.1.12.1.3 -> PBEWithSHA1AndDESede - * 1.2.840.113549.1.12.1.3 -> PBEWithSHA1AndTripleDES - * - * 1.2.840.113549.1.12.1.6 -> pbeWithSHAAnd40BitRC2-CBC - * 1.2.840.113549.1.12.1.6 -> PBEWithSHA1AndRC2_40 - * - * 1.2.840.113549.3.2 -> RC2-CBC - * 1.2.840.113549.3.3 -> RC2-EBC - * 1.2.840.113549.3.4 -> RC4 - * 1.2.840.113549.3.5 -> RC4WithMAC - * 1.2.840.113549.3.6 -> DESx-CBC - * 1.2.840.113549.3.7 -> TripleDES-CBC - * 1.2.840.113549.3.8 -> rc5CBC - * 1.2.840.113549.3.9 -> RC5-CBC - * 1.2.840.113549.3.10 -> DESCDMF (CDMFCBCPad) - * + * Provides Algorithm Name to OID and OID to Algorithm Name mappings. Some known + * mappings are hardcoded. Tries to obtain additional mappings from installed + * providers during initialization. */ public class AlgNameMapper {