REVERT d32ed55 as it introduced a (more serious) encrypt/decrypt failure

Author: kares

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

@@ -1088,12 +1088,12 @@ public IRubyObject update(final ThreadContext context, final IRubyObject arg) {
             if ( out != null ) {
                 str = new ByteList(out, false);
                 if ( realIV != null ) setLastIVIfNeeded( encryptMode ? out : data );
+
+                processedDataBytes += data.length;
             }
             else {
                 str = new ByteList(ByteList.NULL_ARRAY);
             }
-
-            processedDataBytes += data.length;
         }
         catch (Exception e) {
             debugStackTrace( runtime, e );
@@ -1132,12 +1132,12 @@ public IRubyObject do_final(final ThreadContext context) {
                 str = new ByteList(ByteList.NULL_ARRAY);
             }
 
-            if ( ! isStreamCipher() ) {
-                if ( str.length() > processedDataBytes ) {
+            //if ( ! isStreamCipher() ) {
+                //if ( str.length() > processedDataBytes && processedDataBytes > 0 ) {
                     // MRI compatibility only trailing bytes :
-                    str.setRealSize(processedDataBytes);
-                }
-            }
+                    //str.setRealSize(processedDataBytes);
+                //}
+            //}
 
             if (realIV != null) {
                 realIV = lastIV;

src/test/ruby/test_cipher.rb

@@ -82,6 +82,7 @@ def test_encrypt_decrypt_des_ede3 # borrowed from OpenSSL suite
     c2.encrypt.pkcs5_keyivgen(key, iv)
     s1 = c1.update(data) + c1.final
     s2 = c2.update(data) + c2.final
+    assert_equal "\xC5q\x99)\x81\xE6\xE7\x06", s1
     assert_equal(s1, s2, "encrypt")
 
     c1.decrypt.pkcs5_keyivgen(key, iv)
@@ -185,8 +186,8 @@ def test_encrypt_aes_cfb_4_incompatibility
     expected = "f0@\x02" # from MRI
     actual = cipher.update(bytes)
     if jruby? # NOTE: ugly but this is as far as JCE gets us :
-      #assert_equal expected, actual
-      assert_equal expected, cipher.final
+      ##assert_equal expected, actual
+      #assert_equal expected, cipher.final
     else
       assert_equal expected, actual
       assert_equal "", cipher.final
@@ -203,8 +204,8 @@ def test_encrypt_aes_cfb_16_incompatibility
     expected = "f0@\x02\xF6\xA8\xC2\rt\xCC\x83\x8F8e\x19R" # from MRI
     actual = cipher.update(bytes)
     if jruby? # NOTE: ugly but this is as far as JCE gets us :
-      #assert_equal expected, actual
-      assert_equal expected, cipher.final
+      ##assert_equal expected, actual
+      #assert_equal expected, cipher.final
     else
       assert_equal expected, actual
       assert_equal "", cipher.final