[refactor] adjust/add exception debugging

Author: kares

src/main/java/org/jruby/ext/openssl/X509Cert.java

@@ -670,23 +670,15 @@ public RubyBoolean verify(final IRubyObject key) {
             return runtime.getTrue();
         }
         catch (CertificateException e) {
-            debugStackTrace(runtime, "Certificate#verify failed", e);
+            debugStackTrace(runtime, "X509Cert#verify", e);
             throw newCertificateError(runtime, e);
         }
-        catch (NoSuchAlgorithmException e) {
+        catch (NoSuchProviderException|NoSuchAlgorithmException e) {
             debugStackTrace(runtime, e);
             throw newCertificateError(runtime, e);
         }
-        catch (NoSuchProviderException e) {
-            debugStackTrace(runtime, e);
-            throw newCertificateError(runtime, e);
-        }
-        catch (SignatureException e) {
-            debug(runtime, "Certificate#verify failed", e);
-            return runtime.getFalse();
-        }
-        catch (InvalidKeyException e) {
-            debug(runtime, "Certificate#verify failed", e);
+        catch (SignatureException|InvalidKeyException e) {
+            debug(runtime, "X509Cert#verify failed", e);
             return runtime.getFalse();
         }
     }

src/main/java/org/jruby/ext/openssl/X509Request.java

@@ -309,7 +309,6 @@ public IRubyObject set_public_key(final IRubyObject pkey) {
     @JRubyMethod
     public IRubyObject sign(final ThreadContext context,
         final IRubyObject key, final IRubyObject digest) {
-        // PublicKey publicKey = public_key.getPublicKey();
         PrivateKey privateKey = ((PKey) key).getPrivateKey();
 
         final Ruby runtime = context.runtime;
@@ -319,14 +318,14 @@ public IRubyObject sign(final ThreadContext context,
         try {
             request = null; getRequest().sign( privateKey, digAlg );
         }
-        catch (GeneralSecurityException e) {
-            debugStackTrace(runtime, e);
+        catch (InvalidKeyException e) {
+            debug(runtime, "X509Request#sign failed", e);
+            throw newRequestError(runtime, e);
+        }
+        catch (Exception e) {
+            debugStackTrace(runtime, "X509Request#sign", e);
             throw newRequestError(runtime, e);
         }
-        //catch (IOException e) {
-        //    debugStackTrace(runtime, e);
-        //    throw newRequestError(runtime, e);
-        //}
         return this;
     }