commit 7b87674c8ef54c21ab84b1ba5ac9ba79fbfa761f
author Kenny Root <kroot@google.com> Fri Mar 08 22:53:17 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 08 22:53:18 2013 +0000
tree 45bbecfe3229c7746c0bed0fbbb160b6ed7c7ed2
parent b95f71612d7dfc1dfcb825cb1d96ccdb95e14c0f
parent a19da4ff6f832e2f559e470402dfa7e3a615e340

Merge "NativeCrypto: make all DSA errors the same"

luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp

diff --git a/luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp b/luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
index ec36da0..ba68bd0 100644
--- a/luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
+++ b/luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
@@ -386,8 +386,6 @@
             throwSignatureException(env, message);
         } else if (library == ERR_LIB_RSA && reason == RSA_R_WRONG_SIGNATURE_LENGTH) {
             throwSignatureException(env, message);
-        } else if (library == ERR_LIB_DSA && reason == DSA_R_PARAMETER_ENCODING_ERROR) {
-            throwInvalidKeyException(env, message);
         } else if (library == ERR_LIB_ASN1 && reason == ASN1_R_WRONG_PUBLIC_KEY_TYPE) {
             throwInvalidKeyException(env, message);
         } else if (library == ERR_LIB_EVP && reason == EVP_R_BAD_DECRYPT) {
@@ -396,6 +394,8 @@
             throwIllegalBlockSizeException(env, message);
         } else if (library == ERR_LIB_X509 && reason == X509_R_UNSUPPORTED_ALGORITHM) {
             throwNoSuchAlgorithmException(env, message);
+        } else if (library == ERR_LIB_DSA) {
+            throwInvalidKeyException(env, message);
         } else {
             jniThrowRuntimeException(env, message);
         }