digest, cipher: raise ArgumentError for unknown algorithm name

Currently, either ArgumentError or RuntimeError is raised depending on
the context. Always raise ArgumentError, as it better describes the
error.

Author: rhenium

ext/openssl/ossl_cipher.c

@@ -114,17 +114,13 @@ ossl_cipher_initialize(VALUE self, VALUE str)
 {
     EVP_CIPHER_CTX *ctx;
     const EVP_CIPHER *cipher;
-    char *name;
 
-    name = StringValueCStr(str);
     GetCipherInit(self, ctx);
     if (ctx) {
 	ossl_raise(rb_eRuntimeError, "Cipher already initialized!");
     }
+    cipher = ossl_evp_get_cipherbyname(str);
     AllocCipher(self, ctx);
-    if (!(cipher = EVP_get_cipherbyname(name))) {
-	ossl_raise(rb_eRuntimeError, "unsupported cipher algorithm (%"PRIsVALUE")", str);
-    }
     if (EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, -1) != 1)
 	ossl_raise(eCipherError, NULL);
 

ext/openssl/ossl_digest.c

@@ -56,8 +56,9 @@ ossl_evp_get_digestbyname(VALUE obj)
 	    md = EVP_get_digestbyobj(oid);
 	    ASN1_OBJECT_free(oid);
 	}
-	if(!md)
-            ossl_raise(rb_eRuntimeError, "Unsupported digest algorithm (%"PRIsVALUE").", obj);
+        if (!md)
+            ossl_raise(rb_eArgError,
+                       "unsupported digest algorithm: %"PRIsVALUE, obj);
     } else {
         EVP_MD_CTX *ctx;
 

test/openssl/test_cipher.rb

@@ -112,6 +112,7 @@ def test_initialize
     cipher = OpenSSL::Cipher.new("DES-EDE3-CBC")
     assert_raise(RuntimeError) { cipher.__send__(:initialize, "DES-EDE3-CBC") }
     assert_raise(RuntimeError) { OpenSSL::Cipher.allocate.final }
+    assert_raise(ArgumentError) { OpenSSL::Cipher.new("no such algorithm") }
   end
 
   def test_ctr_if_exists
@@ -368,7 +369,7 @@ def test_aes_keywrap_pad
 
     begin
       cipher = OpenSSL::Cipher.new("id-aes192-wrap-pad").encrypt
-    rescue OpenSSL::Cipher::CipherError, RuntimeError
+    rescue OpenSSL::Cipher::CipherError, ArgumentError
       omit "id-aes192-wrap-pad is not supported: #$!"
     end
     cipher.key = kek

test/openssl/test_digest.rb

@@ -10,6 +10,10 @@ def setup
     @d2 = OpenSSL::Digest::MD5.new
   end
 
+  def test_initialize
+    assert_raise(ArgumentError) { OpenSSL::Digest.new("no such algorithm") }
+  end
+
   def test_digest
     null_hex = "d41d8cd98f00b204e9800998ecf8427e"
     null_bin = [null_hex].pack("H*")