harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r543463 - in /harmony/enhanced/classlib/trunk: ./ modules/security/src/main/java/common/org/apache/harmony/security/asn1/ modules/security/src/main/java/common/org/apache/harmony/security/provider/crypto/ modules/security/src/main/java/comm...
Date Fri, 01 Jun 2007 11:37:27 GMT
Author: tellison
Date: Fri Jun  1 04:37:26 2007
New Revision: 543463

URL: http://svn.apache.org/viewvc?view=rev&rev=543463
Log:
Apply patch HARMONY-3998 ([classlib] [security] Updated Javadoc for various security classes)

Modified:
    harmony/enhanced/classlib/trunk/THIRD_PARTY_NOTICES.txt
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1GeneralizedTime.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1UTCTime.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/crypto/DSAKeyFactoryImpl.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/AlgNameMapper.java

Modified: harmony/enhanced/classlib/trunk/THIRD_PARTY_NOTICES.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/THIRD_PARTY_NOTICES.txt?view=diff&rev=543463&r1=543462&r2=543463
==============================================================================
--- harmony/enhanced/classlib/trunk/THIRD_PARTY_NOTICES.txt (original)
+++ harmony/enhanced/classlib/trunk/THIRD_PARTY_NOTICES.txt Fri Jun  1 04:37:26 2007
@@ -495,6 +495,57 @@
    MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
 
 
+Portions of Apache Harmony reference RFC 3161 - Internet X.509 Public Key 
+Infrastructure Time-Stamp Protocol (TSP). Portions of RFC 3161 are included 
+in Harmony Javadoc for reference, and in accordance with the licensing terms 
+for RFC 3161, the full copyright statement is here:
+
+
+   Copyright (C) The Internet Society (2001).  All Rights Reserved.
+
+   This document and translations of it may be copied and furnished to
+   others, and derivative works that comment on or otherwise explain it
+   or assist in its implementation may be prepared, copied, published
+   and distributed, in whole or in part, without restriction of any
+   kind, provided that the above copyright notice and this paragraph are
+   included on all such copies and derivative works.  However, this
+   document itself may not be modified in any way, such as by removing
+   the copyright notice or references to the Internet Society or other
+   Internet organizations, except as needed for the purpose of
+   developing Internet standards in which case the procedures for
+   copyrights defined in the Internet Standards process must be
+   followed, or as required to translate it into languages other than
+   English.
+
+   The limited permissions granted above are perpetual and will not be
+   revoked by the Internet Society or its successors or assigns.
+
+   This document and the information contained herein is provided on an
+   "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+   TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+   BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+   HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+
+===============================================================================
+===============================================================================
+
+
+Notice for RSA Public-Key Cryptography Standards 
+================================================
+
+Portions of Apache Harmony reference RSA Public-Key Cryptography Standards:
+PKCS#7, PKCS#8 and PKSC#10. Portions of these standards are included 
+in Harmony Javadoc for reference, and in accordance with the licensing terms 
+for PKCS#7, PKCS#8 and PKSC#10, the full copyright statement is here:
+
+Copyright © 1991-1993 RSA Laboratories, a division of RSA Data Security, Inc.
+License to copy this document is granted provided that it is identified as
+"RSA Data Security, Inc. Public-Key Cryptography Standards (PKCS)" in all
+material mentioning or referencing this document.
+
+
 ===============================================================================
 ===============================================================================
 
@@ -548,5 +599,6 @@
 
 Navigate to the version of ECJ used in this distribution, and the source is
 provided in a ZIP file in the section titled "JDT Core Batch Compiler".
+
 
 

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1GeneralizedTime.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1GeneralizedTime.java?view=diff&rev=543463&r1=543462&r2=543463
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1GeneralizedTime.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1GeneralizedTime.java
Fri Jun  1 04:37:26 2007
@@ -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
  */
 

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1UTCTime.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1UTCTime.java?view=diff&rev=543463&r1=543462&r2=543463
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1UTCTime.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1UTCTime.java
Fri Jun  1 04:37:26 2007
@@ -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 {

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/crypto/DSAKeyFactoryImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/crypto/DSAKeyFactoryImpl.java?view=diff&rev=543463&r1=543462&r2=543463
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/crypto/DSAKeyFactoryImpl.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/crypto/DSAKeyFactoryImpl.java
Fri Jun  1 04:37:26 2007
@@ -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 extends KeySpec> T engineGetKeySpec(Key key, Class<T> keySpec)
             throws InvalidKeySpecException {

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/AlgNameMapper.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/AlgNameMapper.java?view=diff&rev=543463&r1=543462&r2=543463
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/AlgNameMapper.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/AlgNameMapper.java
Fri Jun  1 04:37:26 2007
@@ -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 {
     



Mime
View raw message