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
332 lines
7.1 KiB
C
332 lines
7.1 KiB
C
/*
|
|
* Copyright (C) 2004-2007 Technorama Ltd. <oss-ruby@technorama.net>
|
|
*/
|
|
|
|
#include "ossl.h"
|
|
|
|
VALUE cSSLSession;
|
|
static VALUE eSSLSession;
|
|
|
|
static void
|
|
ossl_ssl_session_free(void *ptr)
|
|
{
|
|
SSL_SESSION_free(ptr);
|
|
}
|
|
|
|
const rb_data_type_t ossl_ssl_session_type = {
|
|
"OpenSSL/SSL/Session",
|
|
{
|
|
0, ossl_ssl_session_free,
|
|
},
|
|
0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
|
|
};
|
|
|
|
static VALUE ossl_ssl_session_alloc(VALUE klass)
|
|
{
|
|
return TypedData_Wrap_Struct(klass, &ossl_ssl_session_type, NULL);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* Session.new(ssl_socket) -> Session
|
|
* Session.new(string) -> Session
|
|
*
|
|
* Creates a new Session object from an instance of SSLSocket or DER/PEM encoded
|
|
* String.
|
|
*/
|
|
static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1)
|
|
{
|
|
SSL_SESSION *ctx = NULL;
|
|
|
|
if (RDATA(self)->data)
|
|
ossl_raise(eSSLSession, "SSL Session already initialized");
|
|
|
|
if (rb_obj_is_instance_of(arg1, cSSLSocket)) {
|
|
SSL *ssl;
|
|
|
|
GetSSL(arg1, ssl);
|
|
|
|
if ((ctx = SSL_get1_session(ssl)) == NULL)
|
|
ossl_raise(eSSLSession, "no session available");
|
|
} else {
|
|
BIO *in = ossl_obj2bio(&arg1);
|
|
|
|
ctx = PEM_read_bio_SSL_SESSION(in, NULL, NULL, NULL);
|
|
|
|
if (!ctx) {
|
|
OSSL_BIO_reset(in);
|
|
ctx = d2i_SSL_SESSION_bio(in, NULL);
|
|
}
|
|
|
|
BIO_free(in);
|
|
|
|
if (!ctx)
|
|
ossl_raise(rb_eArgError, "unknown type");
|
|
}
|
|
|
|
/* should not happen */
|
|
if (ctx == NULL)
|
|
ossl_raise(eSSLSession, "ctx not set - internal error");
|
|
|
|
RDATA(self)->data = ctx;
|
|
|
|
return self;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_ssl_session_initialize_copy(VALUE self, VALUE other)
|
|
{
|
|
SSL_SESSION *sess, *sess_other, *sess_new;
|
|
|
|
rb_check_frozen(self);
|
|
sess = RTYPEDDATA_DATA(self); /* XXX */
|
|
GetSSLSession(other, sess_other);
|
|
|
|
sess_new = ASN1_dup((i2d_of_void *)i2d_SSL_SESSION, (d2i_of_void *)d2i_SSL_SESSION,
|
|
(char *)sess_other);
|
|
if (!sess_new)
|
|
ossl_raise(eSSLSession, "ASN1_dup");
|
|
|
|
RTYPEDDATA_DATA(self) = sess_new;
|
|
SSL_SESSION_free(sess);
|
|
|
|
return self;
|
|
}
|
|
|
|
static int
|
|
ossl_SSL_SESSION_cmp(const SSL_SESSION *a, const SSL_SESSION *b)
|
|
{
|
|
unsigned int a_len;
|
|
const unsigned char *a_sid = SSL_SESSION_get_id(a, &a_len);
|
|
unsigned int b_len;
|
|
const unsigned char *b_sid = SSL_SESSION_get_id(b, &b_len);
|
|
|
|
if (SSL_SESSION_get_protocol_version(a) != SSL_SESSION_get_protocol_version(b))
|
|
return 1;
|
|
if (a_len != b_len)
|
|
return 1;
|
|
|
|
return CRYPTO_memcmp(a_sid, b_sid, a_len);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* session1 == session2 -> boolean
|
|
*
|
|
* Returns +true+ if the two Session is the same, +false+ if not.
|
|
*/
|
|
static VALUE ossl_ssl_session_eq(VALUE val1, VALUE val2)
|
|
{
|
|
SSL_SESSION *ctx1, *ctx2;
|
|
|
|
GetSSLSession(val1, ctx1);
|
|
GetSSLSession(val2, ctx2);
|
|
|
|
switch (ossl_SSL_SESSION_cmp(ctx1, ctx2)) {
|
|
case 0: return Qtrue;
|
|
default: return Qfalse;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* session.time -> Time
|
|
*
|
|
* Returns the time at which the session was established.
|
|
*/
|
|
static VALUE
|
|
ossl_ssl_session_get_time(VALUE self)
|
|
{
|
|
SSL_SESSION *ctx;
|
|
long t;
|
|
|
|
GetSSLSession(self, ctx);
|
|
t = SSL_SESSION_get_time(ctx);
|
|
if (t == 0)
|
|
return Qnil;
|
|
|
|
return rb_funcall(rb_cTime, rb_intern("at"), 1, LONG2NUM(t));
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* session.timeout -> Integer
|
|
*
|
|
* Returns the timeout value set for the session, in seconds from the
|
|
* established time.
|
|
*
|
|
*/
|
|
static VALUE
|
|
ossl_ssl_session_get_timeout(VALUE self)
|
|
{
|
|
SSL_SESSION *ctx;
|
|
long t;
|
|
|
|
GetSSLSession(self, ctx);
|
|
t = SSL_SESSION_get_timeout(ctx);
|
|
|
|
return LONG2NUM(t);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* session.time = time
|
|
* session.time = integer
|
|
*
|
|
* Sets start time of the session. Time resolution is in seconds.
|
|
*
|
|
*/
|
|
static VALUE ossl_ssl_session_set_time(VALUE self, VALUE time_v)
|
|
{
|
|
SSL_SESSION *ctx;
|
|
long t;
|
|
|
|
GetSSLSession(self, ctx);
|
|
if (rb_obj_is_instance_of(time_v, rb_cTime)) {
|
|
time_v = rb_funcall(time_v, rb_intern("to_i"), 0);
|
|
}
|
|
t = NUM2LONG(time_v);
|
|
SSL_SESSION_set_time(ctx, t);
|
|
return ossl_ssl_session_get_time(self);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* session.timeout = integer
|
|
*
|
|
* Sets how long until the session expires in seconds.
|
|
*/
|
|
static VALUE ossl_ssl_session_set_timeout(VALUE self, VALUE time_v)
|
|
{
|
|
SSL_SESSION *ctx;
|
|
long t;
|
|
|
|
GetSSLSession(self, ctx);
|
|
t = NUM2LONG(time_v);
|
|
SSL_SESSION_set_timeout(ctx, t);
|
|
return ossl_ssl_session_get_timeout(self);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* session.id -> String
|
|
*
|
|
* Returns the Session ID.
|
|
*/
|
|
static VALUE ossl_ssl_session_get_id(VALUE self)
|
|
{
|
|
SSL_SESSION *ctx;
|
|
const unsigned char *p = NULL;
|
|
unsigned int i = 0;
|
|
|
|
GetSSLSession(self, ctx);
|
|
|
|
p = SSL_SESSION_get_id(ctx, &i);
|
|
|
|
return rb_str_new((const char *) p, i);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* session.to_der -> String
|
|
*
|
|
* Returns an ASN1 encoded String that contains the Session object.
|
|
*/
|
|
static VALUE ossl_ssl_session_to_der(VALUE self)
|
|
{
|
|
SSL_SESSION *ctx;
|
|
unsigned char *p;
|
|
int len;
|
|
VALUE str;
|
|
|
|
GetSSLSession(self, ctx);
|
|
len = i2d_SSL_SESSION(ctx, NULL);
|
|
if (len <= 0) {
|
|
ossl_raise(eSSLSession, "i2d_SSL_SESSION");
|
|
}
|
|
|
|
str = rb_str_new(0, len);
|
|
p = (unsigned char *)RSTRING_PTR(str);
|
|
i2d_SSL_SESSION(ctx, &p);
|
|
ossl_str_adjust(str, p);
|
|
return str;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* session.to_pem -> String
|
|
*
|
|
* Returns a PEM encoded String that contains the Session object.
|
|
*/
|
|
static VALUE ossl_ssl_session_to_pem(VALUE self)
|
|
{
|
|
SSL_SESSION *ctx;
|
|
BIO *out;
|
|
|
|
GetSSLSession(self, ctx);
|
|
|
|
if (!(out = BIO_new(BIO_s_mem()))) {
|
|
ossl_raise(eSSLSession, "BIO_s_mem()");
|
|
}
|
|
|
|
if (!PEM_write_bio_SSL_SESSION(out, ctx)) {
|
|
BIO_free(out);
|
|
ossl_raise(eSSLSession, "SSL_SESSION_print()");
|
|
}
|
|
|
|
|
|
return ossl_membio2str(out);
|
|
}
|
|
|
|
|
|
/*
|
|
* call-seq:
|
|
* session.to_text -> String
|
|
*
|
|
* Shows everything in the Session object. This is for diagnostic purposes.
|
|
*/
|
|
static VALUE ossl_ssl_session_to_text(VALUE self)
|
|
{
|
|
SSL_SESSION *ctx;
|
|
BIO *out;
|
|
|
|
GetSSLSession(self, ctx);
|
|
|
|
if (!(out = BIO_new(BIO_s_mem()))) {
|
|
ossl_raise(eSSLSession, "BIO_s_mem()");
|
|
}
|
|
|
|
if (!SSL_SESSION_print(out, ctx)) {
|
|
BIO_free(out);
|
|
ossl_raise(eSSLSession, "SSL_SESSION_print()");
|
|
}
|
|
|
|
return ossl_membio2str(out);
|
|
}
|
|
|
|
|
|
void Init_ossl_ssl_session(void)
|
|
{
|
|
#if 0
|
|
mOSSL = rb_define_module("OpenSSL");
|
|
mSSL = rb_define_module_under(mOSSL, "SSL");
|
|
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
|
#endif
|
|
cSSLSession = rb_define_class_under(mSSL, "Session", rb_cObject);
|
|
eSSLSession = rb_define_class_under(cSSLSession, "SessionError", eOSSLError);
|
|
|
|
rb_define_alloc_func(cSSLSession, ossl_ssl_session_alloc);
|
|
rb_define_method(cSSLSession, "initialize", ossl_ssl_session_initialize, 1);
|
|
rb_define_method(cSSLSession, "initialize_copy", ossl_ssl_session_initialize_copy, 1);
|
|
|
|
rb_define_method(cSSLSession, "==", ossl_ssl_session_eq, 1);
|
|
|
|
rb_define_method(cSSLSession, "time", ossl_ssl_session_get_time, 0);
|
|
rb_define_method(cSSLSession, "time=", ossl_ssl_session_set_time, 1);
|
|
rb_define_method(cSSLSession, "timeout", ossl_ssl_session_get_timeout, 0);
|
|
rb_define_method(cSSLSession, "timeout=", ossl_ssl_session_set_timeout, 1);
|
|
rb_define_method(cSSLSession, "id", ossl_ssl_session_get_id, 0);
|
|
rb_define_method(cSSLSession, "to_der", ossl_ssl_session_to_der, 0);
|
|
rb_define_method(cSSLSession, "to_pem", ossl_ssl_session_to_pem, 0);
|
|
rb_define_method(cSSLSession, "to_text", ossl_ssl_session_to_text, 0);
|
|
}
|