[fix] raise PKeyError upon invalid RSA key

Author: kares

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

@@ -336,7 +336,7 @@ public IRubyObject initialize(final ThreadContext context, final IRubyObject[] a
         if ( key == null ) key = tryPKCS8EncodedKey(runtime, rsaFactory, str.getBytes());
         if ( key == null ) key = tryX509EncodedKey(runtime, rsaFactory, str.getBytes());
 
-        if ( key == null ) throw newRSAError(runtime, "Neither PUB key nor PRIV key:");
+        if ( key == null ) throw newPKeyError(runtime, "Neither PUB key nor PRIV key:");
 
         if ( key instanceof KeyPair ) {
             PublicKey publicKey = ((KeyPair) key).getPublic();

src/test/ruby/rsa/test_rsa.rb

@@ -437,7 +437,7 @@ def test_RSAPrivateKey_encrypted
     cipher = OpenSSL::Cipher.new("aes-128-cbc")
     exported = rsa1024.to_pem(cipher, "abcdef\0\1")
     assert_same_rsa rsa1024, OpenSSL::PKey::RSA.new(exported, "abcdef\0\1")
-    assert_raise(OpenSSL::PKey::RSAError) {
+    assert_raise(OpenSSL::PKey::PKeyError) {
       OpenSSL::PKey::RSA.new(exported, "abcdef")
     }
   end

src/test/ruby/test_pkey.rb

@@ -78,7 +78,7 @@ def test_pkey_pem_file_error
     begin
       ret = OpenSSL::PKey::RSA.new('not a PEM file')
       fail "expected OpenSSL::PKey::RSA.new to raise (got: #{ret.inspect})"
-    rescue OpenSSL::PKey::RSAError
+    rescue OpenSSL::PKey::PKeyError
       assert true
     end
   end