commit 6839f99000048f9f122932adfc0c149eace5cdfa
author Kenny Root <kroot@google.com> Tue Mar 15 14:41:50 2016 -0700
committer Kenny Root <kroot@google.com> Wed Mar 16 09:03:21 2016 -0700
tree c56c3f49e97f4978c7095dceb76d799642bcee5a
parent c8f9dc88f7b38016a48406ebbd76421439068860

Use official name for SHA1withECDSA

(cherry picked from commit 74e960449ba0a4633c2164d9b7708dcfb558030d)

Bug: 27269590
Change-Id: Ief933e31875aec69cb96c1691a9a6480e6719dac

bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/EC.java

diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/EC.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/EC.java
index 91500c9..43cc555 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/EC.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/EC.java
@@ -175,16 +175,18 @@
             // provider.addAlgorithm("Cipher.OldECIESWITHDESEDE-CBC", PREFIX + "IESCipher$OldECIESwithDESedeCBC");
             // END android-removed
 
-            provider.addAlgorithm("Signature.ECDSA", PREFIX + "SignatureSpi$ecDSA");
+            // BEGIN android-changed
+            provider.addAlgorithm("Signature.SHA1withECDSA", PREFIX + "SignatureSpi$ecDSA");
             provider.addAlgorithm("Signature.NONEwithECDSA", PREFIX + "SignatureSpi$ecDSAnone");
 
-            provider.addAlgorithm("Alg.Alias.Signature.SHA1withECDSA", "ECDSA");
-            provider.addAlgorithm("Alg.Alias.Signature.ECDSAwithSHA1", "ECDSA");
-            provider.addAlgorithm("Alg.Alias.Signature.SHA1WITHECDSA", "ECDSA");
-            provider.addAlgorithm("Alg.Alias.Signature.ECDSAWITHSHA1", "ECDSA");
-            provider.addAlgorithm("Alg.Alias.Signature.SHA1WithECDSA", "ECDSA");
-            provider.addAlgorithm("Alg.Alias.Signature.ECDSAWithSHA1", "ECDSA");
-            provider.addAlgorithm("Alg.Alias.Signature.1.2.840.10045.4.1", "ECDSA");
+            provider.addAlgorithm("Alg.Alias.Signature.ECDSA", "SHA1withECDSA");
+            provider.addAlgorithm("Alg.Alias.Signature.ECDSAwithSHA1", "SHA1withECDSA");
+            provider.addAlgorithm("Alg.Alias.Signature.SHA1WITHECDSA", "SHA1withECDSA");
+            provider.addAlgorithm("Alg.Alias.Signature.ECDSAWITHSHA1", "SHA1withECDSA");
+            provider.addAlgorithm("Alg.Alias.Signature.SHA1WithECDSA", "SHA1withECDSA");
+            provider.addAlgorithm("Alg.Alias.Signature.ECDSAWithSHA1", "SHA1withECDSA");
+            provider.addAlgorithm("Alg.Alias.Signature.1.2.840.10045.4.1", "SHA1withECDSA");
+            // END android-changed
             // BEGIN android-removed
             // provider.addAlgorithm("Alg.Alias.Signature." + TeleTrusTObjectIdentifiers.ecSignWithSha1, "ECDSA");
             //