commit aebc7ff81f8d05f21843c6696cc9db9af74ad4fe
author Kenny Root <kroot@android.com> Tue Mar 19 16:29:52 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 19 16:29:52 2013 -0700
tree 0bc91df784eacb96d6ec664a8e81741d157953a3
parent c7b3ba5e29241b9705939135104cdf9d6c8d6180
parent 3b69cbe7707eaab58032168fc7e5cca246618a99

am 3b69cbe7: Merge "Make ECDH KeyAgreement reject AlgorithmParameterSpec."

* commit '3b69cbe7707eaab58032168fc7e5cca246618a99':
  Make ECDH KeyAgreement reject AlgorithmParameterSpec.

bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java

diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java
index cc9b2db..cade228 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java
@@ -221,6 +221,12 @@
         SecureRandom            random) 
         throws InvalidKeyException, InvalidAlgorithmParameterException
     {
+        // BEGIN android-added
+        if (params != null)
+        {
+            throw new InvalidAlgorithmParameterException("No algorithm parameters supported");
+        }
+        // END android-added
         initFromKey(key);
     }
 

patches/bcprov.patch

diff --git a/patches/bcprov.patch b/patches/bcprov.patch
index c1d1bcc..695215b 100644
--- a/patches/bcprov.patch
+++ b/patches/bcprov.patch
@@ -1954,7 +1954,7 @@
          return name;
 diff -Naur bcprov-jdk15on-148.orig/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java bcprov-jdk15on-148/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java
 --- bcprov-jdk15on-148.orig/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java	2013-02-10 00:37:58.000000000 +0000
-+++ bcprov-jdk15on-148/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java	2013-01-31 02:26:40.000000000 +0000
++++ bcprov-jdk15on-148/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java	2013-03-19 19:26:57.000000000 +0000
 @@ -23,20 +23,26 @@
  import org.bouncycastle.crypto.CipherParameters;
  import org.bouncycastle.crypto.DerivationFunction;
@@ -2121,7 +2121,20 @@
          {
              // TODO Should we be ensuring the key is the right length?
          }
-@@ -219,35 +235,37 @@
+@@ -205,6 +221,12 @@
+         SecureRandom            random) 
+         throws InvalidKeyException, InvalidAlgorithmParameterException
+     {
++        // BEGIN android-added
++        if (params != null)
++        {
++            throw new InvalidAlgorithmParameterException("No algorithm parameters supported");
++        }
++        // END android-added
+         initFromKey(key);
+     }
+ 
+@@ -219,35 +241,37 @@
      private void initFromKey(Key key)
          throws InvalidKeyException
      {
@@ -2188,7 +2201,7 @@
          {
              if (!(key instanceof PrivateKey))
              {
-@@ -278,39 +296,41 @@
+@@ -278,39 +302,41 @@
          }
      }