redcar 0.3.2dev → 0.3.3

data/lib/openssl/src/java/org/jruby/ext/openssl/BouncyCastlePEMHandler.java

@@ -0,0 +1,69 @@
+/***** BEGIN LICENSE BLOCK *****
+ * Version: CPL 1.0/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Common Public
+ * License Version 1.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * Copyright (C) 2006 Ola Bini <ola@ologix.com>
+ * 
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the CPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the CPL, the GPL or the LGPL.
+ ***** END LICENSE BLOCK *****/
+package org.jruby.ext.openssl;
+
+import java.io.Reader;
+import java.io.Writer;
+
+import org.bouncycastle.openssl.PEMReader;
+import org.bouncycastle.openssl.PEMWriter;
+import org.bouncycastle.openssl.PasswordFinder;
+
+/**
+ * @author <a href="mailto:ola.bini@ki.se">Ola Bini</a>
+ */
+public class BouncyCastlePEMHandler implements PEMHandler {
+    public Object readPEM(Reader read, String password) throws Exception {
+        return new PEMReader(read,new BasicPasswordFinder(password)).readObject();
+    }
+
+    public void writePEM(Writer writ, Object obj, String algorithm, char[] password) throws Exception {
+        PEMWriter p = new PEMWriter(writ);
+        p.writeObject(obj,algorithm,password,null);
+        p.flush();
+    }
+
+    public void writePEM(Writer writ, Object obj) throws Exception {
+        PEMWriter p = new PEMWriter(writ);
+        p.writeObject(obj);
+        p.flush();
+    }
+
+    private static class BasicPasswordFinder implements PasswordFinder {
+        private char[] pwd;
+        BasicPasswordFinder(String pwd) {
+            if(pwd != null) {
+                this.pwd = pwd.toCharArray();
+            }
+        }
+
+        public char[] getPassword() {
+            return pwd;
+        }
+    }
+}// BouncyCastlePEMHandler

data/lib/openssl/src/java/org/jruby/ext/openssl/Callable.java

@@ -0,0 +1,10 @@
+package org.jruby.ext.openssl;
+
+/**
+ * Duplicate of java.util.concurrent.Callable, but pre-1.5.
+ * 
+ * @author nicksieger
+ */
+public interface Callable {
+    Object call();
+}

data/lib/openssl/src/java/org/jruby/ext/openssl/Cipher.java

