diff options
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | ext/openssl/lib/openssl/bn.rb | 2 | ||||
| -rw-r--r-- | ext/openssl/ossl_bn.c | 2 | ||||
| -rw-r--r-- | test/openssl/test_bn.rb | 21 | ||||
| -rw-r--r-- | version.h | 10 |
5 files changed, 46 insertions, 7 deletions
@@ -1,3 +1,21 @@ +Fri May 20 23:06:31 2011 NAKAMURA, Hiroshi <nahi@ruby-lang.org> + + * Backported the fix at + Mon Sep 13 09:23:58 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/openssl/ossl_bn.c (ossl_bn_is_prime): fix comparison + with rb_scan_args. Before this fix, OpenSSL::BN#prime? + is fully broken. + +Fri May 20 23:06:31 2011 NAKAMURA, Hiroshi <nahi@ruby-lang.org> + + * Backported the fix at + Mon Oct 4 09:30:42 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/openssl/lib/openssl/bn.rb (Integer#to_bn): OpenSSL::BN.new + accepts only Strings, so call Integer#to_s(16). + 16 is for an optimization. [ruby-dev:42336] + Fri Feb 18 21:18:55 2011 Shugo Maeda <shugo@ruby-lang.org> * test/ruby/test_exception.rb (TestException::test_to_s_taintness_propagation): diff --git a/ext/openssl/lib/openssl/bn.rb b/ext/openssl/lib/openssl/bn.rb index e7cbf2cfaf..624c13715c 100644 --- a/ext/openssl/lib/openssl/bn.rb +++ b/ext/openssl/lib/openssl/bn.rb @@ -29,7 +29,7 @@ end # OpenSSL # class Integer def to_bn - OpenSSL::BN::new(self) + OpenSSL::BN::new(self.to_s(16), 16) end end # Integer diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c index 6e7c4b628a..be43b0eacd 100644 --- a/ext/openssl/ossl_bn.c +++ b/ext/openssl/ossl_bn.c @@ -669,7 +669,7 @@ ossl_bn_is_prime(int argc, VALUE *argv, VALUE self) VALUE vchecks; int checks = BN_prime_checks; - if (rb_scan_args(argc, argv, "01", &vchecks) == 0) { + if (rb_scan_args(argc, argv, "01", &vchecks) == 1) { checks = NUM2INT(vchecks); } GetBN(self, bn); diff --git a/test/openssl/test_bn.rb b/test/openssl/test_bn.rb new file mode 100644 index 0000000000..adbe4f12c3 --- /dev/null +++ b/test/openssl/test_bn.rb @@ -0,0 +1,21 @@ +begin + require "openssl" + require File.join(File.dirname(__FILE__), "utils.rb") +rescue LoadError +end + +if defined?(OpenSSL) + +class OpenSSL::TestBN < Test::Unit::TestCase + def test_integer_to_bn + assert_equal(999.to_bn, OpenSSL::BN.new(999.to_s(16), 16)) + assert_equal((2 ** 107 - 1).to_bn, OpenSSL::BN.new((2 ** 107 - 1).to_s(16), 16)) + end + + def test_prime_p + OpenSSL::BN.new((2 ** 107 - 1).to_s(16), 16).prime? + OpenSSL::BN.new((2 ** 127 - 1).to_s(16), 16).prime?(1) + end +end + +end @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2011-02-18" +#define RUBY_RELEASE_DATE "2011-05-20" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20110218 -#define RUBY_PATCHLEVEL 334 +#define RUBY_RELEASE_CODE 20110520 +#define RUBY_PATCHLEVEL 335 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2011 -#define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 18 +#define RUBY_RELEASE_MONTH 5 +#define RUBY_RELEASE_DAY 20 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |