harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mloe...@apache.org
Subject svn commit: r425352 - in /incubator/harmony/enhanced/classlib/trunk/modules/crypto/src: main/java/org/apache/harmony/crypto/utils/AlgNameMapper.java test/impl/java/org/apache/harmony/crypto/utils/AlgNameMapperTest.java
Date Tue, 25 Jul 2006 09:41:11 GMT
Author: mloenko
Date: Tue Jul 25 02:41:11 2006
New Revision: 425352

URL: http://svn.apache.org/viewvc?rev=425352&view=rev
Log:
fixes for HARMONY-962
org.apache.harmony.crypto.utils.AlgNameMapper overrides hardcoded mappings and determines
OIDs incorrectly

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/utils/AlgNameMapperTest.java
Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/utils/AlgNameMapper.java

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?rev=425352&r1=425351&r2=425352&view=diff
==============================================================================
--- 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
Tue Jul 25 02:41:11 2006
@@ -1,240 +1,252 @@
-/*
- *  Copyright 2005 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;
-
-/**
- * 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",
-    };
-
-    // 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
-                        if (!oid2AlgMap.containsKey(alias) &&
-                            !alg2OidMap.containsKey(algUC)) {
-                            // Suppose OID always points to the standard name
-                            alg2OidMap.put(algUC, alias);
-                            oid2AlgMap.put(alias, algUC);
-                            // map upper case alg name to its original name
-                            algAliasesMap.put(algUC, alg);
-                        }
-                           // Do not allow known standard names as alias 
-                    } else if (!algAliasesMap.containsValue(alias)) {
-                        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) {
-        return alias.indexOf('.') != -1;
-    }
-
-    /**
-     * 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
+                        if (!oid2AlgMap.containsKey(alias) &&
+                            !alg2OidMap.containsKey(algUC)) {
+                            // Suppose OID always points to the standard name
+                            alg2OidMap.put(algUC, alias);
+                            oid2AlgMap.put(alias, algUC);
+                            // map upper case alg name to its original name
+                            algAliasesMap.put(algUC, alg);
+                        }
+                           // Do not allow known standard names as alias 
+                    } 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();
+    }
+}

Added: 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?rev=425352&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/utils/AlgNameMapperTest.java
(added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/utils/AlgNameMapperTest.java
Tue Jul 25 02:41:11 2006
@@ -0,0 +1,48 @@
+/*
+ *  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));
+    }
+}



Mime
View raw message