@@ -23,7 +23,7 @@ end desc "Compile the native Java code." task :java_compile do mkdir_p "pkg/classes" - sh "javac -target 1.4 -source 1.4 -d pkg/classes #{java_classpath_arg} #{FileList['src/java/**/*.java'].join(' ')}" + sh "javac -target 1.5 -source 1.5 -d pkg/classes #{java_classpath_arg} #{FileList['src/java/**/*.java'].join(' ')}" File.open("pkg/classes/manifest.mf", "w") {|f| f.puts "Class-Path: #{BC_JARS.map{|f| File.basename(f) }.join(' ')}"} sh "jar cfm lib/jopenssl.jar pkg/classes/manifest.mf -C pkg/classes/ ." end Rakefile @@ -9,8 +9,8 @@ <property name="target.classes.test" value="${target}/test-classes"/> <property name="lib.dir" value="lib"/> <property name="jruby.jar" value="${jruby.home}/lib/jruby.jar"/> - <property name="version.source" value="1.4"/> - <property name="version.target" value="1.4"/> + <property name="version.source" value="1.5"/> + <property name="version.target" value="1.5"/> <path id="build.classpath"> <fileset dir="${lib.dir}" includes="*.jar" excludes="jopenssl.jar,jruby.jar"/> build.xml @@ -43,6 +43,7 @@ import org.jruby.RubyModule; import org.jruby.RubyNumeric; import org.jruby.RubyObject; import org.jruby.RubyString; +import org.jruby.common.IRubyWarnings; import org.jruby.exceptions.RaiseException; import org.jruby.runtime.Block; import org.jruby.runtime.CallbackFactory; @@ -334,6 +335,13 @@ public class Cipher extends RubyObject { 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; } @@ -499,7 +507,7 @@ public class Cipher extends RubyObject { } public IRubyObject update_deprecated(IRubyObject data) { - getRuntime().getWarnings().warn("" + this.getMetaClass().getRealClass().getName() + "#<< is deprecated; use " + this.getMetaClass().getRealClass().getName() + "#update instead"); + getRuntime().getWarnings().warn(IRubyWarnings.ID.DEPRECATED_METHOD, "" + this.getMetaClass().getRealClass().getName() + "#<< is deprecated; use " + this.getMetaClass().getRealClass().getName() + "#update instead"); return update(data); } src/java/org/jruby/ext/openssl/Cipher.java 63e8881fcf4f84c0a567510d47e6ab92c64f9793 olabini olabini@8ba958d5-0c1a-0410-94a6-a65dfc1b28a6 http://github.com/jruby/jruby-openssl/commit/04a5971b6727c8c22f1e8fb87bfcadaa02f7e384 04a5971b6727c8c22f1e8fb87bfcadaa02f7e384 2008-02-11T05:23:36-08:00 2008-02-11T05:23:36-08:00 Fix for JRUBY-1100, truncate IV if it's too long. Also update JOpenSSL to new JRuby trunk, and to build with 1.5 git-svn-id: svn+ssh://rubyforge.org/var/svn/jruby-extras/trunk/jopenssl@896 8ba958d5-0c1a-0410-94a6-a65dfc1b28a6 24a1a2bbf5b4e664d1adb0b7f94f6781b421866a olabini olabini@8ba958d5-0c1a-0410-94a6-a65dfc1b28a6