aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-09-13 00:40:10 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-09-13 00:40:10 +0000
commit6ebb345dd7c634461fa0cc272d3590a86ebe2aad (patch)
treede4565fc5c7e9bed957d446c4c2bc54d98b25e75
parentf31eccfa183e7284b37edda6600397c724ee13cc (diff)
downloadruby-6ebb345dd7c634461fa0cc272d3590a86ebe2aad.tar.gz
* ext/openssl/ossl_bn.c (ossl_bn_is_prime): fix comparison
with rb_scan_args. Before this fix, OpenSSL::BN#prime? is fully broken. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--ext/openssl/ossl_bn.c2
-rw-r--r--test/openssl/test_bn.rb17
3 files changed, 24 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 069ab91641..5fa2280692 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
Mon Sep 13 06:45:24 2010 Tanaka Akira <akr@fsij.org>
* ext/pathname/pathname.c (path_writable_real_p):
diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c
index bec5135f12..6adc59fc1a 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..da77a556b0
--- /dev/null
+++ b/test/openssl/test_bn.rb
@@ -0,0 +1,17 @@
+begin
+ require "openssl"
+rescue LoadError
+end
+require "digest/md5"
+require "test/unit"
+
+if defined?(OpenSSL)
+
+class OpenSSL::TestBN < Test::Unit::TestCase
+ 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