commit 8c18c33a4188b609bc9a9b22d0997a9613cf81d1
author Kenny Root <kroot@google.com> Tue Mar 19 16:36:14 2013 -0700
committer Kenny Root <kroot@google.com> Tue Mar 19 16:36:14 2013 -0700
tree 643f14340cd1d2c153e5a9e55fb460297c508fc8
parent 4b704541281db226deda9a45ea7e9de3ab247c86
parent aebc7ff81f8d05f21843c6696cc9db9af74ad4fe

resolved conflicts for merge of aebc7ff8 to jb-mr2-dev

Change-Id: I3be0fafa767f73d0c6071ee238d9f0c26f8f1b61

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 21acafa..b0fbd97 100644
--- a/patches/bcprov.patch
+++ b/patches/bcprov.patch
@@ -1956,7 +1956,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	2012-09-17 23:04:47.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;
@@ -2123,7 +2123,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
      {
@@ -2190,7 +2203,7 @@
          {
              if (!(key instanceof PrivateKey))
              {
-@@ -278,39 +296,41 @@
+@@ -278,39 +302,41 @@
          }
      }