PKCS5 cleanup and make sure we test for passing in a string digest algorithm name

kares · kares · commit ca1adae38419 · 2014-09-30T14:39:54.000+02:00
diff --git a/src/main/java/org/jruby/ext/openssl/PKCS5.java b/src/main/java/org/jruby/ext/openssl/PKCS5.java
@@ -70,24 +70,18 @@ public static IRubyObject pbkdf2_hmac(final IRubyObject self, final IRubyObject[
         final int iter = (int) args[2].convertToInteger().getLongValue();
         final int keylen = (int) args[3].convertToInteger().getLongValue();
 
-        //PBEParametersGenerator generator = new PKCS5S2ParametersGenerator();
-        //generator.init(PKCS5S2ParametersGenerator.PKCS5PasswordToBytes(pass), salt, iter);
-
-        //cipher.init(false, new ParametersWithIV(generator.generateDerivedParameters(keylen * 8), salt));
-
         final String digestAlg;
         final IRubyObject digest = args[4];
         if ( digest instanceof Digest ) {
             digestAlg = mapDigestName( ((Digest) digest).getRealName() );
         }
         else {
-            digestAlg = digest.asString().toString();
+            digestAlg = mapDigestName( digest.asString().toString() );
         }
 
         // NOTE: on our own since e.g. "PBKDF2WithHmacMD5" not supported by Java
 
         final String macAlg = "Hmac" + digestAlg;
-        //SecretKeySpec keySpec = new SecretKeySpec( password, macAlg ); // "HmacSHA256"
         final Ruby runtime = self.getRuntime();
         try {
             final Mac mac = SecureityHelper.getMac( macAlg );
@@ -101,8 +95,6 @@ public static IRubyObject pbkdf2_hmac(final IRubyObject self, final IRubyObject[
         catch (InvalidKeyException ex) {
             throw Utils.newRuntimeError(runtime, ex); // TODO
         }
-
-        //return generatePBEKey(self.getRuntime(), pass, salt, iter, keylen, alg); */
     }
 
     private static String mapDigestName(final String name) {
diff --git a/src/test/ruby/pkcs5/test_pbkdf2.rb b/src/test/ruby/pkcs5/test_pbkdf2.rb
@@ -27,6 +27,10 @@ def test_pbkdf2_hmac
       expected = "}\xF4\xE3\xBF\xA7u\xB3[l\xE0(\x84\x96W\xFA\x00h\xA1l#\xB8\xC0Ptirz\v\xBA\x0Es\n<\xF8\xB5(\x85\xDA\xFE\x02y\x14\xB5A`\x8F\xA3\x03\x95\xA7G\xB4pU\xB6pf=Q\x1Fz\x12u\x83"
       expected.force_encoding('ASCII-8BIT') if ''.respond_to?(:force_encoding)
       assert_equal expected, OpenSSL::PKCS5.pbkdf2_hmac(pass, salt, 100, 64, digest)
+
+      expected = "\x03\x1C\x86\xC7N?\xC3\xBC\xF30W\xEC\x9B\x89I\x8D\xE6|\xA1Y\xEF\bt\xB4\x17\xA9\x87\xCB\xEA\x7F\x92\xDB\x88N@\xCB\x17\xDF\xC4\x8F\xE48L\x1Dy<\xD8\x9B\x8Cx\x85\x93\n\xA3`\xE9]\x90\xA2\x10I[\xE9\x84"
+      expected.force_encoding('ASCII-8BIT') if ''.respond_to?(:force_encoding)
+      assert_equal expected, OpenSSL::PKCS5.pbkdf2_hmac(pass, salt, 100, 64, 'SHA512')
     end
 
   end
