diff options
author | Kazuki Yamaguchi <k@rhe.jp> | 2021-03-21 00:20:04 +0900 |
---|---|---|
committer | Kazuki Yamaguchi <k@rhe.jp> | 2021-10-24 17:24:50 +0900 |
commit | 2d34e85ddfaad673f7c756b215726a304b757215 (patch) | |
tree | cc49ac4e9d43b2985bdc7c140f871383cd6d3882 | |
parent | d42bd7fcdb73b8d37f889b6e2dbf8508df7a335d (diff) | |
download | ruby-openssl-2d34e85ddfaad673f7c756b215726a304b757215.tar.gz |
bn: make BN.pseudo_rand{,_range} an alias of BN.rand{,_range}
BN_pseudo_rand() and BN_pseudo_rand_range() are deprecated in
OpenSSL 3.0. Since they are identical to their non-'pseudo' version
anyway, let's make them alias.
-rw-r--r-- | ext/openssl/ossl_bn.c | 18 | ||||
-rw-r--r-- | test/openssl/test_bn.rb | 4 |
2 files changed, 6 insertions, 16 deletions
diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c index 128ffabd..5d17b13a 100644 --- a/ext/openssl/ossl_bn.c +++ b/ext/openssl/ossl_bn.c @@ -826,12 +826,6 @@ BIGNUM_SELF_SHIFT(rshift) */ BIGNUM_RAND(rand) -/* - * Document-method: OpenSSL::BN.pseudo_rand - * BN.pseudo_rand(bits [, fill [, odd]]) -> aBN - */ -BIGNUM_RAND(pseudo_rand) - #define BIGNUM_RAND_RANGE(func) \ static VALUE \ ossl_bn_s_##func##_range(VALUE klass, VALUE range) \ @@ -858,14 +852,6 @@ BIGNUM_RAND(pseudo_rand) BIGNUM_RAND_RANGE(rand) /* - * Document-method: OpenSSL::BN.pseudo_rand_range - * call-seq: - * BN.pseudo_rand_range(range) -> aBN - * - */ -BIGNUM_RAND_RANGE(pseudo_rand) - -/* * call-seq: * BN.generate_prime(bits, [, safe [, add [, rem]]]) => bn * @@ -1278,9 +1264,9 @@ Init_ossl_bn(void) * get_word */ rb_define_singleton_method(cBN, "rand", ossl_bn_s_rand, -1); - rb_define_singleton_method(cBN, "pseudo_rand", ossl_bn_s_pseudo_rand, -1); rb_define_singleton_method(cBN, "rand_range", ossl_bn_s_rand_range, 1); - rb_define_singleton_method(cBN, "pseudo_rand_range", ossl_bn_s_pseudo_rand_range, 1); + rb_define_alias(rb_singleton_class(cBN), "pseudo_rand", "rand"); + rb_define_alias(rb_singleton_class(cBN), "pseudo_rand_range", "rand_range"); rb_define_singleton_method(cBN, "generate_prime", ossl_bn_s_generate_prime, -1); rb_define_method(cBN, "prime?", ossl_bn_is_prime, -1); diff --git a/test/openssl/test_bn.rb b/test/openssl/test_bn.rb index c36d6b89..3f0622f9 100644 --- a/test/openssl/test_bn.rb +++ b/test/openssl/test_bn.rb @@ -248,6 +248,10 @@ class OpenSSL::TestBN < OpenSSL::TestCase r5 = OpenSSL::BN.rand_range(256) assert_include(0..255, r5) } + + # Aliases + assert_include(128..255, OpenSSL::BN.pseudo_rand(8)) + assert_include(0..255, OpenSSL::BN.pseudo_rand_range(256)) end begin |