kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/openssl/ossl_bn.c (ossl_bn_initialize): allow Fixnum and Bignum.

Browse source 
[ruby-core:53986] [Feature #8217]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40461 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2013-04-25 07:02:31 +00:00
parent 4a50d447d9
commit 8b29525dad
5 changed files with 79 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Apr 25 14:35:01 2013 NARUSE, Yui <naruse@ruby-lang.org>
* ext/openssl/ossl_bn.c (ossl_bn_initialize): allow Fixnum and Bignum.
[ruby-core:53986] [Feature #8217]
Thu Apr 25 14:26:32 2013 NARUSE, Yui <naruse@ruby-lang.org>
* lib/uri/common.rb (URI.decode_www_form): follow current URL Standard.

4
NEWS
View file

@ -57,6 +57,10 @@ with all sufficient information, see the ChangeLog file.
* Pathname#write
* Pathname#binwrite
* OpenSSL::BN
* extended methods:
* OpenSSL::BN.new allows Fixnum/Bignum argument.
* open-uri
* Support multiple fields with same field name (like Set-Cookie).

2
ext/openssl/lib/openssl/bn.rb
View file

@ -29,7 +29,7 @@ end # OpenSSL
#
class Integer
def to_bn
OpenSSL::BN::new(self.to_s(16), 16)
OpenSSL::BN::new(self)
end
end # Integer

39
ext/openssl/ossl_bn.c
View file

@ -106,6 +106,7 @@ ossl_bn_alloc(VALUE klass)
* call-seq:
* BN.new => aBN
* BN.new(bn) => aBN
* BN.new(integer) => aBN
* BN.new(string) => aBN
* BN.new(string, 0 | 2 | 10 | 16) => aBN
*/
@ -120,6 +121,44 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
base = NUM2INT(bs);
}
if (RB_TYPE_P(str, T_FIXNUM)) {
long i;
unsigned char *bin = (unsigned char*)ALLOC_N(long, 1);
long n = FIX2LONG(str);
unsigned long un = abs(n);
for (i = sizeof(VALUE) - 1; 0 <= i; i--) {
bin[i] = un&0xff;
un >>= 8;
}
GetBN(self, bn);
if (!BN_bin2bn(bin, sizeof(long), bn)) {
ossl_raise(eBNError, NULL);
}
if (n < 0) BN_set_negative(bn, 1);
return self;
}
else if (RB_TYPE_P(str, T_BIGNUM)) {
long i, j;
BDIGIT *ds = RBIGNUM_DIGITS(str);
unsigned char *bin = (unsigned char*)ALLOC_N(BDIGIT, RBIGNUM_LEN(str));
for (i = 0; RBIGNUM_LEN(str) > i; i++) {
BDIGIT v = ds[i];
for (j = sizeof(BDIGIT) - 1; 0 <= j; j--) {
bin[(RBIGNUM_LEN(str)-1-i)*sizeof(BDIGIT)+j] = v&0xff;
v >>= 8;
}
}
GetBN(self, bn);
if (!BN_bin2bn(bin, sizeof(BDIGIT)*RBIGNUM_LEN(str), bn)) {
ossl_raise(eBNError, NULL);
}
if (!RBIGNUM_SIGN(str)) BN_set_negative(bn, 1);
return self;
}
if (RTEST(rb_obj_is_kind_of(str, cBN))) {
BIGNUM *other;

35
test/openssl/test_bn.rb
View file

@ -3,13 +3,38 @@ require_relative 'utils'
if defined?(OpenSSL)
class OpenSSL::TestBN < Test::Unit::TestCase
def test_bn_to_bn
assert_equal(999.to_bn, OpenSSL::BN.new(999.to_bn))
def test_new_str
e1 = OpenSSL::BN.new(999.to_s(16), 16) # OpenSSL::BN.new(str, 16) must be most stable
e2 = OpenSSL::BN.new((2**107-1).to_s(16), 16)
assert_equal(e1, OpenSSL::BN.new("999"))
assert_equal(e2, OpenSSL::BN.new((2**107-1).to_s))
assert_equal(e1, OpenSSL::BN.new("999", 10))
assert_equal(e2, OpenSSL::BN.new((2**107-1).to_s, 10))
assert_equal(e1, OpenSSL::BN.new("\x03\xE7", 2))
assert_equal(e2, OpenSSL::BN.new("\a\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", 2))
assert_equal(e1, OpenSSL::BN.new("\x00\x00\x00\x02\x03\xE7", 0))
assert_equal(e2, OpenSSL::BN.new("\x00\x00\x00\x0E\a\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", 0))
end
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))
def test_new_bn
e1 = OpenSSL::BN.new(999.to_s(16), 16)
e2 = OpenSSL::BN.new((2**107-1).to_s(16), 16)
assert_equal(e1, OpenSSL::BN.new(e1))
assert_equal(e2, OpenSSL::BN.new(e2))
end
def test_new_integer
assert_equal(999.to_bn, OpenSSL::BN.new(999))
assert_equal((2 ** 107 - 1).to_bn, OpenSSL::BN.new(2 ** 107 - 1))
assert_equal(-999.to_bn, OpenSSL::BN.new(-999))
assert_equal((-(2 ** 107 - 1)).to_bn, OpenSSL::BN.new(-(2 ** 107 - 1)))
end
def test_to_bn
e1 = OpenSSL::BN.new(999.to_s(16), 16)
e2 = OpenSSL::BN.new((2**107-1).to_s(16), 16)
assert_equal(e1, 999.to_bn)
assert_equal(e2, (2**107-1).to_bn)
end
def test_prime_p