mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
609103dbb5
Import Ruby/OpenSSL 2.1.0.beta1. The full commit log since v2.0.5 (imported by r59567) can be found at: https://github.com/ruby/openssl/compare/v2.0.5...v2.1.0.beta1 ---------------------------------------------------------------- Antonio Terceiro (1): test/test_ssl: explicitly accept TLS 1.1 in corresponding test Colby Swandale (1): document using secure protocol to fetch git master in Bundler Colton Jenkins (1): Add fips_mode_get to return fips_mode Kazuki Yamaguchi (85): Start preparing for 2.1.0 Remove support for OpenSSL 0.9.8 and 1.0.0 bn: refine tests bn: implement unary {plus,minus} operators for OpenSSL::BN bn: implement OpenSSL::BN#negative? Don't define main() when built with --enable-debug test: let OpenSSL::TestCase include OpenSSL::TestUtils test: prepare test PKey instances on demand Add OpenSSL.print_mem_leaks Enable OSSL_MDEBUG on CI builds ssl: move default DH parameters from OpenSSL::PKey::DH Make exceptions with the same format regardless of OpenSSL.debug ssl: show reason of 'certificate verify error' in exception message ssl: remove OpenSSL::ExtConfig::TLS_DH_anon_WITH_AES_256_GCM_SHA384 ssl: do not confuse different ex_data index registries ssl: assume SSL/SSL_CTX always have a valid reference to the Ruby object Fix RDoc markup ssl: suppress compiler warning ext/openssl/deprecation.rb: remove broken-apple-openssl extconf.rb: print informative message if OpenSSL can't be found Rakefile: compile the extension before test kdf: introduce OpenSSL::KDF module ossl.h: add NUM2UINT64T() macro kdf: add scrypt Expand rb_define_copy_func() macro Expand FPTR_TO_FD() macro Remove SafeGet*() macros cipher: rename GetCipherPtr() to ossl_evp_get_cipherbyname() digest: rename GetDigestPtr() to ossl_evp_get_digestbyname() Add ossl_str_new(), an exception-safe rb_str_new() bio: simplify ossl_membio2str() using ossl_str_new() Remove unused functions and macros Drop support for LibreSSL 2.3 ocsp: add OpenSSL::OCSP::Request#signed? asn1: infinite length -> indefinite length asn1: rearrange tests ssl: remove a needless NULL check in SSL::SSLContext#ciphers ssl: return nil in SSL::SSLSocket#cipher if session is not started asn1: remove an unnecessary function prototype asn1: require tag information when instantiating generic type asn1: initialize 'unused_bits' attribute of BitString with 0 asn1: check for illegal 'unused_bits' value of BitString asn1: disallow NULL to be passed to asn1time_to_time() asn1: avoid truncating OID in OpenSSL::ASN1::ObjectId#oid asn1: allow constructed encoding with definite length form asn1: prohibit indefinite length form for primitive encoding asn1: allow tag number to be >= 32 for universal tag class asn1: use ossl_asn1_tag() asn1: clean up OpenSSL::ASN1::Constructive#to_der asn1: harmonize OpenSSL::ASN1::*#to_der asn1: prevent EOC octets from being in the middle of the content asn1: do not treat EOC octets as part of content octets x509name: add 'loc' and 'set' kwargs to OpenSSL::X509::Name#add_entry ssl: do not call session_remove_cb during GC Backport "Merge branch 'topic/test-memory-leak'" to maint cipher: update the documentation for Cipher#auth_tag= Rakefile: let sync:to_ruby know about test/openssl/fixtures test: fix formatting test/utils: remove OpenSSL::TestUtils.silent test/utils: add SSLTestCase#tls12_supported? test/utils: have start_server yield only the port number test/utils: do not set ecdh_curves in start_server test/utils: let server_loop close socket test/utils: improve error handling in start_server test/utils: add OpenSSL::TestUtils.openssl? and .libressl? test/utils: do not use DSA certificates in SSL tests test/test_ssl: remove test_invalid_shutdown_by_gc test/test_ssl: move test_multibyte_read_write to test_pair test/test_ssl_session: rearrange tests test/test_pair, test/test_ssl: fix for TLS 1.3 ssl: remove useless call to rb_thread_wait_fd() ssl: fix NPN support ssl: mark OpenSSL::SSL::SSLContext::DEFAULT_{1024,2048} as private ssl: use 2048-bit group in the default tmp_dh_cb ssl: ensure that SSL option flags are non-negative ssl: update OpenSSL::SSL::OP_* flags ssl: prefer TLS_method() over SSLv23_method() ssl: add SSLContext#min_version= and #max_version= ssl: rework SSLContext#ssl_version= test/test_x509name: change script encoding to ASCII-8BIT x509name: refactor OpenSSL::X509::Name#to_s x509name: add OpenSSL::X509::Name#to_utf8 x509name: add OpenSSL::X509::Name#inspect x509name: update regexp in OpenSSL::X509::Name.parse Ruby/OpenSSL 2.1.0.beta1 Marcus Stollsteimer (1): Fix rdoc for core Integer class nobu (4): [DOC] {read,write}_nonblock with exception: false [DOC] keyword argument _exception_ [DOC] mark up literals Revert r57690 except for read_nonblock git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
238 lines
5.4 KiB
C
238 lines
5.4 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)
|
|
{
|
|
rb_check_safe_obj(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)
|
|
{
|
|
rb_check_safe_obj(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;
|
|
}
|
|
|
|
#if defined(HAVE_RAND_PSEUDO_BYTES)
|
|
/*
|
|
* call-seq:
|
|
* pseudo_bytes(length) -> string
|
|
*
|
|
* Generates a String with _length_ number of pseudo-random bytes.
|
|
*
|
|
* Pseudo-random byte sequences generated by ::pseudo_bytes will be unique if
|
|
* they are of sufficient length, but are not necessarily unpredictable.
|
|
*
|
|
* === Example
|
|
*
|
|
* OpenSSL::Random.pseudo_bytes(12)
|
|
* #=> "..."
|
|
*/
|
|
static VALUE
|
|
ossl_rand_pseudo_bytes(VALUE self, VALUE len)
|
|
{
|
|
VALUE str;
|
|
int n = NUM2INT(len);
|
|
|
|
str = rb_str_new(0, n);
|
|
if (RAND_pseudo_bytes((unsigned char *)RSTRING_PTR(str), n) < 1) {
|
|
ossl_raise(eRandomError, NULL);
|
|
}
|
|
|
|
return str;
|
|
}
|
|
#endif
|
|
|
|
#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)
|
|
{
|
|
rb_check_safe_obj(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);
|
|
|
|
rb_check_safe_obj(filename);
|
|
|
|
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 defined(HAVE_RAND_PSEUDO_BYTES)
|
|
rb_define_module_function(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1);
|
|
#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);
|
|
}
|