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
279 lines
5.9 KiB
C
279 lines
5.9 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"
|
|
|
|
#define NewX509Rev(klass) \
|
|
TypedData_Wrap_Struct((klass), &ossl_x509rev_type, 0)
|
|
#define SetX509Rev(obj, rev) do { \
|
|
if (!(rev)) { \
|
|
ossl_raise(rb_eRuntimeError, "REV wasn't initialized!"); \
|
|
} \
|
|
RTYPEDDATA_DATA(obj) = (rev); \
|
|
} while (0)
|
|
#define GetX509Rev(obj, rev) do { \
|
|
TypedData_Get_Struct((obj), X509_REVOKED, &ossl_x509rev_type, (rev)); \
|
|
if (!(rev)) { \
|
|
ossl_raise(rb_eRuntimeError, "REV wasn't initialized!"); \
|
|
} \
|
|
} while (0)
|
|
|
|
/*
|
|
* Classes
|
|
*/
|
|
VALUE cX509Rev;
|
|
VALUE eX509RevError;
|
|
|
|
static void
|
|
ossl_x509rev_free(void *ptr)
|
|
{
|
|
X509_REVOKED_free(ptr);
|
|
}
|
|
|
|
static const rb_data_type_t ossl_x509rev_type = {
|
|
"OpenSSL/X509/REV",
|
|
{
|
|
0, ossl_x509rev_free,
|
|
},
|
|
0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
|
|
};
|
|
|
|
/*
|
|
* PUBLIC
|
|
*/
|
|
VALUE
|
|
ossl_x509revoked_new(X509_REVOKED *rev)
|
|
{
|
|
X509_REVOKED *new;
|
|
VALUE obj;
|
|
|
|
obj = NewX509Rev(cX509Rev);
|
|
if (!rev) {
|
|
new = X509_REVOKED_new();
|
|
} else {
|
|
new = X509_REVOKED_dup(rev);
|
|
}
|
|
if (!new) {
|
|
ossl_raise(eX509RevError, NULL);
|
|
}
|
|
SetX509Rev(obj, new);
|
|
|
|
return obj;
|
|
}
|
|
|
|
X509_REVOKED *
|
|
DupX509RevokedPtr(VALUE obj)
|
|
{
|
|
X509_REVOKED *rev, *new;
|
|
|
|
GetX509Rev(obj, rev);
|
|
if (!(new = X509_REVOKED_dup(rev))) {
|
|
ossl_raise(eX509RevError, NULL);
|
|
}
|
|
|
|
return new;
|
|
}
|
|
|
|
/*
|
|
* PRIVATE
|
|
*/
|
|
static VALUE
|
|
ossl_x509revoked_alloc(VALUE klass)
|
|
{
|
|
X509_REVOKED *rev;
|
|
VALUE obj;
|
|
|
|
obj = NewX509Rev(klass);
|
|
if (!(rev = X509_REVOKED_new())) {
|
|
ossl_raise(eX509RevError, NULL);
|
|
}
|
|
SetX509Rev(obj, rev);
|
|
|
|
return obj;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509revoked_initialize(int argc, VALUE *argv, VALUE self)
|
|
{
|
|
/* EMPTY */
|
|
return self;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509revoked_initialize_copy(VALUE self, VALUE other)
|
|
{
|
|
X509_REVOKED *rev, *rev_other, *rev_new;
|
|
|
|
rb_check_frozen(self);
|
|
GetX509Rev(self, rev);
|
|
GetX509Rev(other, rev_other);
|
|
|
|
rev_new = X509_REVOKED_dup(rev_other);
|
|
if (!rev_new)
|
|
ossl_raise(eX509RevError, "X509_REVOKED_dup");
|
|
|
|
SetX509Rev(self, rev_new);
|
|
X509_REVOKED_free(rev);
|
|
|
|
return self;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509revoked_get_serial(VALUE self)
|
|
{
|
|
X509_REVOKED *rev;
|
|
|
|
GetX509Rev(self, rev);
|
|
|
|
return asn1integer_to_num(X509_REVOKED_get0_serialNumber(rev));
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509revoked_set_serial(VALUE self, VALUE num)
|
|
{
|
|
X509_REVOKED *rev;
|
|
ASN1_INTEGER *asn1int;
|
|
|
|
GetX509Rev(self, rev);
|
|
asn1int = num_to_asn1integer(num, NULL);
|
|
if (!X509_REVOKED_set_serialNumber(rev, asn1int)) {
|
|
ASN1_INTEGER_free(asn1int);
|
|
ossl_raise(eX509RevError, "X509_REVOKED_set_serialNumber");
|
|
}
|
|
ASN1_INTEGER_free(asn1int);
|
|
|
|
return num;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509revoked_get_time(VALUE self)
|
|
{
|
|
X509_REVOKED *rev;
|
|
const ASN1_TIME *time;
|
|
|
|
GetX509Rev(self, rev);
|
|
time = X509_REVOKED_get0_revocationDate(rev);
|
|
if (!time)
|
|
return Qnil;
|
|
|
|
return asn1time_to_time(time);
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509revoked_set_time(VALUE self, VALUE time)
|
|
{
|
|
X509_REVOKED *rev;
|
|
ASN1_TIME *asn1time;
|
|
|
|
GetX509Rev(self, rev);
|
|
asn1time = ossl_x509_time_adjust(NULL, time);
|
|
if (!X509_REVOKED_set_revocationDate(rev, asn1time)) {
|
|
ASN1_TIME_free(asn1time);
|
|
ossl_raise(eX509RevError, "X509_REVOKED_set_revocationDate");
|
|
}
|
|
ASN1_TIME_free(asn1time);
|
|
|
|
return time;
|
|
}
|
|
/*
|
|
* Gets X509v3 extensions as array of X509Ext objects
|
|
*/
|
|
static VALUE
|
|
ossl_x509revoked_get_extensions(VALUE self)
|
|
{
|
|
X509_REVOKED *rev;
|
|
int count, i;
|
|
X509_EXTENSION *ext;
|
|
VALUE ary;
|
|
|
|
GetX509Rev(self, rev);
|
|
count = X509_REVOKED_get_ext_count(rev);
|
|
if (count < 0) {
|
|
OSSL_Debug("count < 0???");
|
|
return rb_ary_new();
|
|
}
|
|
ary = rb_ary_new2(count);
|
|
for (i=0; i<count; i++) {
|
|
ext = X509_REVOKED_get_ext(rev, i);
|
|
rb_ary_push(ary, ossl_x509ext_new(ext));
|
|
}
|
|
|
|
return ary;
|
|
}
|
|
|
|
/*
|
|
* Sets X509_EXTENSIONs
|
|
*/
|
|
static VALUE
|
|
ossl_x509revoked_set_extensions(VALUE self, VALUE ary)
|
|
{
|
|
X509_REVOKED *rev;
|
|
X509_EXTENSION *ext;
|
|
long i;
|
|
VALUE item;
|
|
|
|
Check_Type(ary, T_ARRAY);
|
|
for (i=0; i<RARRAY_LEN(ary); i++) {
|
|
OSSL_Check_Kind(RARRAY_AREF(ary, i), cX509Ext);
|
|
}
|
|
GetX509Rev(self, rev);
|
|
while ((ext = X509_REVOKED_delete_ext(rev, 0)))
|
|
X509_EXTENSION_free(ext);
|
|
for (i=0; i<RARRAY_LEN(ary); i++) {
|
|
item = RARRAY_AREF(ary, i);
|
|
ext = GetX509ExtPtr(item);
|
|
if(!X509_REVOKED_add_ext(rev, ext, -1)) {
|
|
ossl_raise(eX509RevError, NULL);
|
|
}
|
|
}
|
|
|
|
return ary;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509revoked_add_extension(VALUE self, VALUE ext)
|
|
{
|
|
X509_REVOKED *rev;
|
|
|
|
GetX509Rev(self, rev);
|
|
if (!X509_REVOKED_add_ext(rev, GetX509ExtPtr(ext), -1)) {
|
|
ossl_raise(eX509RevError, NULL);
|
|
}
|
|
|
|
return ext;
|
|
}
|
|
|
|
/*
|
|
* INIT
|
|
*/
|
|
void
|
|
Init_ossl_x509revoked(void)
|
|
{
|
|
#if 0
|
|
mOSSL = rb_define_module("OpenSSL");
|
|
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
|
mX509 = rb_define_module_under(mOSSL, "X509");
|
|
#endif
|
|
|
|
eX509RevError = rb_define_class_under(mX509, "RevokedError", eOSSLError);
|
|
|
|
cX509Rev = rb_define_class_under(mX509, "Revoked", rb_cObject);
|
|
|
|
rb_define_alloc_func(cX509Rev, ossl_x509revoked_alloc);
|
|
rb_define_method(cX509Rev, "initialize", ossl_x509revoked_initialize, -1);
|
|
rb_define_method(cX509Rev, "initialize_copy", ossl_x509revoked_initialize_copy, 1);
|
|
|
|
rb_define_method(cX509Rev, "serial", ossl_x509revoked_get_serial, 0);
|
|
rb_define_method(cX509Rev, "serial=", ossl_x509revoked_set_serial, 1);
|
|
rb_define_method(cX509Rev, "time", ossl_x509revoked_get_time, 0);
|
|
rb_define_method(cX509Rev, "time=", ossl_x509revoked_set_time, 1);
|
|
rb_define_method(cX509Rev, "extensions", ossl_x509revoked_get_extensions, 0);
|
|
rb_define_method(cX509Rev, "extensions=", ossl_x509revoked_set_extensions, 1);
|
|
rb_define_method(cX509Rev, "add_extension", ossl_x509revoked_add_extension, 1);
|
|
}
|