mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
e4a26cd4f8
Import current master (2c43241dc0ed) of ruby/openssl.git.
Below are the commits that were made since the last batch at commit
b99775b163
(ruby/openssl.git commit f49e7110ca1e). Note that some of
them have been applied already.
----------------------------------------------------------------
Benoit Daloze (1):
Remove redundant and ignored workflow file
DBL-Lee (1):
add support for SHA512_256/SHA512_224
Hiroshi SHIBATA (2):
Guard for OpenSSL::PKey::EC::Group::Error with unsupported platforms
Fixed inconsistency directory structure with ruby/ruby repo
Jeremy Evans (2):
Fix keyword argument separation issues in OpenSSL::SSL::SSLSocket#sys{read,write}_nonblock
Remove taint support
Kazuki Yamaguchi (26):
config: support .include directive
random: make OpenSSL::Random.pseudo_bytes alias of .random_bytes
extconf.rb: get rid of -Werror=deprecated-declarations
test/openssl/test_ssl: skip test_fallback_scsv if necessary
ts: simplify OpenSSL::Timestamp::Request#algorithm
History.md: add missing references to GitHub issues
config: deprecate OpenSSL::Config#add_value and #[]=
test/openssl/test_ssl: remove sleep from test_finished_messages
test/openssl/test_ssl: fix random failure in SSLSocket.open test
test/openssl/test_ssl: avoid explicitly-sized private keys
test/openssl/test_ssl: remove commented-out test case
test/openssl/test_ssl: allow kRSA tests to fail
ssl: avoid declarations after statements
engine: revert OpenSSL::Engine.load changes for cloudhsm
engine: remove really outdated static engines
engine: do not check for ENGINE_load_builtin_engines()
engine: fix guards for 'dynamic' and 'cryptodev' engines
lib/openssl.rb: require openssl/version.rb
x509: add error code and verify flags constants
ssl: set verify error code in the case of verify_hostname failure
.github/workflows: merge CI jobs into a single workflow
.github/workflows: test against different OpenSSL versions
.travis.yml: fully migrate to GitHub Actions
ssl: suppress test failure with SSLContext#add_certificate_chain_file
ssl: remove test case test_puts_meta from test_pair
Revert "Use version.rb in gemspec"
MSP-Greg (2):
.travis.yml - remove 2.3/1.0.2, 2.5/1.1.1, head/1.0.2
Use version.rb in gemspec
Samuel Williams (1):
Restore compatibility with older versions of Ruby.
Yusuke Endoh (1):
Make OpenSSL::OSSL#test_memcmp_timing robust
200 lines
4.7 KiB
C
200 lines
4.7 KiB
C
/*
|
|
* 'OpenSSL for Ruby' project
|
|
* Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
|
|
*
|
|
* All rights reserved.
|
|
*
|
|
* This program is licensed under the same licence as Ruby.
|
|
* (See the file 'LICENCE'.)
|
|
*/
|
|
#include "ossl.h"
|
|
|
|
VALUE mRandom;
|
|
VALUE eRandomError;
|
|
|
|
/*
|
|
* call-seq:
|
|
* seed(str) -> str
|
|
*
|
|
* ::seed is equivalent to ::add where _entropy_ is length of _str_.
|
|
*/
|
|
static VALUE
|
|
ossl_rand_seed(VALUE self, VALUE str)
|
|
{
|
|
StringValue(str);
|
|
RAND_seed(RSTRING_PTR(str), RSTRING_LENINT(str));
|
|
|
|
return str;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* add(str, entropy) -> self
|
|
*
|
|
* Mixes the bytes from _str_ into the Pseudo Random Number Generator(PRNG)
|
|
* state.
|
|
*
|
|
* Thus, if the data from _str_ are unpredictable to an adversary, this
|
|
* increases the uncertainty about the state and makes the PRNG output less
|
|
* predictable.
|
|
*
|
|
* The _entropy_ argument is (the lower bound of) an estimate of how much
|
|
* randomness is contained in _str_, measured in bytes.
|
|
*
|
|
* === Example
|
|
*
|
|
* pid = $$
|
|
* now = Time.now
|
|
* ary = [now.to_i, now.nsec, 1000, pid]
|
|
* OpenSSL::Random.add(ary.join, 0.0)
|
|
* OpenSSL::Random.seed(ary.join)
|
|
*/
|
|
static VALUE
|
|
ossl_rand_add(VALUE self, VALUE str, VALUE entropy)
|
|
{
|
|
StringValue(str);
|
|
RAND_add(RSTRING_PTR(str), RSTRING_LENINT(str), NUM2DBL(entropy));
|
|
|
|
return self;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* load_random_file(filename) -> true
|
|
*
|
|
* Reads bytes from _filename_ and adds them to the PRNG.
|
|
*/
|
|
static VALUE
|
|
ossl_rand_load_file(VALUE self, VALUE filename)
|
|
{
|
|
if(!RAND_load_file(StringValueCStr(filename), -1)) {
|
|
ossl_raise(eRandomError, NULL);
|
|
}
|
|
return Qtrue;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* write_random_file(filename) -> true
|
|
*
|
|
* Writes a number of random generated bytes (currently 1024) to _filename_
|
|
* which can be used to initialize the PRNG by calling ::load_random_file in a
|
|
* later session.
|
|
*/
|
|
static VALUE
|
|
ossl_rand_write_file(VALUE self, VALUE filename)
|
|
{
|
|
if (RAND_write_file(StringValueCStr(filename)) == -1) {
|
|
ossl_raise(eRandomError, NULL);
|
|
}
|
|
return Qtrue;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* random_bytes(length) -> string
|
|
*
|
|
* Generates a String with _length_ number of cryptographically strong
|
|
* pseudo-random bytes.
|
|
*
|
|
* === Example
|
|
*
|
|
* OpenSSL::Random.random_bytes(12)
|
|
* #=> "..."
|
|
*/
|
|
static VALUE
|
|
ossl_rand_bytes(VALUE self, VALUE len)
|
|
{
|
|
VALUE str;
|
|
int n = NUM2INT(len);
|
|
int ret;
|
|
|
|
str = rb_str_new(0, n);
|
|
ret = RAND_bytes((unsigned char *)RSTRING_PTR(str), n);
|
|
if (ret == 0) {
|
|
ossl_raise(eRandomError, "RAND_bytes");
|
|
} else if (ret == -1) {
|
|
ossl_raise(eRandomError, "RAND_bytes is not supported");
|
|
}
|
|
|
|
return str;
|
|
}
|
|
|
|
#ifdef HAVE_RAND_EGD
|
|
/*
|
|
* call-seq:
|
|
* egd(filename) -> true
|
|
*
|
|
* Same as ::egd_bytes but queries 255 bytes by default.
|
|
*/
|
|
static VALUE
|
|
ossl_rand_egd(VALUE self, VALUE filename)
|
|
{
|
|
if (RAND_egd(StringValueCStr(filename)) == -1) {
|
|
ossl_raise(eRandomError, NULL);
|
|
}
|
|
return Qtrue;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* egd_bytes(filename, length) -> true
|
|
*
|
|
* Queries the entropy gathering daemon EGD on socket path given by _filename_.
|
|
*
|
|
* Fetches _length_ number of bytes and uses ::add to seed the OpenSSL built-in
|
|
* PRNG.
|
|
*/
|
|
static VALUE
|
|
ossl_rand_egd_bytes(VALUE self, VALUE filename, VALUE len)
|
|
{
|
|
int n = NUM2INT(len);
|
|
|
|
if (RAND_egd_bytes(StringValueCStr(filename), n) == -1) {
|
|
ossl_raise(eRandomError, NULL);
|
|
}
|
|
return Qtrue;
|
|
}
|
|
#endif /* HAVE_RAND_EGD */
|
|
|
|
/*
|
|
* call-seq:
|
|
* status? => true | false
|
|
*
|
|
* Return +true+ if the PRNG has been seeded with enough data, +false+ otherwise.
|
|
*/
|
|
static VALUE
|
|
ossl_rand_status(VALUE self)
|
|
{
|
|
return RAND_status() ? Qtrue : Qfalse;
|
|
}
|
|
|
|
/*
|
|
* INIT
|
|
*/
|
|
void
|
|
Init_ossl_rand(void)
|
|
{
|
|
#if 0
|
|
mOSSL = rb_define_module("OpenSSL");
|
|
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
|
#endif
|
|
|
|
mRandom = rb_define_module_under(mOSSL, "Random");
|
|
|
|
eRandomError = rb_define_class_under(mRandom, "RandomError", eOSSLError);
|
|
|
|
rb_define_module_function(mRandom, "seed", ossl_rand_seed, 1);
|
|
rb_define_module_function(mRandom, "random_add", ossl_rand_add, 2);
|
|
rb_define_module_function(mRandom, "load_random_file", ossl_rand_load_file, 1);
|
|
rb_define_module_function(mRandom, "write_random_file", ossl_rand_write_file, 1);
|
|
rb_define_module_function(mRandom, "random_bytes", ossl_rand_bytes, 1);
|
|
#if OPENSSL_VERSION_NUMBER < 0x10101000 || defined(LIBRESSL_VERSION_NUMBER)
|
|
rb_define_alias(rb_singleton_class(mRandom), "pseudo_bytes", "random_bytes");
|
|
#endif
|
|
#ifdef HAVE_RAND_EGD
|
|
rb_define_module_function(mRandom, "egd", ossl_rand_egd, 1);
|
|
rb_define_module_function(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2);
|
|
#endif /* HAVE_RAND_EGD */
|
|
rb_define_module_function(mRandom, "status?", ossl_rand_status, 0);
|
|
}
|