commit aa029a4d2b21faf740a75f16b849b46ca84fa855
author Kenny Root <kroot@google.com> Mon Jun 01 19:05:20 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 01 19:05:21 2015 +0000
tree 82e6c552bdbb11da35b838d3af9e5c20d81dfcdf
parent 49854878b83114e3e15c7ad3ca030352b786b5df
parent ed396e937f8e0ef878cb9a8d16cff2e5a07f8c7d

Merge "OpenSSLKey: unsupported algorithm is an InvalidKeyException"

src/main/java/org/conscrypt/OpenSSLKey.java

diff --git a/src/main/java/org/conscrypt/OpenSSLKey.java b/src/main/java/org/conscrypt/OpenSSLKey.java
index c4c7928..123726a 100644
--- a/src/main/java/org/conscrypt/OpenSSLKey.java
+++ b/src/main/java/org/conscrypt/OpenSSLKey.java
@@ -221,7 +221,11 @@
             throw new InvalidKeyException("Key encoding is null");
         }
 
-        return new OpenSSLKey(NativeCrypto.d2i_PUBKEY(key.getEncoded()));
+        try {
+            return new OpenSSLKey(NativeCrypto.d2i_PUBKEY(key.getEncoded()));
+        } catch (Exception e) {
+            throw new InvalidKeyException(e);
+        }
     }
 
     public PublicKey getPublicKey() throws NoSuchAlgorithmException {