diff options
| author | Adam Vartanian <flooey@google.com> | 2017-03-30 08:46:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-30 08:46:48 +0000 |
| commit | 86fa29062ba17ebd956354a214abb0c5cd6d7734 (patch) | |
| tree | 15e408fbab64401b8e4da69b594e1b4d3275596d | |
| parent | 8395576a314bb9e81038199355dd78d577845882 (diff) | |
| parent | d651c2a01d374207adfe755cc2e263d8d93ba9d1 (diff) | |
| download | bouncycastle-86fa29062ba17ebd956354a214abb0c5cd6d7734.tar.gz | |
Merge "Remove an Android change that is causing a test to fail" am: 49edf3ace6 am: e984dbf637 am: ee47698274
am: d651c2a01d
Change-Id: Ifca174d85dcdb40ffceb0817972cad4201b94768
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java | 22 |
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; } |