diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-04 15:56:00 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-04 15:56:00 +0000 |
| commit | 926d1cbf2ff816a48d94db9d2490177383609e28 (patch) | |
| tree | 8fb8a002f4f9af3d8c500cc36514d8adcddbd027 /ext | |
| parent | d825fc8de6e94abb5e918d3c6e5b4d56f572975c (diff) | |
merge revision(s) 40090:
* ext/openssl/ossl_bn.c (ossl_bn_initialize): fix can't create from bn.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/openssl/ossl_bn.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c index 5d690af52d..822b854efe 100644 --- a/ext/openssl/ossl_bn.c +++ b/ext/openssl/ossl_bn.c @@ -119,11 +119,11 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self) if (rb_scan_args(argc, argv, "11", &str, &bs) == 2) { base = NUM2INT(bs); } - StringValue(str); - GetBN(self, bn); + if (RTEST(rb_obj_is_kind_of(str, cBN))) { BIGNUM *other; + GetBN(self, bn); GetBN(str, other); /* Safe - we checked kind_of? above */ if (!BN_copy(bn, other)) { ossl_raise(eBNError, NULL); @@ -131,6 +131,8 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self) return self; } + StringValue(str); + GetBN(self, bn); switch (base) { case 0: if (!BN_mpi2bn((unsigned char *)RSTRING_PTR(str), RSTRING_LENINT(str), bn)) { |