[compat] Store#add_cert and add_crl handle wrong argument

MRI raises TypeError with a descriptive message
(e.g. "wrong argument type String (expected OpenSSL/X509)")

Author: kares

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

@@ -203,19 +203,25 @@ public IRubyObject set_default_paths(final ThreadContext context) {
     }
 
     @JRubyMethod
-    public X509Store add_cert(final IRubyObject cert) {
-        X509AuxCertificate auxCert = cert instanceof X509Cert ? ((X509Cert) cert).getAuxCert() : null;
+    public X509Store add_cert(final ThreadContext context, final IRubyObject cert) {
+        if (!(cert instanceof X509Cert)) {
+            throw context.runtime.newTypeError(cert, _X509(context.runtime).getClass("Certificate"));
+        }
+        X509AuxCertificate auxCert = ((X509Cert) cert).getAuxCert();
         if ( store.addCertificate(auxCert) != 1 ) {
-            throw newStoreError(getRuntime(), X509Error.getLastErrorMessage());
+            throw newStoreError(context.runtime, X509Error.getLastErrorMessage());
         }
         return this;
     }
 
     @JRubyMethod
-    public X509Store add_crl(final IRubyObject crl) {
-        java.security.cert.X509CRL jCRL = (crl instanceof X509CRL) ? ((X509CRL) crl).getCRL() : null;
+    public X509Store add_crl(final ThreadContext context, final IRubyObject crl) {
+        if (!(crl instanceof X509CRL)) {
+            throw context.runtime.newTypeError(crl, _X509(context.runtime).getClass("CRL"));
+        }
+        java.security.cert.X509CRL jCRL = ((X509CRL) crl).getCRL();
         if ( store.addCRL(jCRL) != 1 ) {
-            throw newStoreError(getRuntime(), X509Error.getLastErrorMessage());
+            throw newStoreError(context.runtime, X509Error.getLastErrorMessage());
         }
         return this;
     }

src/test/ruby/x509/test_x509store.rb

@@ -149,6 +149,19 @@ def test_store_time_accepts_integer
     assert store.verify(@cert)
   end
 
+  # CRuby raises TypeError (not StoreError) for wrong argument types
+  def test_add_cert_type_check
+    store = OpenSSL::X509::Store.new
+    assert_raise(TypeError) { store.add_cert("not a cert") }
+    assert_raise(TypeError) { store.add_cert(nil) }
+  end
+
+  def test_add_crl_type_check
+    store = OpenSSL::X509::Store.new
+    assert_raise(TypeError) { store.add_crl("not a crl") }
+    assert_raise(TypeError) { store.add_crl(nil) }
+  end
+
   # CRuby undefs initialize_copy, blocking both dup and clone
   def test_store_dup_clone_not_allowed
     store = OpenSSL::X509::Store.new