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
324 lines
7.3 KiB
C
324 lines
7.3 KiB
C
/*
|
|
* 'OpenSSL for Ruby' project
|
|
* Copyright (C) 2001 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 NewX509Attr(klass) \
|
|
TypedData_Wrap_Struct((klass), &ossl_x509attr_type, 0)
|
|
#define SetX509Attr(obj, attr) do { \
|
|
if (!(attr)) { \
|
|
ossl_raise(rb_eRuntimeError, "ATTR wasn't initialized!"); \
|
|
} \
|
|
RTYPEDDATA_DATA(obj) = (attr); \
|
|
} while (0)
|
|
#define GetX509Attr(obj, attr) do { \
|
|
TypedData_Get_Struct((obj), X509_ATTRIBUTE, &ossl_x509attr_type, (attr)); \
|
|
if (!(attr)) { \
|
|
ossl_raise(rb_eRuntimeError, "ATTR wasn't initialized!"); \
|
|
} \
|
|
} while (0)
|
|
|
|
/*
|
|
* Classes
|
|
*/
|
|
VALUE cX509Attr;
|
|
VALUE eX509AttrError;
|
|
|
|
static void
|
|
ossl_x509attr_free(void *ptr)
|
|
{
|
|
X509_ATTRIBUTE_free(ptr);
|
|
}
|
|
|
|
static const rb_data_type_t ossl_x509attr_type = {
|
|
"OpenSSL/X509/ATTRIBUTE",
|
|
{
|
|
0, ossl_x509attr_free,
|
|
},
|
|
0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
|
|
};
|
|
|
|
/*
|
|
* Public
|
|
*/
|
|
VALUE
|
|
ossl_x509attr_new(X509_ATTRIBUTE *attr)
|
|
{
|
|
X509_ATTRIBUTE *new;
|
|
VALUE obj;
|
|
|
|
obj = NewX509Attr(cX509Attr);
|
|
if (!attr) {
|
|
new = X509_ATTRIBUTE_new();
|
|
} else {
|
|
new = X509_ATTRIBUTE_dup(attr);
|
|
}
|
|
if (!new) {
|
|
ossl_raise(eX509AttrError, NULL);
|
|
}
|
|
SetX509Attr(obj, new);
|
|
|
|
return obj;
|
|
}
|
|
|
|
X509_ATTRIBUTE *
|
|
GetX509AttrPtr(VALUE obj)
|
|
{
|
|
X509_ATTRIBUTE *attr;
|
|
|
|
GetX509Attr(obj, attr);
|
|
|
|
return attr;
|
|
}
|
|
|
|
/*
|
|
* Private
|
|
*/
|
|
static VALUE
|
|
ossl_x509attr_alloc(VALUE klass)
|
|
{
|
|
X509_ATTRIBUTE *attr;
|
|
VALUE obj;
|
|
|
|
obj = NewX509Attr(klass);
|
|
if (!(attr = X509_ATTRIBUTE_new()))
|
|
ossl_raise(eX509AttrError, NULL);
|
|
SetX509Attr(obj, attr);
|
|
|
|
return obj;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* Attribute.new(oid [, value]) => attr
|
|
*/
|
|
static VALUE
|
|
ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self)
|
|
{
|
|
VALUE oid, value;
|
|
X509_ATTRIBUTE *attr, *x;
|
|
const unsigned char *p;
|
|
|
|
GetX509Attr(self, attr);
|
|
if(rb_scan_args(argc, argv, "11", &oid, &value) == 1){
|
|
oid = ossl_to_der_if_possible(oid);
|
|
StringValue(oid);
|
|
p = (unsigned char *)RSTRING_PTR(oid);
|
|
x = d2i_X509_ATTRIBUTE(&attr, &p, RSTRING_LEN(oid));
|
|
DATA_PTR(self) = attr;
|
|
if(!x){
|
|
ossl_raise(eX509AttrError, NULL);
|
|
}
|
|
return self;
|
|
}
|
|
rb_funcall(self, rb_intern("oid="), 1, oid);
|
|
rb_funcall(self, rb_intern("value="), 1, value);
|
|
|
|
return self;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509attr_initialize_copy(VALUE self, VALUE other)
|
|
{
|
|
X509_ATTRIBUTE *attr, *attr_other, *attr_new;
|
|
|
|
rb_check_frozen(self);
|
|
GetX509Attr(self, attr);
|
|
GetX509Attr(other, attr_other);
|
|
|
|
attr_new = X509_ATTRIBUTE_dup(attr_other);
|
|
if (!attr_new)
|
|
ossl_raise(eX509AttrError, "X509_ATTRIBUTE_dup");
|
|
|
|
SetX509Attr(self, attr_new);
|
|
X509_ATTRIBUTE_free(attr);
|
|
|
|
return self;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* attr.oid = string => string
|
|
*/
|
|
static VALUE
|
|
ossl_x509attr_set_oid(VALUE self, VALUE oid)
|
|
{
|
|
X509_ATTRIBUTE *attr;
|
|
ASN1_OBJECT *obj;
|
|
char *s;
|
|
|
|
GetX509Attr(self, attr);
|
|
s = StringValueCStr(oid);
|
|
obj = OBJ_txt2obj(s, 0);
|
|
if(!obj) ossl_raise(eX509AttrError, NULL);
|
|
if (!X509_ATTRIBUTE_set1_object(attr, obj)) {
|
|
ASN1_OBJECT_free(obj);
|
|
ossl_raise(eX509AttrError, "X509_ATTRIBUTE_set1_object");
|
|
}
|
|
ASN1_OBJECT_free(obj);
|
|
|
|
return oid;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* attr.oid => string
|
|
*/
|
|
static VALUE
|
|
ossl_x509attr_get_oid(VALUE self)
|
|
{
|
|
X509_ATTRIBUTE *attr;
|
|
ASN1_OBJECT *oid;
|
|
BIO *out;
|
|
VALUE ret;
|
|
int nid;
|
|
|
|
GetX509Attr(self, attr);
|
|
oid = X509_ATTRIBUTE_get0_object(attr);
|
|
if ((nid = OBJ_obj2nid(oid)) != NID_undef)
|
|
ret = rb_str_new2(OBJ_nid2sn(nid));
|
|
else{
|
|
if (!(out = BIO_new(BIO_s_mem())))
|
|
ossl_raise(eX509AttrError, NULL);
|
|
i2a_ASN1_OBJECT(out, oid);
|
|
ret = ossl_membio2str(out);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* attr.value = asn1 => asn1
|
|
*/
|
|
static VALUE
|
|
ossl_x509attr_set_value(VALUE self, VALUE value)
|
|
{
|
|
X509_ATTRIBUTE *attr;
|
|
VALUE asn1_value;
|
|
int i, asn1_tag;
|
|
|
|
OSSL_Check_Kind(value, cASN1Data);
|
|
asn1_tag = NUM2INT(rb_attr_get(value, rb_intern("@tag")));
|
|
asn1_value = rb_attr_get(value, rb_intern("@value"));
|
|
if (asn1_tag != V_ASN1_SET)
|
|
ossl_raise(eASN1Error, "argument must be ASN1::Set");
|
|
if (!RB_TYPE_P(asn1_value, T_ARRAY))
|
|
ossl_raise(eASN1Error, "ASN1::Set has non-array value");
|
|
|
|
GetX509Attr(self, attr);
|
|
if (X509_ATTRIBUTE_count(attr)) { /* populated, reset first */
|
|
ASN1_OBJECT *obj = X509_ATTRIBUTE_get0_object(attr);
|
|
X509_ATTRIBUTE *new_attr = X509_ATTRIBUTE_create_by_OBJ(NULL, obj, 0, NULL, -1);
|
|
if (!new_attr)
|
|
ossl_raise(eX509AttrError, NULL);
|
|
SetX509Attr(self, new_attr);
|
|
X509_ATTRIBUTE_free(attr);
|
|
attr = new_attr;
|
|
}
|
|
|
|
for (i = 0; i < RARRAY_LEN(asn1_value); i++) {
|
|
ASN1_TYPE *a1type = ossl_asn1_get_asn1type(RARRAY_AREF(asn1_value, i));
|
|
if (!X509_ATTRIBUTE_set1_data(attr, ASN1_TYPE_get(a1type),
|
|
a1type->value.ptr, -1)) {
|
|
ASN1_TYPE_free(a1type);
|
|
ossl_raise(eX509AttrError, NULL);
|
|
}
|
|
ASN1_TYPE_free(a1type);
|
|
}
|
|
|
|
return value;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* attr.value => asn1
|
|
*/
|
|
static VALUE
|
|
ossl_x509attr_get_value(VALUE self)
|
|
{
|
|
X509_ATTRIBUTE *attr;
|
|
STACK_OF(ASN1_TYPE) *sk;
|
|
VALUE str;
|
|
int i, count, len;
|
|
unsigned char *p;
|
|
|
|
GetX509Attr(self, attr);
|
|
/* there is no X509_ATTRIBUTE_get0_set() :( */
|
|
if (!(sk = sk_ASN1_TYPE_new_null()))
|
|
ossl_raise(eX509AttrError, "sk_new");
|
|
|
|
count = X509_ATTRIBUTE_count(attr);
|
|
for (i = 0; i < count; i++)
|
|
sk_ASN1_TYPE_push(sk, X509_ATTRIBUTE_get0_type(attr, i));
|
|
|
|
if ((len = i2d_ASN1_SET_ANY(sk, NULL)) <= 0) {
|
|
sk_ASN1_TYPE_free(sk);
|
|
ossl_raise(eX509AttrError, NULL);
|
|
}
|
|
str = rb_str_new(0, len);
|
|
p = (unsigned char *)RSTRING_PTR(str);
|
|
if (i2d_ASN1_SET_ANY(sk, &p) <= 0) {
|
|
sk_ASN1_TYPE_free(sk);
|
|
ossl_raise(eX509AttrError, NULL);
|
|
}
|
|
ossl_str_adjust(str, p);
|
|
sk_ASN1_TYPE_free(sk);
|
|
|
|
return rb_funcall(mASN1, rb_intern("decode"), 1, str);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* attr.to_der => string
|
|
*/
|
|
static VALUE
|
|
ossl_x509attr_to_der(VALUE self)
|
|
{
|
|
X509_ATTRIBUTE *attr;
|
|
VALUE str;
|
|
int len;
|
|
unsigned char *p;
|
|
|
|
GetX509Attr(self, attr);
|
|
if((len = i2d_X509_ATTRIBUTE(attr, NULL)) <= 0)
|
|
ossl_raise(eX509AttrError, NULL);
|
|
str = rb_str_new(0, len);
|
|
p = (unsigned char *)RSTRING_PTR(str);
|
|
if(i2d_X509_ATTRIBUTE(attr, &p) <= 0)
|
|
ossl_raise(eX509AttrError, NULL);
|
|
ossl_str_adjust(str, p);
|
|
|
|
return str;
|
|
}
|
|
|
|
/*
|
|
* X509_ATTRIBUTE init
|
|
*/
|
|
void
|
|
Init_ossl_x509attr(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
|
|
|
|
eX509AttrError = rb_define_class_under(mX509, "AttributeError", eOSSLError);
|
|
|
|
cX509Attr = rb_define_class_under(mX509, "Attribute", rb_cObject);
|
|
rb_define_alloc_func(cX509Attr, ossl_x509attr_alloc);
|
|
rb_define_method(cX509Attr, "initialize", ossl_x509attr_initialize, -1);
|
|
rb_define_method(cX509Attr, "initialize_copy", ossl_x509attr_initialize_copy, 1);
|
|
rb_define_method(cX509Attr, "oid=", ossl_x509attr_set_oid, 1);
|
|
rb_define_method(cX509Attr, "oid", ossl_x509attr_get_oid, 0);
|
|
rb_define_method(cX509Attr, "value=", ossl_x509attr_set_value, 1);
|
|
rb_define_method(cX509Attr, "value", ossl_x509attr_get_value, 0);
|
|
rb_define_method(cX509Attr, "to_der", ossl_x509attr_to_der, 0);
|
|
}
|