@@ -0,0 +1,661 @@
+/***** BEGIN LICENSE BLOCK *****
+ * Version: CPL 1.0/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Common Public
+ * License Version 1.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * Copyright (C) 2006, 2007 Ola Bini <ola@ologix.com>
+ * 
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the CPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the CPL, the GPL or the LGPL.
+ ***** END LICENSE BLOCK *****/
+package org.jruby.ext.openssl;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.crypto.spec.IvParameterSpec;
+
+import javax.crypto.spec.RC2ParameterSpec;
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.RubyModule;
+import org.jruby.RubyNumeric;
+import org.jruby.RubyObject;
+import org.jruby.RubyString;
+import org.jruby.common.IRubyWarnings;
+import org.jruby.common.IRubyWarnings.ID;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.anno.JRubyModule;
+import org.jruby.exceptions.RaiseException;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.ByteList;
+
+/**
+ * @author <a href="mailto:ola.bini@ki.se">Ola Bini</a>
+ */
+public class Cipher extends RubyObject {
+    // set to enable debug output
+    private static final boolean DEBUG = false;
+    private static ObjectAllocator CIPHER_ALLOCATOR = new ObjectAllocator() {
+        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
+            return new Cipher(runtime, klass);
+        }
+    };
+    
+    public static void createCipher(Ruby runtime, RubyModule ossl) {
+        RubyModule mCipher = ossl.defineModuleUnder("Cipher");
+        RubyClass cCipher = mCipher.defineClassUnder("Cipher",runtime.getObject(), CIPHER_ALLOCATOR);
+
+        RubyClass openSSLError = ossl.getClass("OpenSSLError");
+        mCipher.defineClassUnder("CipherError",openSSLError,openSSLError.getAllocator());
+        ossl.defineClassUnder("CipherError",openSSLError,openSSLError.getAllocator());
+
+        cCipher.defineAnnotatedMethods(Cipher.class);
+        mCipher.defineAnnotatedMethods(CipherModule.class);
+    }
+
+    @JRubyModule(name="OpenSSL::Cipher")
+    public static class CipherModule {
+        @JRubyMethod(meta = true)
+        public static IRubyObject ciphers(IRubyObject recv) {
+            List<IRubyObject> ciphers = new ArrayList<IRubyObject>();
+            String[] other = {"AES128","AES192","AES256","BLOWFISH", "RC2-40-CBC", "RC2-64-CBC","RC4","RC4-40", "CAST","CAST-CBC"};
+            String[] bases = {"AES-128","AES-192","AES-256","BF", "DES", "DES-EDE","DES-EDE3", "RC2","CAST5"};
+            String[] suffixes = {"","-CBC","-CFB","-CFB1","-CFB8","-ECB","-OFB"};
+            for(int i=0,j=bases.length;i<j;i++) {
+                for(int k=0,l=suffixes.length;k<l;k++) {
+                    String val = bases[i]+suffixes[k];
+                    if(tryCipher(val)) {
+                        ciphers.add(recv.getRuntime().newString(val));
+                        ciphers.add(recv.getRuntime().newString((val).toLowerCase()));
+                    }
+                }
+            }
+            for(int i=0,j=other.length;i<j;i++) {
+                if(tryCipher(other[i])) {
+                    ciphers.add(recv.getRuntime().newString(other[i]));
+                    ciphers.add(recv.getRuntime().newString(other[i].toLowerCase()));
+                }
+            }
+            return recv.getRuntime().newArray(ciphers);
+        }
+    }
+
+    private static final Set<String> BLOCK_MODES = new HashSet<String>();
+    static {
+        BLOCK_MODES.add("CBC");
+        BLOCK_MODES.add("CFB");
+        BLOCK_MODES.add("CFB1");
+        BLOCK_MODES.add("CFB8");
+        BLOCK_MODES.add("ECB");
+        BLOCK_MODES.add("OFB");
+    }
+
+    private static String[] rubyToJavaCipher(String inName, String padding) {
+        String[] split = inName.split("-");
+        String cryptoBase = split[0];
+        String cryptoVersion = null;
+        String cryptoMode = null;
+        String realName = null;
+
+        String padding_type;
+        if (padding == null || padding.equalsIgnoreCase("PKCS5Padding")) {
+            padding_type = "PKCS5Padding";
+        } else if (padding.equals("0") || padding.equalsIgnoreCase("NoPadding")) {
+            padding_type = "NoPadding";
+        } else if (padding.equalsIgnoreCase("ISO10126Padding")) {
+            padding_type = "ISO10126Padding";
+        } else {
+            padding_type = "PKCS5Padding";
+        }
+
+        if("bf".equalsIgnoreCase(cryptoBase)) {
+            cryptoBase = "Blowfish";
+        }
+
+        if(split.length == 3) {
+            cryptoVersion = split[1];
+            cryptoMode = split[2];
+        } else {
+            if(split.length == 2) {
+                cryptoMode = split[1];
+            } else {
+                cryptoMode = "CBC";
+            }
+        }
+
+        if(cryptoBase.equalsIgnoreCase("DES") && "EDE3".equalsIgnoreCase(cryptoVersion)) {
+            realName = "DESede";
+        } else {
+            realName = cryptoBase;
+        }
+
+        if(!BLOCK_MODES.contains(cryptoMode.toUpperCase())) {
+            cryptoVersion = cryptoMode;
+            cryptoMode = "CBC";
+        }
+
+        realName = realName + "/" + cryptoMode + "/" + padding_type;
+
+        return new String[]{cryptoBase,cryptoVersion,cryptoMode,realName,padding_type};
+    }
+
+    private static boolean tryCipher(final String rubyName) {
+        return ((Boolean) (OpenSSLReal.getWithBCProvider(new Callable() {
+            public Object call() {
+                try {
+                    javax.crypto.Cipher.getInstance(rubyToJavaCipher(rubyName, null)[3], OpenSSLReal.PROVIDER);
+                    return Boolean.TRUE;
+                } catch (Exception e) {
+                    return Boolean.FALSE;
+                }
+
+            }
+        }))).booleanValue();
+    }
+
+
+    private RubyClass ciphErr;
+    public Cipher(Ruby runtime, RubyClass type) {
+        super(runtime,type);
+        ciphErr = (RubyClass)(((RubyModule)(getRuntime().getModule("OpenSSL").getConstant("Cipher"))).getConstant("CipherError"));
+    }
+
+    private javax.crypto.Cipher ciph;
+    private String name;
+    private String cryptoBase;
+    private String cryptoVersion;
+    private String cryptoMode;
+    private String padding_type;
+    private String realName;
+    private int keyLen = -1;
+    private int ivLen = -1;
+    private boolean encryptMode = true;
+    //private IRubyObject[] modeParams;
+    private boolean ciphInited = false;
+    private byte[] key;
+    private byte[] realIV;
+    private byte[] orgIV;
+    private String padding;
+    
+    void dumpVars() {
+        System.out.println("***** Cipher instance vars ****");
+        System.out.println("name = " + name);
+        System.out.println("cryptoBase = " + cryptoBase);
+        System.out.println("cryptoVersion = " + cryptoVersion);
+        System.out.println("cryptoMode = " + cryptoMode);
+        System.out.println("padding_type = " + padding_type);
+        System.out.println("realName = " + realName);
+        System.out.println("keyLen = " + keyLen);
+        System.out.println("ivLen = " + ivLen);
+        System.out.println("ciph block size = " + ciph.getBlockSize());
+        System.out.println("encryptMode = " + encryptMode);
+        System.out.println("ciphInited = " + ciphInited);
+        System.out.println("key.length = " + (key == null ? 0 : key.length));
+        System.out.println("iv.length = " + (this.realIV == null ? 0 : this.realIV.length));
+        System.out.println("padding = " + padding);
+        System.out.println("ciphAlgo = " + ciph.getAlgorithm());
+        System.out.println("*******************************");
+    }
+
+    @JRubyMethod(required=1)
+    public IRubyObject initialize(IRubyObject str) {
+        name = str.toString();
+        String[] values = rubyToJavaCipher(name, padding);
+        cryptoBase = values[0];
+        cryptoVersion = values[1];
+        cryptoMode = values[2];
+        realName = values[3];
+        padding_type = values[4];
+        ciph = getCipher();
+
+        if(hasLen() && null != cryptoVersion) {
+            try {
+                keyLen = Integer.parseInt(cryptoVersion) / 8;
+            } catch(NumberFormatException e) {
+                keyLen = -1;
+            }
+        }
+        if(keyLen == -1) {
+            if("DES".equalsIgnoreCase(cryptoBase)) {
+                ivLen = 8;
+                if("EDE3".equalsIgnoreCase(cryptoVersion)) {
+                    keyLen = 24;
+                } else {
+                    keyLen = 8;
+                }
+            } else {
+                keyLen = 16;
+                try {
+                    if ((javax.crypto.Cipher.getMaxAllowedKeyLength(name) / 8) < keyLen) {
+                        keyLen = javax.crypto.Cipher.getMaxAllowedKeyLength(name) / 8;
+                    }
+                } catch (Exception e) {
+                    // I hate checked exceptions
+                }
+            }
+        }
+
+        if(ivLen == -1) {
+            if("AES".equalsIgnoreCase(cryptoBase)) {
+                ivLen = 16;
+            } else {
+                ivLen = 8;
+            }
+        }
+        
+        return this;
+    }
+
+    @JRubyMethod(required=1)
+    public IRubyObject initialize_copy(IRubyObject obj) {
+        if(this == obj) {
+            return this;
+        }
+
+        checkFrozen();
+
+        cryptoBase = ((Cipher)obj).cryptoBase;
+        cryptoVersion = ((Cipher)obj).cryptoVersion;
+        cryptoMode = ((Cipher)obj).cryptoMode;
+        padding_type = ((Cipher)obj).padding_type;
+        realName = ((Cipher)obj).realName;
+        name = ((Cipher)obj).name;
+        keyLen = ((Cipher)obj).keyLen;
+        ivLen = ((Cipher)obj).ivLen;
+        encryptMode = ((Cipher)obj).encryptMode;
+        ciphInited = false;
+        if(((Cipher)obj).key != null) {
+            key = new byte[((Cipher)obj).key.length];
+            System.arraycopy(((Cipher)obj).key,0,key,0,key.length);
+        } else {
+            key = null;
+        }
+        if(((Cipher)obj).realIV != null) {
+            this.realIV = new byte[((Cipher)obj).realIV.length];
+            System.arraycopy(((Cipher)obj).realIV,0,this.realIV,0,this.realIV.length);
+        } else {
+            this.realIV = null;
+        }
+        this.orgIV = this.realIV;
+        padding = ((Cipher)obj).padding;
+
+        ciph = getCipher();
+
+        return this;
+    }
+
+    @JRubyMethod
+    public IRubyObject name() {
+        return getRuntime().newString(name);
+    }
+
+    @JRubyMethod
+    public IRubyObject key_len() {
+        return getRuntime().newFixnum(keyLen);
+    }
+
+    @JRubyMethod
+    public IRubyObject iv_len() {
+        return getRuntime().newFixnum(ivLen);
+    }
+
+    @JRubyMethod(name="key_len=", required=1)
+    public IRubyObject set_key_len(IRubyObject len) {
+        this.keyLen = RubyNumeric.fix2int(len);
+        return len;
+    }
+
+    @JRubyMethod(name="key=", required=1)
+    public IRubyObject set_key(IRubyObject key) {
+        byte[] keyBytes;
+        try {
+            keyBytes = key.convertToString().getBytes();
+        } catch(Exception e) {
+            e.printStackTrace();
+            throw new RaiseException(getRuntime(), ciphErr, null, true);
+        }
+        if(keyBytes.length < keyLen) {
+            throw new RaiseException(getRuntime(), ciphErr, "key length to short", true);
+        }
+
+        if(keyBytes.length > keyLen) {
+            byte[] keys = new byte[keyLen];
+            System.arraycopy(keyBytes, 0, keys, 0, keyLen);
+            keyBytes = keys;
+        }
+
+        this.key = keyBytes;
+        return key;
+    }
+
+    @JRubyMethod(name="iv=", required=1)
+    public IRubyObject set_iv(IRubyObject iv) {
+        byte[] ivBytes;
+        try {
+            ivBytes = iv.convertToString().getBytes();
+        } catch(Exception e) {
+            e.printStackTrace();
+            throw new RaiseException(getRuntime(), ciphErr, null, true);
+        }
+        if(ivBytes.length < ivLen) {
+            throw new RaiseException(getRuntime(), ciphErr, "iv length to short", true);
+        }
+        this.realIV = ivBytes;
+        this.orgIV = this.realIV;
+        ciphInited = false;
+        return iv;
+    }
+
+    @JRubyMethod
+    public IRubyObject block_size() {
+        return getRuntime().newFixnum(ciph.getBlockSize());
+    }
+
+    protected void init(IRubyObject[] args, boolean encrypt) {
+        org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,0,2);
+        
+        encryptMode = encrypt;
+        ciphInited = false;
+
+        if(args.length > 0) {
+            /*
+             * oops. this code mistakes salt for IV.
+             * We deprecated the arguments for this method, but we decided
+             * keeping this behaviour for backward compatibility.
+             */
+            byte[] pass = args[0].convertToString().getBytes();
+            byte[] iv = null;
+            try {
+                iv = "OpenSSL for Ruby rulez!".getBytes("ISO8859-1");
+                byte[] iv2 = new byte[this.ivLen];
+                System.arraycopy(iv, 0, iv2, 0, this.ivLen);
+                iv = iv2;
+            } catch(Exception e) {}
+
+            if(args.length > 1 && !args[1].isNil()) {
+                getRuntime().getWarnings().warning(ID.MISCELLANEOUS, "key derivation by " + getMetaClass().getRealClass().getName() + "#encrypt is deprecated; use " + getMetaClass().getRealClass().getName() + "::pkcs5_keyivgen instead");
+                iv = args[1].convertToString().getBytes();
+                if(iv.length > this.ivLen) {
+                    byte[] iv2 = new byte[this.ivLen];
+                    System.arraycopy(iv, 0, iv2, 0, this.ivLen);
+                    iv = iv2;
+                }
+            }
+
+            MessageDigest digest = (MessageDigest)OpenSSLReal.getWithBCProvider(new Callable() {
+                    public Object call() {
+                        try {
+                            return MessageDigest.getInstance("MD5", "BC");
+                        } catch (Exception e) {
+                            throw new RaiseException(getRuntime(), ciphErr, e.getMessage(), true);
+                        }
+                    }
+                });
+
+            OpenSSLImpl.KeyAndIv result = OpenSSLImpl.EVP_BytesToKey(keyLen,ivLen,digest,iv,pass,2048);
+            this.key = result.getKey();
+            this.realIV = iv;
+            this.orgIV = this.realIV;
+        }
+    }
+
+    @JRubyMethod(optional=2)
+    public IRubyObject encrypt(IRubyObject[] args) {
+        this.realIV = orgIV;
+        init(args, true);
+        return this;
+    }
+
+    @JRubyMethod(optional=2)
+    public IRubyObject decrypt(IRubyObject[] args) {
+        this.realIV = orgIV;
+        init(args, false);
+        return this;
+    }
+
+    @JRubyMethod
+    public IRubyObject reset() {
+        this.realIV = orgIV;
+        doInitialize();
+        return this;
+    }
+
+    javax.crypto.Cipher getCipher() {
+        return (javax.crypto.Cipher) OpenSSLReal.getWithBCProvider(new Callable() {
+            public Object call() {
+                try {
+                    return javax.crypto.Cipher.getInstance(realName, "BC");
+                } catch (NoSuchAlgorithmException e) {
+                    throw getRuntime().newLoadError("unsupported cipher algorithm (" + realName + ")");
+                } catch (NoSuchProviderException e) {
+                    throw getRuntime().newLoadError("unsupported cipher algorithm (" + realName + ")");
+                } catch (javax.crypto.NoSuchPaddingException e) {
+                    throw getRuntime().newLoadError("unsupported cipher padding (" + realName + ")");
+                }
+            }
+        });
+    }
+
+    private boolean hasLen() {
+        return hasLen(this.cryptoBase);
+    }
+
+    private static boolean hasLen(String cryptoBase) {
+        return "AES".equalsIgnoreCase(cryptoBase) || "RC2".equalsIgnoreCase(cryptoBase) || "RC4".equalsIgnoreCase(cryptoBase);
+    }
+
+    @JRubyMethod(required=1,optional=3)
+    public IRubyObject pkcs5_keyivgen(IRubyObject[] args) {
+        org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,1,4);
+        byte[] pass = args[0].convertToString().getBytes();
+        byte[] salt = null;
+        int iter = 2048;
+        IRubyObject vdigest = getRuntime().getNil();
+        MessageDigest digest = null;
+        if(args.length>1) {
+            if(!args[1].isNil()) {
+                salt = args[1].convertToString().getBytes();;
+            }
+            if(args.length>2) {
+                if(!args[2].isNil()) {
+                    iter = RubyNumeric.fix2int(args[2]);
+                }
+                if(args.length>3) {
+                    vdigest = args[3];
+                }
+            }
+        }
+        if (null != salt) {
+            if (salt.length != 8) {
+                throw new RaiseException(getRuntime(), ciphErr, "salt must be an 8-octet string", true);
+            }
+        }
+
+        final String algorithm = vdigest.isNil() ? "MD5" : ((Digest) vdigest).getAlgorithm();
+
+        digest = (MessageDigest) OpenSSLReal.getWithBCProvider(new Callable() {
+            public Object call() {
+                try {
+                    return MessageDigest.getInstance(algorithm, "BC");
+                } catch (Exception e) {
+                    throw new RaiseException(getRuntime(), ciphErr, e.getMessage(), true);
+                }
+            }
+        });
+
+        OpenSSLImpl.KeyAndIv result = OpenSSLImpl.EVP_BytesToKey(keyLen, ivLen, digest, salt, pass, iter);
+        this.key = result.getKey();
+        this.realIV = result.getIv();
+        this.orgIV = this.realIV;
+
+        doInitialize();
+
+        return getRuntime().getNil();
+    }
+
+    private void doInitialize() {
+        if (DEBUG) {
+            System.out.println("*** doInitialize");
+            dumpVars();
+        }
+
+        ciphInited = true;
+        try {
+            assert (key.length * 8 == keyLen) || (key.length == keyLen) : "Key wrong length";
+            assert (this.realIV.length * 8 == ivLen) || (this.realIV.length == ivLen) : "IV wrong length";
+            if (!"ECB".equalsIgnoreCase(cryptoMode)) {
+                if (this.realIV == null) {
+                    this.realIV = new byte[ivLen];
+                    System.arraycopy("OpenSSL for JRuby rulez".getBytes(), 0,
+                            this.realIV, 0, ivLen);
+                }
+                if ("RC2".equals(cryptoBase)) {
+                    this.ciph.init(encryptMode ? javax.crypto.Cipher.ENCRYPT_MODE : javax.crypto.Cipher.DECRYPT_MODE, new SimpleSecretKey(this.key), new RC2ParameterSpec(this.key.length * 8, this.realIV));
+                } else {
+                    this.ciph.init(encryptMode ? javax.crypto.Cipher.ENCRYPT_MODE : javax.crypto.Cipher.DECRYPT_MODE, new SimpleSecretKey(this.key), new IvParameterSpec(this.realIV));
+                }
+            } else {
+                this.ciph.init(encryptMode ? javax.crypto.Cipher.ENCRYPT_MODE : javax.crypto.Cipher.DECRYPT_MODE, new SimpleSecretKey(this.key));
+            }
+        } catch (Exception e) {
+            if (DEBUG) e.printStackTrace();
+            throw new RaiseException(getRuntime(), ciphErr, e.getMessage(), true);
+        }
+    }
+
+    private byte[] lastIv = null;
+
+    @JRubyMethod
+    public IRubyObject update(IRubyObject data) {
+        if (DEBUG) System.out.println("*** update ["+data+"]");
+
+        byte[] val = data.convertToString().getBytes();
+        if(val.length == 0) {
+            throw getRuntime().newArgumentError("data must not be empty");
+        }
+
+        if(!ciphInited) {
+            if (DEBUG) System.out.println("BEFORE INITING");
+            doInitialize();
+            if (DEBUG) System.out.println("AFTER INITING");
+        }
+
+        byte[] str = new byte[0];
+        try {
+            byte[] out = ciph.update(val);
+            if(out != null) {
+                str = out;
+
+                if(this.realIV != null) {
+                    if(lastIv == null) {
+                        lastIv = new byte[ivLen];
+                    }
+                    byte[] tmpIv = encryptMode ? out : val;
+                    if(tmpIv.length >= ivLen) {
+                        System.arraycopy(tmpIv, tmpIv.length-ivLen, lastIv, 0, ivLen);
+                    }
+                }
+            }
+        } catch(Exception e) {
+            if (DEBUG) e.printStackTrace();
+            throw new RaiseException(getRuntime(), ciphErr, e.getMessage(), true);
+        }
+
+        return RubyString.newString(getRuntime(), new ByteList(str,false));
+    }
+
+    @JRubyMethod(name="<<")
+    public IRubyObject update_deprecated(IRubyObject data) {
+        getRuntime().getWarnings().warn(IRubyWarnings.ID.DEPRECATED_METHOD, "" + this.getMetaClass().getRealClass().getName() + "#<< is deprecated; use " + this.getMetaClass().getRealClass().getName() + "#update instead");
+        return update(data);
+    }
+
+    @JRubyMethod(name="final")
+    public IRubyObject _final() {
+        if(!ciphInited) {
+            doInitialize();
+        }
+
+        ByteList str = new ByteList(ByteList.NULL_ARRAY);
+        try {
+            byte[] out = ciph.doFinal();
+            if(out != null) {
+                str = new ByteList(out,false);
+                // TODO: Modifying this line appears to fix the issue, but I do
+                // not have a good reason for why. Best I can tell, lastIv needs
+                // to be set regardless of encryptMode, so we'll go with this
+                // for now. JRUBY-3335.
+                //if(this.realIV != null && encryptMode) {
+                if(this.realIV != null) {
+                    if(lastIv == null) {
+                        lastIv = new byte[ivLen];
+                    }
+                    byte[] tmpIv = out;
+                    if(tmpIv.length >= ivLen) {
+                        System.arraycopy(tmpIv, tmpIv.length-ivLen, lastIv, 0, ivLen);
+                    }
+                }
+            }
+
+            if(this.realIV != null) {
+                this.realIV = lastIv;
+                doInitialize();
+            }
+        } catch(Exception e) {
+            throw new RaiseException(getRuntime(), ciphErr, e.getMessage(), true);
+        }
+
+        return getRuntime().newString(str);
+    }
+
+    @JRubyMethod(name="padding=")
+    public IRubyObject set_padding(IRubyObject padding) {
+        this.padding = padding.toString();
+        initialize(RubyString.newString(getRuntime(), name));
+        return padding;
+    }
+
+    String getAlgorithm() {
+        return this.ciph.getAlgorithm();
+    }
+
+    String getName() {
+        return this.name;
+    }
+
+    String getCryptoBase() {
+        return this.cryptoBase;
+    }
+
+    String getCryptoMode() {
+        return this.cryptoMode;
+    }
+
+    int getKeyLen() {
+        return this.keyLen;
+    }
+}