[compat] adjust error raised from PKey::RSA

Author: kares

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

@@ -595,7 +595,7 @@ private static ASN1ObjectIdentifier osslNameToCipherOid(final String osslName) {
 
     private String getPadding(final int padding) {
         if ( padding < 1 || padding > 4 ) {
-            throw newRSAError(getRuntime(), "");
+            throw newPKeyError(getRuntime(), "");
         }
         // BC accepts "/NONE/*" but SunJCE doesn't. use "/ECB/*"
         String p = "/ECB/PKCS1Padding";
@@ -615,7 +615,7 @@ public IRubyObject private_encrypt(final ThreadContext context, final IRubyObjec
         if ( Arity.checkArgumentCount(context.runtime, args, 1, 2) == 2 && ! args[1].isNil() ) {
             padding = RubyNumeric.fix2int(args[1]);
         }
-        if ( privateKey == null ) throw newRSAError(context.runtime, "incomplete RSA");
+        if ( privateKey == null ) throw newPKeyError(context.runtime, "incomplete RSA");
         return doCipherRSA(context.runtime, args[0], padding, ENCRYPT_MODE, privateKey);
     }
 
@@ -625,7 +625,7 @@ public IRubyObject private_decrypt(final ThreadContext context, final IRubyObjec
         if ( Arity.checkArgumentCount(context.runtime, args, 1, 2) == 2 && ! args[1].isNil())  {
             padding = RubyNumeric.fix2int(args[1]);
         }
-        if ( privateKey == null ) throw newRSAError(context.runtime, "incomplete RSA");
+        if ( privateKey == null ) throw newPKeyError(context.runtime, "incomplete RSA");
         return doCipherRSA(context.runtime, args[0], padding, DECRYPT_MODE, privateKey);
     }
 
@@ -635,7 +635,7 @@ public IRubyObject public_encrypt(final ThreadContext context, final IRubyObject
         if ( Arity.checkArgumentCount(context.runtime, args, 1, 2) == 2 && ! args[1].isNil())  {
             padding = RubyNumeric.fix2int(args[1]);
         }
-        if ( publicKey == null ) throw newRSAError(context.runtime, "incomplete RSA");
+        if ( publicKey == null ) throw newPKeyError(context.runtime, "incomplete RSA");
         return doCipherRSA(context.runtime, args[0], padding, ENCRYPT_MODE, publicKey);
     }
 
@@ -645,7 +645,7 @@ public IRubyObject public_decrypt(final ThreadContext context, final IRubyObject
         if ( Arity.checkArgumentCount(context.runtime, args, 1, 2) == 2 && ! args[1].isNil() ) {
             padding = RubyNumeric.fix2int(args[1]);
         }
-        if ( publicKey == null ) throw newRSAError(context.runtime, "incomplete RSA");
+        if ( publicKey == null ) throw newPKeyError(context.runtime, "incomplete RSA");
         return doCipherRSA(context.runtime, args[0], padding, DECRYPT_MODE, publicKey);
     }
 

src/test/ruby/rsa/test_rsa.rb

@@ -9,6 +9,15 @@ def setup
     require 'base64'
   end
 
+  def test_no_private_exp
+    key = OpenSSL::PKey::RSA.new
+    rsa = Fixtures.pkey("rsa-1.pem")
+    key.set_key(rsa.n, rsa.e, nil)
+    key.set_factors(rsa.p, rsa.q)
+    assert_raise(OpenSSL::PKey::PKeyError){ key.private_encrypt("foo") }
+    assert_raise(OpenSSL::PKey::PKeyError){ key.private_decrypt("foo") }
+  end
+
   def test_private
     # Generated by key size and public exponent
     key = OpenSSL::PKey::RSA.new(512, 3)
@@ -128,6 +137,33 @@ def test_rsa_public_encrypt
     # }
   end
 
+  def test_sign_verify_raw_legacy
+    key = Fixtures.pkey("rsa-1.pem")
+    bits = key.n.num_bits
+
+    # Need right size for raw mode
+    plain0 = "x" * (bits/8)
+    cipher = key.private_encrypt(plain0, OpenSSL::PKey::RSA::NO_PADDING)
+    plain1 = key.public_decrypt(cipher, OpenSSL::PKey::RSA::NO_PADDING)
+    assert_equal(plain0, plain1)
+
+    # Need smaller size for pkcs1 mode
+    plain0 = "x" * (bits/8 - 11)
+    cipher1 = key.private_encrypt(plain0, OpenSSL::PKey::RSA::PKCS1_PADDING)
+    plain1 = key.public_decrypt(cipher1, OpenSSL::PKey::RSA::PKCS1_PADDING)
+    assert_equal(plain0, plain1)
+
+    cipherdef = key.private_encrypt(plain0) # PKCS1_PADDING is default
+    plain1 = key.public_decrypt(cipherdef)
+    assert_equal(plain0, plain1)
+    assert_equal(cipher1, cipherdef)
+
+    # Failure cases
+    assert_raise(ArgumentError){ key.private_encrypt() }
+    assert_raise(ArgumentError){ key.private_encrypt("hi", 1, nil) }
+    assert_raise(OpenSSL::PKey::PKeyError){ key.private_encrypt(plain0, 666) }
+  end
+
   def test_rsa_param_accessors
     key_file = File.join(File.dirname(__FILE__), 'private_key.pem')
     key = OpenSSL::PKey::RSA.new(File.read(key_file))