diff options
| author | Adam Vartanian <flooey@google.com> | 2017-03-30 08:42:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-30 08:42:18 +0000 |
| commit | ee4769827407d2105c8bbdc564fb2a6a28335b36 (patch) | |
| tree | 15e408fbab64401b8e4da69b594e1b4d3275596d | |
| parent | af944a69fe3335953423c7d6cff68d4dce54ea1e (diff) | |
| parent | e984dbf63708351e1de1f6613d33befe91ad4dc1 (diff) | |
| download | bouncycastle-ee4769827407d2105c8bbdc564fb2a6a28335b36.tar.gz | |
Merge "Remove an Android change that is causing a test to fail" am: 49edf3ace6
am: e984dbf637
Change-Id: I957152c119dbcdfc4dafa36fee8275158a82af50
| -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; } |