harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r446485 - in /incubator/harmony/enhanced/classlib/trunk/modules/crypto: .settings/ META-INF/ make/ src/main/java/javax/crypto/ src/main/java/javax/crypto/interfaces/ src/main/java/javax/crypto/spec/ src/main/java/org/apache/harmony/crypto/i...
Date Fri, 15 Sep 2006 02:57:47 GMT
Author: ndbeyer
Date: Thu Sep 14 19:57:41 2006
New Revision: 446485

URL: http://svn.apache.org/viewvc?view=rev&rev=446485
Log:
Set eol-style = native for crypto module.

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/.settings/org.eclipse.jdt.core.prefs   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/.settings/org.eclipse.jdt.ui.prefs   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/.settings/org.eclipse.pde.core.prefs   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/META-INF/MANIFEST.MF   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/hyproperties.xml   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/patternset.txt   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/BadPaddingException.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/CipherOutputStream.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/CipherSpi.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/ExemptionMechanism.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/ExemptionMechanismException.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/ExemptionMechanismSpi.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/IllegalBlockSizeException.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/KeyAgreement.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/KeyAgreementSpi.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/KeyGenerator.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/KeyGeneratorSpi.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Mac.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/MacSpi.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/NoSuchPaddingException.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/NullCipher.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/SealedObject.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/SecretKey.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/SecretKeyFactory.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/SecretKeyFactorySpi.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/ShortBufferException.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/interfaces/DHKey.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/interfaces/DHPrivateKey.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/interfaces/DHPublicKey.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/interfaces/PBEKey.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/DESKeySpec.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/DESedeKeySpec.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/DHGenParameterSpec.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/DHParameterSpec.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/DHPrivateKeySpec.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/DHPublicKeySpec.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/IvParameterSpec.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/OAEPParameterSpec.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/PBEKeySpec.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/PBEParameterSpec.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/PSource.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/RC2ParameterSpec.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/RC5ParameterSpec.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/SecretKeySpec.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/internal/NullCipherSpi.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/utils/AlgNameMapper.java   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherInputStreamTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherOutputStreamTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherSpiTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/ExemptionMechanismSpiTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/KeyAgreementSpiTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/KeyGeneratorSpiTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/MacSpiTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/SealedObjectTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/SecretKeyFactorySpiTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/spec/PSourceTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/BadPaddingExceptionTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStreamTest.java   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/CipherTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismExceptionTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/IllegalBlockSizeExceptionTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/NoSuchPaddingExceptionTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/NullCipherTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ShortBufferExceptionTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPrivateKeyTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPublicKeyTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/PBEKeyTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESKeySpecTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESedeKeySpecTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHGenParameterSpecTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHParameterSpecTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPrivateKeySpecTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPublicKeySpecTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/IvParameterSpecTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/OAEPParameterSpecTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEParameterSpecTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java.injected/org/apache/harmony/crypto/internal/NullCipherSpiTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/Cipher_Impl1Test.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/Cipher_ImplTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfo_ImplTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanism_ImplTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_Impl1Test.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_ImplTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGenerator_ImplTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/Mac_ImplTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactory_Impl1Test.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactory_ImplTest.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/utils/AlgNameMapperTest.java   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/resources/hyts_des-ede3-cbc.test1.plaintext   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/support/common/java/org/apache/harmony/crypto/tests/support/EncryptedPrivateKeyInfoData.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/support/common/java/org/apache/harmony/crypto/tests/support/MyCipher.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/support/common/java/org/apache/harmony/crypto/tests/support/MyExemptionMechanismSpi.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/support/common/java/org/apache/harmony/crypto/tests/support/MyKeyAgreementSpi.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/support/common/java/org/apache/harmony/crypto/tests/support/MyKeyGeneratorSpi.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/support/common/java/org/apache/harmony/crypto/tests/support/MyMacSpi.java   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/support/common/java/org/apache/harmony/crypto/tests/support/MySecretKeyFactorySpi.java   (props changed)

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/.settings/org.eclipse.jdt.core.prefs?view=diff&rev=446485&r1=446484&r2=446485
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/.settings/org.eclipse.jdt.core.prefs (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/.settings/org.eclipse.jdt.core.prefs Thu Sep 14 19:57:41 2006
@@ -1,12 +1,12 @@
-#Wed May 03 13:10:22 BST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+#Wed May 03 13:10:22 BST 2006
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/.settings/org.eclipse.jdt.core.prefs
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/.settings/org.eclipse.jdt.ui.prefs
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/.settings/org.eclipse.jdt.ui.prefs?view=diff&rev=446485&r1=446484&r2=446485
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/.settings/org.eclipse.jdt.ui.prefs (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/.settings/org.eclipse.jdt.ui.prefs Thu Sep 14 19:57:41 2006
@@ -1,3 +1,3 @@
-#Wed May 03 13:10:00 BST 2006
-eclipse.preferences.version=1
-internal.default.compliance=user
+#Wed May 03 13:10:00 BST 2006
+eclipse.preferences.version=1
+internal.default.compliance=user

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/.settings/org.eclipse.jdt.ui.prefs
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/.settings/org.eclipse.pde.core.prefs
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/.settings/org.eclipse.pde.core.prefs?view=diff&rev=446485&r1=446484&r2=446485
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/.settings/org.eclipse.pde.core.prefs (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/.settings/org.eclipse.pde.core.prefs Thu Sep 14 19:57:41 2006
@@ -1,4 +1,4 @@
-#Wed Apr 05 18:10:17 BST 2006
-eclipse.preferences.version=1
-pluginProject.equinox=false
-pluginProject.extensions=false
+#Wed Apr 05 18:10:17 BST 2006
+eclipse.preferences.version=1
+pluginProject.equinox=false
+pluginProject.extensions=false

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/.settings/org.eclipse.pde.core.prefs
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/META-INF/MANIFEST.MF?view=diff&rev=446485&r1=446484&r2=446485
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/META-INF/MANIFEST.MF (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/META-INF/MANIFEST.MF Thu Sep 14 19:57:41 2006
@@ -1,27 +1,27 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Harmony Crypto
-Bundle-SymbolicName: org.apache.harmony.crypto
-Bundle-Version: 1.0.0
-Bundle-ClassPath: .
-Eclipse-JREBundle: true
-Import-Package: java.io,
- java.lang,
- java.math,
- java.nio,
- java.security,
- java.security.cert,
- java.security.spec,
- java.util,
- org.apache.harmony.kernel.vm,
- org.apache.harmony.security;resolution:=optional,
- org.apache.harmony.security.asn1,
- org.apache.harmony.security.fortress,
- org.apache.harmony.security.tests.support;hy_usage=test;resolution:=optional,
- org.apache.harmony.security.x509,
- org.apache.harmony.testframework.serialization;hy_usage=test;resolution:=optional,
- tests.support.resource;hy_usage=test;resolution:=optional
-Export-Package: javax.crypto,
- javax.crypto.interfaces,
- javax.crypto.spec,
- org.apache.harmony.crypto.utils;version="1.0.0"
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Harmony Crypto
+Bundle-SymbolicName: org.apache.harmony.crypto
+Bundle-Version: 1.0.0
+Bundle-ClassPath: .
+Eclipse-JREBundle: true
+Import-Package: java.io,
+ java.lang,
+ java.math,
+ java.nio,
+ java.security,
+ java.security.cert,
+ java.security.spec,
+ java.util,
+ org.apache.harmony.kernel.vm,
+ org.apache.harmony.security;resolution:=optional,
+ org.apache.harmony.security.asn1,
+ org.apache.harmony.security.fortress,
+ org.apache.harmony.security.tests.support;hy_usage=test;resolution:=optional,
+ org.apache.harmony.security.x509,
+ org.apache.harmony.testframework.serialization;hy_usage=test;resolution:=optional,
+ tests.support.resource;hy_usage=test;resolution:=optional
+Export-Package: javax.crypto,
+ javax.crypto.interfaces,
+ javax.crypto.spec,
+ org.apache.harmony.crypto.utils;version="1.0.0"

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/hyproperties.xml?view=diff&rev=446485&r1=446484&r2=446485
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/hyproperties.xml Thu Sep 14 19:57:41 2006
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
-  
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<hy>
-   <crypto location=".">
-      <src>
-         <main>
-            <java location="src/main/java" />
-        	<resources location="src/main/resources" />
-         </main>
-         <test location="src/test">
-            <resources location="src/test/resources" />
-         </test>
-         <natives location="src/natives" />
-      </src>
-      <bin>
-        <main location="bin/main" />
-        <test location="bin/test" />
-      </bin>
-      <packaging>
-        <jarname>crypto</jarname>
-      </packaging>
-   </crypto>
-
-   <hdk location="../../deploy" />
-   <jdk location="../../deploy/jdk" />
-   <build location="../../build/classes" />
-
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
-</hy>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
+  
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<hy>
+   <crypto location=".">
+      <src>
+         <main>
+            <java location="src/main/java" />
+        	<resources location="src/main/resources" />
+         </main>
+         <test location="src/test">
+            <resources location="src/test/resources" />
+         </test>
+         <natives location="src/natives" />
+      </src>
+      <bin>
+        <main location="bin/main" />
+        <test location="bin/test" />
+      </bin>
+      <packaging>
+        <jarname>crypto</jarname>
+      </packaging>
+   </crypto>
+
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
+   <build location="../../build/classes" />
+
+   <tests>
+      <reports location="../../build/test_report" />
+   </tests>
+</hy>

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/hyproperties.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/patternset.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/BadPaddingException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/CipherOutputStream.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/CipherSpi.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/ExemptionMechanism.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/ExemptionMechanismException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/ExemptionMechanismSpi.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/IllegalBlockSizeException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/KeyAgreement.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/KeyAgreementSpi.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/KeyGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/KeyGeneratorSpi.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/Mac.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/MacSpi.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/NoSuchPaddingException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/NullCipher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/SealedObject.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/SecretKey.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/SecretKeyFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/SecretKeyFactorySpi.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/ShortBufferException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/interfaces/DHKey.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/interfaces/DHPrivateKey.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/interfaces/DHPublicKey.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/interfaces/PBEKey.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/DESKeySpec.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/DESedeKeySpec.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/DHGenParameterSpec.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/DHParameterSpec.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/DHPrivateKeySpec.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/DHPublicKeySpec.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/IvParameterSpec.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/OAEPParameterSpec.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/PBEKeySpec.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/PBEParameterSpec.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/PSource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/RC2ParameterSpec.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/RC5ParameterSpec.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/SecretKeySpec.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/internal/NullCipherSpi.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/utils/AlgNameMapper.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/utils/AlgNameMapper.java?view=diff&rev=446485&r1=446484&r2=446485
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/utils/AlgNameMapper.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/utils/AlgNameMapper.java Thu Sep 14 19:57:41 2006
@@ -1,256 +1,256 @@
-/*
- *  Copyright 2005, 2006 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-/**
-* @author Vladimir N. Molotkov
-* @version $Revision$
-*/
-
-package org.apache.harmony.crypto.utils;
-
-import java.security.Provider;
-import java.security.Security;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-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)
- *  
- */
-public class AlgNameMapper {
-    
-    // Will search OID mappings for these services
-    private static final String[] serviceName = {
-            "Cipher",
-            "AlgorithmParameters",
-            "Signature"
-    };
-
-    // These mappings CAN NOT be overridden
-    // by the ones from available providers
-    // during maps initialization
-    // (source: http://asn1.elibel.tm.fr):
-    private static final String[][] knownAlgMappings = {
-        {"1.2.840.10040.4.1",       "DSA"},
-        {"1.2.840.10040.4.3",       "SHA1withDSA"},
-        {"1.2.840.113549.1.1.1",    "RSA"},
-        {"1.2.840.113549.1.1.2",    "MD2withRSA"},
-        {"1.2.840.113549.1.1.4",    "MD5withRSA"},
-        {"1.2.840.113549.1.1.5",    "SHA1withRSA"},
-        {"1.2.840.113549.1.3.1",    "DiffieHellman"},
-        {"1.2.840.113549.1.5.3",    "pbeWithMD5AndDES-CBC"},
-        {"1.2.840.113549.1.12.1.3", "pbeWithSHAAnd3-KeyTripleDES-CBC"},
-        {"1.2.840.113549.1.12.1.6", "pbeWithSHAAnd40BitRC2-CBC"},
-        {"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"},
-        {"2.23.42.9.11.4.1",        "ECDSA"},
-    };
-    // Maps alg name to OID
-    private static final HashMap alg2OidMap = new HashMap();
-    // Maps OID to alg name
-    private static final HashMap oid2AlgMap = new HashMap();
-    // Maps aliases to alg names
-    private static final HashMap algAliasesMap = new HashMap();
-
-    static {
-        // put known mappings before
-        for (int i = 0; i<knownAlgMappings.length; i++) {
-            String algUC = knownAlgMappings[i][1].toUpperCase();
-            alg2OidMap.put(algUC, knownAlgMappings[i][0]);
-            oid2AlgMap.put(knownAlgMappings[i][0], algUC);
-            // map upper case alg name to its original name
-            algAliasesMap.put(algUC, knownAlgMappings[i][1]);
-        }
-        //
-        // Now search providers for mappings like
-        // Alg.Alias.<service>.<OID-INTS-DOT-SEPARATED>=<alg-name>
-        //  or
-        // Alg.Alias.<service>.OID.<OID-INTS-DOT-SEPARATED>=<alg-name>
-        //
-        Provider[] pl = Security.getProviders();
-        for (int i = 0; i<pl.length; i++) {
-            selectEntries(pl[i]);
-        }
-    }
-
-    // No instances 
-    private AlgNameMapper() {
-    }
-  
-    /**
-     * Returns OID for algName
-     *
-     * @param algName algorithm name to be mapped
-     * @return OID as String
-     */
-    public static String map2OID(String algName) {
-        // alg2OidMap map contains upper case keys
-        return (String)alg2OidMap.get(algName.toUpperCase());
-    }
-
-    /**
-     * Returns algName for OID
-     *
-     * @param oid OID to be mapped
-     * @return algorithm name
-     */
-    public static String map2AlgName(String oid) {
-        // oid2AlgMap map contains upper case values
-        String algUC = (String)oid2AlgMap.get(oid);
-        // if not null there is always map UC->Orig
-        return algUC == null ? null : (String)algAliasesMap.get(algUC);
-    }
-
-    /**
-     * Returns Algorithm name for given algorithm alias
-     *
-     * @param algName - alias
-     * @return algorithm name
-     */
-    public static String getStandardName(String algName) {
-        return (String)algAliasesMap.get(algName.toUpperCase());
-    }
-
-    // Searches given provider for mappings like
-    // Alg.Alias.<service>.<OID-INTS-DOT-SEPARATED>=<alg-name>
-    //  or
-    // Alg.Alias.<service>.OID.<OID-INTS-DOT-SEPARATED>=<alg-name>
-    // Puts mappings found into appropriate internal maps
-    private static void selectEntries(Provider p) {
-        Set entrySet = p.entrySet();
-        for (int i=0; i<serviceName.length; i++) {
-            String keyPrfix2find = "Alg.Alias." + serviceName[i] + "."; 
-            for (Iterator it = entrySet.iterator(); it.hasNext();) {
-                Map.Entry me = (Map.Entry)it.next();
-                String key = (String)me.getKey();
-                if (key.startsWith(keyPrfix2find)) {
-                    String alias = key.substring(keyPrfix2find.length());
-                    String alg = (String)me.getValue();
-                    String algUC = alg.toUpperCase();
-                    if (isOID(alias)) {
-                        if (alias.startsWith("OID.")) {
-                            alias = alias.substring(4);
-                        }
-                        // Do not overwrite already known mappings
-                        boolean oid2AlgContains = oid2AlgMap.containsKey(alias);
-                        boolean alg2OidContains = alg2OidMap.containsKey(algUC);
-                        if (!oid2AlgContains || !alg2OidContains) {
-                            if (!oid2AlgContains) {
-                                oid2AlgMap.put(alias, algUC);
-                            } 
-                            if (!alg2OidContains) {
-                                alg2OidMap.put(algUC, alias);
-                            }
-                            // map upper case alg name to its original name
-                            algAliasesMap.put(algUC, alg);
-                        }
-                           // Do not override known standard names
-                    } else if (!algAliasesMap.containsKey(alias.toUpperCase())) {
-                        algAliasesMap.put(alias.toUpperCase(), alg);
-                    }
-                }
-            }
-        }
-    }
-    
-    /**
-     * Checks if parameter represents OID
-     *
-     * @param alias alias to be checked
-     * @return 'true' if parameter represents OID 
-     */
-    public static boolean isOID(String alias) {
-        try {
-            // The method makes all needed checks in it.
-            // If alias is not an OID, exception is thrown.
-            ObjectIdentifier.toIntArray(normalize(alias));
-            
-            // will not come here if exception is thrown 
-            return true;
-        } catch (IllegalArgumentException e) {
-            return false;
-        } 
-    }
-
-    /**
-     * Removes leading "OID." from oid String passed
-     *
-     * @param oid string that may contain leading "OID."
-     * @return string passed without leading "OID." 
-     */
-    public static String normalize(String oid) {
-        return oid.startsWith("OID.")
-            ? oid.substring(4)
-            : oid;
-    }
-
-    /**
-     * Present all internal maps as formatted string
-     * @return Internal maps String representation
-     */
-    public static String dump() {
-        StringBuffer sb = new StringBuffer("alg2OidMap: ");
-        sb.append(alg2OidMap);
-        sb.append("\noid2AlgMap: ");
-        sb.append(oid2AlgMap);
-        sb.append("\nalgAliasesMap: ");
-        sb.append(algAliasesMap);
-        return sb.toString();
-    }
-}
+/*
+ *  Copyright 2005, 2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+* @author Vladimir N. Molotkov
+* @version $Revision$
+*/
+
+package org.apache.harmony.crypto.utils;
+
+import java.security.Provider;
+import java.security.Security;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+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)
+ *  
+ */
+public class AlgNameMapper {
+    
+    // Will search OID mappings for these services
+    private static final String[] serviceName = {
+            "Cipher",
+            "AlgorithmParameters",
+            "Signature"
+    };
+
+    // These mappings CAN NOT be overridden
+    // by the ones from available providers
+    // during maps initialization
+    // (source: http://asn1.elibel.tm.fr):
+    private static final String[][] knownAlgMappings = {
+        {"1.2.840.10040.4.1",       "DSA"},
+        {"1.2.840.10040.4.3",       "SHA1withDSA"},
+        {"1.2.840.113549.1.1.1",    "RSA"},
+        {"1.2.840.113549.1.1.2",    "MD2withRSA"},
+        {"1.2.840.113549.1.1.4",    "MD5withRSA"},
+        {"1.2.840.113549.1.1.5",    "SHA1withRSA"},
+        {"1.2.840.113549.1.3.1",    "DiffieHellman"},
+        {"1.2.840.113549.1.5.3",    "pbeWithMD5AndDES-CBC"},
+        {"1.2.840.113549.1.12.1.3", "pbeWithSHAAnd3-KeyTripleDES-CBC"},
+        {"1.2.840.113549.1.12.1.6", "pbeWithSHAAnd40BitRC2-CBC"},
+        {"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"},
+        {"2.23.42.9.11.4.1",        "ECDSA"},
+    };
+    // Maps alg name to OID
+    private static final HashMap alg2OidMap = new HashMap();
+    // Maps OID to alg name
+    private static final HashMap oid2AlgMap = new HashMap();
+    // Maps aliases to alg names
+    private static final HashMap algAliasesMap = new HashMap();
+
+    static {
+        // put known mappings before
+        for (int i = 0; i<knownAlgMappings.length; i++) {
+            String algUC = knownAlgMappings[i][1].toUpperCase();
+            alg2OidMap.put(algUC, knownAlgMappings[i][0]);
+            oid2AlgMap.put(knownAlgMappings[i][0], algUC);
+            // map upper case alg name to its original name
+            algAliasesMap.put(algUC, knownAlgMappings[i][1]);
+        }
+        //
+        // Now search providers for mappings like
+        // Alg.Alias.<service>.<OID-INTS-DOT-SEPARATED>=<alg-name>
+        //  or
+        // Alg.Alias.<service>.OID.<OID-INTS-DOT-SEPARATED>=<alg-name>
+        //
+        Provider[] pl = Security.getProviders();
+        for (int i = 0; i<pl.length; i++) {
+            selectEntries(pl[i]);
+        }
+    }
+
+    // No instances 
+    private AlgNameMapper() {
+    }
+  
+    /**
+     * Returns OID for algName
+     *
+     * @param algName algorithm name to be mapped
+     * @return OID as String
+     */
+    public static String map2OID(String algName) {
+        // alg2OidMap map contains upper case keys
+        return (String)alg2OidMap.get(algName.toUpperCase());
+    }
+
+    /**
+     * Returns algName for OID
+     *
+     * @param oid OID to be mapped
+     * @return algorithm name
+     */
+    public static String map2AlgName(String oid) {
+        // oid2AlgMap map contains upper case values
+        String algUC = (String)oid2AlgMap.get(oid);
+        // if not null there is always map UC->Orig
+        return algUC == null ? null : (String)algAliasesMap.get(algUC);
+    }
+
+    /**
+     * Returns Algorithm name for given algorithm alias
+     *
+     * @param algName - alias
+     * @return algorithm name
+     */
+    public static String getStandardName(String algName) {
+        return (String)algAliasesMap.get(algName.toUpperCase());
+    }
+
+    // Searches given provider for mappings like
+    // Alg.Alias.<service>.<OID-INTS-DOT-SEPARATED>=<alg-name>
+    //  or
+    // Alg.Alias.<service>.OID.<OID-INTS-DOT-SEPARATED>=<alg-name>
+    // Puts mappings found into appropriate internal maps
+    private static void selectEntries(Provider p) {
+        Set entrySet = p.entrySet();
+        for (int i=0; i<serviceName.length; i++) {
+            String keyPrfix2find = "Alg.Alias." + serviceName[i] + "."; 
+            for (Iterator it = entrySet.iterator(); it.hasNext();) {
+                Map.Entry me = (Map.Entry)it.next();
+                String key = (String)me.getKey();
+                if (key.startsWith(keyPrfix2find)) {
+                    String alias = key.substring(keyPrfix2find.length());
+                    String alg = (String)me.getValue();
+                    String algUC = alg.toUpperCase();
+                    if (isOID(alias)) {
+                        if (alias.startsWith("OID.")) {
+                            alias = alias.substring(4);
+                        }
+                        // Do not overwrite already known mappings
+                        boolean oid2AlgContains = oid2AlgMap.containsKey(alias);
+                        boolean alg2OidContains = alg2OidMap.containsKey(algUC);
+                        if (!oid2AlgContains || !alg2OidContains) {
+                            if (!oid2AlgContains) {
+                                oid2AlgMap.put(alias, algUC);
+                            } 
+                            if (!alg2OidContains) {
+                                alg2OidMap.put(algUC, alias);
+                            }
+                            // map upper case alg name to its original name
+                            algAliasesMap.put(algUC, alg);
+                        }
+                           // Do not override known standard names
+                    } else if (!algAliasesMap.containsKey(alias.toUpperCase())) {
+                        algAliasesMap.put(alias.toUpperCase(), alg);
+                    }
+                }
+            }
+        }
+    }
+    
+    /**
+     * Checks if parameter represents OID
+     *
+     * @param alias alias to be checked
+     * @return 'true' if parameter represents OID 
+     */
+    public static boolean isOID(String alias) {
+        try {
+            // The method makes all needed checks in it.
+            // If alias is not an OID, exception is thrown.
+            ObjectIdentifier.toIntArray(normalize(alias));
+            
+            // will not come here if exception is thrown 
+            return true;
+        } catch (IllegalArgumentException e) {
+            return false;
+        } 
+    }
+
+    /**
+     * Removes leading "OID." from oid String passed
+     *
+     * @param oid string that may contain leading "OID."
+     * @return string passed without leading "OID." 
+     */
+    public static String normalize(String oid) {
+        return oid.startsWith("OID.")
+            ? oid.substring(4)
+            : oid;
+    }
+
+    /**
+     * Present all internal maps as formatted string
+     * @return Internal maps String representation
+     */
+    public static String dump() {
+        StringBuffer sb = new StringBuffer("alg2OidMap: ");
+        sb.append(alg2OidMap);
+        sb.append("\noid2AlgMap: ");
+        sb.append(oid2AlgMap);
+        sb.append("\nalgAliasesMap: ");
+        sb.append(algAliasesMap);
+        return sb.toString();
+    }
+}

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/utils/AlgNameMapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherInputStreamTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherOutputStreamTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherSpiTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/ExemptionMechanismSpiTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/KeyAgreementSpiTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/KeyGeneratorSpiTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/MacSpiTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/SealedObjectTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/SecretKeyFactorySpiTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/spec/PSourceTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/BadPaddingExceptionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStreamTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStreamTest.java?view=diff&rev=446485&r1=446484&r2=446485
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStreamTest.java Thu Sep 14 19:57:41 2006
@@ -1,66 +1,66 @@
-/*
- *  Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.apache.harmony.crypto.tests.javax.crypto;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.NullCipher;
-
-public class CipherInputStreamTest extends TestCase {
-
-    /**
-     * @tests javax.crypto.CipherInputStream#read(byte[] b, int off, int len)
-     */
-    public void testReadBII() throws Exception {
-        // Regression for HARMONY-1080
-        CipherInputStream stream = new CipherInputStream(null, new NullCipher());
-        try {
-            stream.read(new byte[1], 1, 0);
-            fail("NullPointerException expected");
-        } catch (NullPointerException e) {
-            // expected
-        }
-    }
-
-    /**
-     * @tests javax.crypto.CipherInputStream#close()
-     */
-    public void testClose() throws Exception {
-        // Regression for HARMONY-1087
-        try {
-            new CipherInputStream(new ByteArrayInputStream(new byte[] { 1 }),
-                    Cipher.getInstance("DES/CBC/PKCS5Padding")).close();
-            fail("IllegalStateException expected!");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-        try {
-            new CipherInputStream(new BufferedInputStream((InputStream) null),
-                    Cipher.getInstance("DES/CBC/PKCS5Padding")).close();
-            fail("IllegalStateException expected!");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-    }
-
-}
+/*
+ *  Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.harmony.crypto.tests.javax.crypto;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
+import junit.framework.TestCase;
+
+import javax.crypto.Cipher;
+import javax.crypto.CipherInputStream;
+import javax.crypto.NullCipher;
+
+public class CipherInputStreamTest extends TestCase {
+
+    /**
+     * @tests javax.crypto.CipherInputStream#read(byte[] b, int off, int len)
+     */
+    public void testReadBII() throws Exception {
+        // Regression for HARMONY-1080
+        CipherInputStream stream = new CipherInputStream(null, new NullCipher());
+        try {
+            stream.read(new byte[1], 1, 0);
+            fail("NullPointerException expected");
+        } catch (NullPointerException e) {
+            // expected
+        }
+    }
+
+    /**
+     * @tests javax.crypto.CipherInputStream#close()
+     */
+    public void testClose() throws Exception {
+        // Regression for HARMONY-1087
+        try {
+            new CipherInputStream(new ByteArrayInputStream(new byte[] { 1 }),
+                    Cipher.getInstance("DES/CBC/PKCS5Padding")).close();
+            fail("IllegalStateException expected!");
+        } catch (IllegalStateException e) {
+            // expected
+        }
+        try {
+            new CipherInputStream(new BufferedInputStream((InputStream) null),
+                    Cipher.getInstance("DES/CBC/PKCS5Padding")).close();
+            fail("IllegalStateException expected!");
+        } catch (IllegalStateException e) {
+            // expected
+        }
+    }
+
+}

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStreamTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/CipherTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismExceptionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/IllegalBlockSizeExceptionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/NoSuchPaddingExceptionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/NullCipherTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ShortBufferExceptionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPrivateKeyTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPublicKeyTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/PBEKeyTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESKeySpecTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESedeKeySpecTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHGenParameterSpecTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHParameterSpecTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPrivateKeySpecTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPublicKeySpecTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/IvParameterSpecTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/OAEPParameterSpecTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEParameterSpecTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java.injected/org/apache/harmony/crypto/internal/NullCipherSpiTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/Cipher_Impl1Test.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/Cipher_ImplTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfo_ImplTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanism_ImplTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_Impl1Test.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_ImplTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGenerator_ImplTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/Mac_ImplTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactory_Impl1Test.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactory_ImplTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/utils/AlgNameMapperTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/utils/AlgNameMapperTest.java?view=diff&rev=446485&r1=446484&r2=446485
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/utils/AlgNameMapperTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/utils/AlgNameMapperTest.java Thu Sep 14 19:57:41 2006
@@ -1,68 +1,68 @@
-/*
- *  Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.apache.harmony.crypto.utils;
-
-import junit.framework.TestCase;
-
-public class AlgNameMapperTest extends TestCase {
-
-    /**
-     * @tests org.apache.harmony.crypto.utils.AlgNameMapper#getStandardName(String)
-     */
-    public void testGetStandardName() {
-        //Regression for HARMONY-962
-        // check a hardcoded mapping
-        String standardName = AlgNameMapper
-                .getStandardName("PBEWITHSHAAND40BITRC2-CBC");
-        assertEquals("pbeWithSHAAnd40BitRC2-CBC", standardName);
-    }
-
-    /**
-     * @tests org.apache.harmony.crypto.utils.AlgNameMapper#isOID(String)
-     */
-    public void testIsOID() {
-        //Regression for HARMONY-962
-        String notOID = "not.an.oid";
-        String badOID = "999.88.77";
-        // SHA1withDSA OID
-        String normalOID = "1.2.840.10040.4.3";
-
-        assertTrue(AlgNameMapper.isOID(normalOID));
-        assertFalse(AlgNameMapper.isOID(badOID));
-        assertFalse(AlgNameMapper.isOID(notOID));
-    }
-
-    /**
-     * @tests org.apache.harmony.crypto.utils.AlgNameMapper.selectEntries(Provider)
-     */
-    public void testSelectEntries() {
-        // Regression for HARMONY-1185
-        String algStandardName = "SHA1withRSA";
-        String hardcodedOID = "1.2.840.113549.1.1.5";
-        String alternativeName = "SHA1WithRSAEncryption";
-        String anotherAlgStandardName = "SHA1withDSA";
-        String alternativeOID = "1.3.14.3.2.13";
-        assertEquals(hardcodedOID, AlgNameMapper.map2OID(algStandardName));
-        assertEquals(algStandardName, AlgNameMapper.map2AlgName(hardcodedOID));
-
-        // Mappings taken from a provider that do not override any of hardcoded
-        // mappings should not be rejected.
-        assertEquals(hardcodedOID, AlgNameMapper.map2OID(alternativeName));
-        assertEquals(anotherAlgStandardName, AlgNameMapper
-                .map2AlgName(alternativeOID));
-    }
-}
+/*
+ *  Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.harmony.crypto.utils;
+
+import junit.framework.TestCase;
+
+public class AlgNameMapperTest extends TestCase {
+
+    /**
+     * @tests org.apache.harmony.crypto.utils.AlgNameMapper#getStandardName(String)
+     */
+    public void testGetStandardName() {
+        //Regression for HARMONY-962
+        // check a hardcoded mapping
+        String standardName = AlgNameMapper
+                .getStandardName("PBEWITHSHAAND40BITRC2-CBC");
+        assertEquals("pbeWithSHAAnd40BitRC2-CBC", standardName);
+    }
+
+    /**
+     * @tests org.apache.harmony.crypto.utils.AlgNameMapper#isOID(String)
+     */
+    public void testIsOID() {
+        //Regression for HARMONY-962
+        String notOID = "not.an.oid";
+        String badOID = "999.88.77";
+        // SHA1withDSA OID
+        String normalOID = "1.2.840.10040.4.3";
+
+        assertTrue(AlgNameMapper.isOID(normalOID));
+        assertFalse(AlgNameMapper.isOID(badOID));
+        assertFalse(AlgNameMapper.isOID(notOID));
+    }
+
+    /**
+     * @tests org.apache.harmony.crypto.utils.AlgNameMapper.selectEntries(Provider)
+     */
+    public void testSelectEntries() {
+        // Regression for HARMONY-1185
+        String algStandardName = "SHA1withRSA";
+        String hardcodedOID = "1.2.840.113549.1.1.5";
+        String alternativeName = "SHA1WithRSAEncryption";
+        String anotherAlgStandardName = "SHA1withDSA";
+        String alternativeOID = "1.3.14.3.2.13";
+        assertEquals(hardcodedOID, AlgNameMapper.map2OID(algStandardName));
+        assertEquals(algStandardName, AlgNameMapper.map2AlgName(hardcodedOID));
+
+        // Mappings taken from a provider that do not override any of hardcoded
+        // mappings should not be rejected.
+        assertEquals(hardcodedOID, AlgNameMapper.map2OID(alternativeName));
+        assertEquals(anotherAlgStandardName, AlgNameMapper
+                .map2AlgName(alternativeOID));
+    }
+}

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/utils/AlgNameMapperTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/resources/hyts_des-ede3-cbc.test1.plaintext
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/resources/hyts_des-ede3-cbc.test1.plaintext?view=diff&rev=446485&r1=446484&r2=446485
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/resources/hyts_des-ede3-cbc.test1.plaintext (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/resources/hyts_des-ede3-cbc.test1.plaintext Thu Sep 14 19:57:41 2006
@@ -1 +1,2 @@
-߆
ÓC
\ No newline at end of file
+߆
+ÓC
\ No newline at end of file

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/resources/hyts_des-ede3-cbc.test1.plaintext
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/support/common/java/org/apache/harmony/crypto/tests/support/EncryptedPrivateKeyInfoData.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/support/common/java/org/apache/harmony/crypto/tests/support/MyCipher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/support/common/java/org/apache/harmony/crypto/tests/support/MyExemptionMechanismSpi.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/support/common/java/org/apache/harmony/crypto/tests/support/MyKeyAgreementSpi.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/support/common/java/org/apache/harmony/crypto/tests/support/MyKeyGeneratorSpi.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/support/common/java/org/apache/harmony/crypto/tests/support/MyMacSpi.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/support/common/java/org/apache/harmony/crypto/tests/support/MySecretKeyFactorySpi.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message