summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Vartanian <flooey@google.com>2017-03-30 08:44:18 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-30 08:44:18 +0000
commitd651c2a01d374207adfe755cc2e263d8d93ba9d1 (patch)
tree15e408fbab64401b8e4da69b594e1b4d3275596d
parent8395576a314bb9e81038199355dd78d577845882 (diff)
parentee4769827407d2105c8bbdc564fb2a6a28335b36 (diff)
downloadbouncycastle-d651c2a01d374207adfe755cc2e263d8d93ba9d1.tar.gz
Merge "Remove an Android change that is causing a test to fail" am: 49edf3ace6 am: e984dbf637
am: ee47698274 Change-Id: I2a0061d5b439e60e2192c89da225f9e4a0aa0e2c
-rw-r--r--bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java22
1 files changed, 8 insertions, 14 deletions
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 5d8e6b18..6e1eda2d 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
@@ -133,20 +133,14 @@ public class KeyAgreementSpi
try
{
result = agreement.calculateAgreement(pubKey);
- // BEGIN android-changed
- // Was:
- // } catch (final Exception e) {
- // throw new InvalidKeyException("calculation failed: " + e.getMessage())
- // {
- // public Throwable getCause()
- // {
- // return e;
- // }
- // };
- // }
- // END android-changed
- } catch (IllegalStateException e) {
- throw new InvalidKeyException("Invalid public key");
+ } catch (final Exception e) {
+ throw new InvalidKeyException("calculation failed: " + e.getMessage())
+ {
+ public Throwable getCause()
+ {
+ return e;
+ }
+ };
}
return null;
}