1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openssl: avoid deprecated BN_*prime* functions

Browse Source 
* ext/openssl/ossl_bn.c (ossl_bn_s_generate_prime, ossl_bn_is_prime,
  ossl_bn_is_prime_fasttest): Avoid deprecated BN_generate_prime(),
  BN_is_prime{,_fasttest}(). They are deprecated because they expect an
  old style callback function (we don't use it here). They can be simply
  replaced by _ex suffixed functions.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55273 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
rhe 2016-06-04 02:35:09 +00:00
parent 40c3c3ec6c
commit 1f3ec6d858
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ext/openssl/ossl_bn.c
View File

@ -743,6 +743,10 @@ BIGNUM_RAND_RANGE(pseudo_rand)
* call-seq: * call-seq:
* BN.generate_prime(bits, [, safe [, add [, rem]]]) => bn * BN.generate_prime(bits, [, safe [, add [, rem]]]) => bn
* *
* Generates a random prime number of bit length +bits+. If +safe+ is true,
* generates a safe prime. If +add+ is specified, generates a prime that
* fulfills condition <tt>p % add = rem</tt>.
*
* === Parameters * === Parameters
* * +bits+ - integer * * +bits+ - integer
* * +safe+ - boolean * * +safe+ - boolean
@ -771,7 +775,7 @@ ossl_bn_s_generate_prime(int argc, VALUE *argv, VALUE klass)
if (!(result = BN_new())) { if (!(result = BN_new())) {
ossl_raise(eBNError, NULL); ossl_raise(eBNError, NULL);
} }
if (!BN_generate_prime(result, num, safe, add, rem, NULL, NULL)) { if (!BN_generate_prime_ex(result, num, safe, add, rem, NULL)) {
BN_free(result); BN_free(result);
ossl_raise(eBNError, NULL); ossl_raise(eBNError, NULL);
} }
@ -922,6 +926,10 @@ ossl_bn_hash(VALUE self)
* bn.prime? => true | false * bn.prime? => true | false
* bn.prime?(checks) => true | false * bn.prime?(checks) => true | false
* *
* Performs a Miller-Rabin probabilistic primality test with +checks+
* iterations. If +nchecks+ is not specified, a number of iterations is used
* that yields a false positive rate of at most 2^-80 for random input.
*
* === Parameters * === Parameters
* * +checks+ - integer * * +checks+ - integer
*/ */
@ -936,7 +944,7 @@ ossl_bn_is_prime(int argc, VALUE *argv, VALUE self)
checks = NUM2INT(vchecks); checks = NUM2INT(vchecks);
} }
GetBN(self, bn); GetBN(self, bn);
switch (BN_is_prime(bn, checks, NULL, ossl_bn_ctx, NULL)) { switch (BN_is_prime_ex(bn, checks, ossl_bn_ctx, NULL)) {
case 1: case 1:
return Qtrue; return Qtrue;
case 0: case 0:
@ -954,6 +962,9 @@ ossl_bn_is_prime(int argc, VALUE *argv, VALUE self)
* bn.prime_fasttest?(checks) => true | false * bn.prime_fasttest?(checks) => true | false
* bn.prime_fasttest?(checks, trial_div) => true | false * bn.prime_fasttest?(checks, trial_div) => true | false
* *
* Performs a Miller-Rabin primality test. This is same as #prime? except this
* first attempts trial divisions with some small primes.
*
* === Parameters * === Parameters
* * +checks+ - integer * * +checks+ - integer
* * +trial_div+ - boolean * * +trial_div+ - boolean
@ -975,7 +986,7 @@ ossl_bn_is_prime_fasttest(int argc, VALUE *argv, VALUE self)
if (vtrivdiv == Qfalse) { if (vtrivdiv == Qfalse) {
do_trial_division = 0; do_trial_division = 0;
} }
switch (BN_is_prime_fasttest(bn, checks, NULL, ossl_bn_ctx, NULL, do_trial_division)) { switch (BN_is_prime_fasttest_ex(bn, checks, ossl_bn_ctx, do_trial_division, NULL)) {
case 1: case 1:
return Qtrue; return Qtrue;
case 0: case 0:
@ -1065,6 +1076,7 @@ Init_ossl_bn(void)
rb_define_singleton_method(cBN, "generate_prime", ossl_bn_s_generate_prime, -1); rb_define_singleton_method(cBN, "generate_prime", ossl_bn_s_generate_prime, -1);
rb_define_method(cBN, "prime?", ossl_bn_is_prime, -1); rb_define_method(cBN, "prime?", ossl_bn_is_prime, -1);
rb_define_method(cBN, "prime_fasttest?", ossl_bn_is_prime_fasttest, -1);
rb_define_method(cBN, "set_bit!", ossl_bn_set_bit, 1); rb_define_method(cBN, "set_bit!", ossl_bn_set_bit, 1);
rb_define_method(cBN, "clear_bit!", ossl_bn_clear_bit, 1); rb_define_method(cBN, "clear_bit!", ossl_bn_clear_bit, 1);
@ -1106,10 +1118,4 @@ Init_ossl_bn(void)
/* RECiProcal /* RECiProcal
* MONTgomery */ * MONTgomery */
/*
* TODO:
* Where to belong these?
*/
rb_define_method(cBN, "prime_fasttest?", ossl_bn_is_prime_fasttest, -1);
} }