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
441 lines
9.3 KiB
C
441 lines
9.3 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 NewX509Req(klass) \
|
|
TypedData_Wrap_Struct((klass), &ossl_x509req_type, 0)
|
|
#define SetX509Req(obj, req) do { \
|
|
if (!(req)) { \
|
|
ossl_raise(rb_eRuntimeError, "Req wasn't initialized!"); \
|
|
} \
|
|
RTYPEDDATA_DATA(obj) = (req); \
|
|
} while (0)
|
|
#define GetX509Req(obj, req) do { \
|
|
TypedData_Get_Struct((obj), X509_REQ, &ossl_x509req_type, (req)); \
|
|
if (!(req)) { \
|
|
ossl_raise(rb_eRuntimeError, "Req wasn't initialized!"); \
|
|
} \
|
|
} while (0)
|
|
|
|
/*
|
|
* Classes
|
|
*/
|
|
VALUE cX509Req;
|
|
VALUE eX509ReqError;
|
|
|
|
static void
|
|
ossl_x509req_free(void *ptr)
|
|
{
|
|
X509_REQ_free(ptr);
|
|
}
|
|
|
|
static const rb_data_type_t ossl_x509req_type = {
|
|
"OpenSSL/X509/REQ",
|
|
{
|
|
0, ossl_x509req_free,
|
|
},
|
|
0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
|
|
};
|
|
|
|
/*
|
|
* Public functions
|
|
*/
|
|
X509_REQ *
|
|
GetX509ReqPtr(VALUE obj)
|
|
{
|
|
X509_REQ *req;
|
|
|
|
GetX509Req(obj, req);
|
|
|
|
return req;
|
|
}
|
|
|
|
/*
|
|
* Private functions
|
|
*/
|
|
static VALUE
|
|
ossl_x509req_alloc(VALUE klass)
|
|
{
|
|
X509_REQ *req;
|
|
VALUE obj;
|
|
|
|
obj = NewX509Req(klass);
|
|
if (!(req = X509_REQ_new())) {
|
|
ossl_raise(eX509ReqError, NULL);
|
|
}
|
|
SetX509Req(obj, req);
|
|
|
|
return obj;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509req_initialize(int argc, VALUE *argv, VALUE self)
|
|
{
|
|
BIO *in;
|
|
X509_REQ *req, *x = DATA_PTR(self);
|
|
VALUE arg;
|
|
|
|
if (rb_scan_args(argc, argv, "01", &arg) == 0) {
|
|
return self;
|
|
}
|
|
arg = ossl_to_der_if_possible(arg);
|
|
in = ossl_obj2bio(&arg);
|
|
req = PEM_read_bio_X509_REQ(in, &x, NULL, NULL);
|
|
DATA_PTR(self) = x;
|
|
if (!req) {
|
|
OSSL_BIO_reset(in);
|
|
req = d2i_X509_REQ_bio(in, &x);
|
|
DATA_PTR(self) = x;
|
|
}
|
|
BIO_free(in);
|
|
if (!req) ossl_raise(eX509ReqError, NULL);
|
|
|
|
return self;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509req_copy(VALUE self, VALUE other)
|
|
{
|
|
X509_REQ *a, *b, *req;
|
|
|
|
rb_check_frozen(self);
|
|
if (self == other) return self;
|
|
GetX509Req(self, a);
|
|
GetX509Req(other, b);
|
|
if (!(req = X509_REQ_dup(b))) {
|
|
ossl_raise(eX509ReqError, NULL);
|
|
}
|
|
X509_REQ_free(a);
|
|
DATA_PTR(self) = req;
|
|
|
|
return self;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509req_to_pem(VALUE self)
|
|
{
|
|
X509_REQ *req;
|
|
BIO *out;
|
|
|
|
GetX509Req(self, req);
|
|
if (!(out = BIO_new(BIO_s_mem()))) {
|
|
ossl_raise(eX509ReqError, NULL);
|
|
}
|
|
if (!PEM_write_bio_X509_REQ(out, req)) {
|
|
BIO_free(out);
|
|
ossl_raise(eX509ReqError, NULL);
|
|
}
|
|
|
|
return ossl_membio2str(out);
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509req_to_der(VALUE self)
|
|
{
|
|
X509_REQ *req;
|
|
VALUE str;
|
|
long len;
|
|
unsigned char *p;
|
|
|
|
GetX509Req(self, req);
|
|
if ((len = i2d_X509_REQ(req, NULL)) <= 0)
|
|
ossl_raise(eX509ReqError, NULL);
|
|
str = rb_str_new(0, len);
|
|
p = (unsigned char *)RSTRING_PTR(str);
|
|
if (i2d_X509_REQ(req, &p) <= 0)
|
|
ossl_raise(eX509ReqError, NULL);
|
|
ossl_str_adjust(str, p);
|
|
|
|
return str;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509req_to_text(VALUE self)
|
|
{
|
|
X509_REQ *req;
|
|
BIO *out;
|
|
|
|
GetX509Req(self, req);
|
|
if (!(out = BIO_new(BIO_s_mem()))) {
|
|
ossl_raise(eX509ReqError, NULL);
|
|
}
|
|
if (!X509_REQ_print(out, req)) {
|
|
BIO_free(out);
|
|
ossl_raise(eX509ReqError, NULL);
|
|
}
|
|
|
|
return ossl_membio2str(out);
|
|
}
|
|
|
|
#if 0
|
|
/*
|
|
* Makes X509 from X509_REQuest
|
|
*/
|
|
static VALUE
|
|
ossl_x509req_to_x509(VALUE self, VALUE days, VALUE key)
|
|
{
|
|
X509_REQ *req;
|
|
X509 *x509;
|
|
|
|
GetX509Req(self, req);
|
|
...
|
|
if (!(x509 = X509_REQ_to_X509(req, d, pkey))) {
|
|
ossl_raise(eX509ReqError, NULL);
|
|
}
|
|
|
|
return ossl_x509_new(x509);
|
|
}
|
|
#endif
|
|
|
|
static VALUE
|
|
ossl_x509req_get_version(VALUE self)
|
|
{
|
|
X509_REQ *req;
|
|
long version;
|
|
|
|
GetX509Req(self, req);
|
|
version = X509_REQ_get_version(req);
|
|
|
|
return LONG2NUM(version);
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509req_set_version(VALUE self, VALUE version)
|
|
{
|
|
X509_REQ *req;
|
|
long ver;
|
|
|
|
if ((ver = NUM2LONG(version)) < 0) {
|
|
ossl_raise(eX509ReqError, "version must be >= 0!");
|
|
}
|
|
GetX509Req(self, req);
|
|
if (!X509_REQ_set_version(req, ver)) {
|
|
ossl_raise(eX509ReqError, "X509_REQ_set_version");
|
|
}
|
|
|
|
return version;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509req_get_subject(VALUE self)
|
|
{
|
|
X509_REQ *req;
|
|
X509_NAME *name;
|
|
|
|
GetX509Req(self, req);
|
|
if (!(name = X509_REQ_get_subject_name(req))) { /* NO DUP - don't free */
|
|
ossl_raise(eX509ReqError, NULL);
|
|
}
|
|
|
|
return ossl_x509name_new(name);
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509req_set_subject(VALUE self, VALUE subject)
|
|
{
|
|
X509_REQ *req;
|
|
|
|
GetX509Req(self, req);
|
|
/* DUPs name */
|
|
if (!X509_REQ_set_subject_name(req, GetX509NamePtr(subject))) {
|
|
ossl_raise(eX509ReqError, NULL);
|
|
}
|
|
|
|
return subject;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509req_get_signature_algorithm(VALUE self)
|
|
{
|
|
X509_REQ *req;
|
|
const X509_ALGOR *alg;
|
|
BIO *out;
|
|
|
|
GetX509Req(self, req);
|
|
|
|
if (!(out = BIO_new(BIO_s_mem()))) {
|
|
ossl_raise(eX509ReqError, NULL);
|
|
}
|
|
X509_REQ_get0_signature(req, NULL, &alg);
|
|
if (!i2a_ASN1_OBJECT(out, alg->algorithm)) {
|
|
BIO_free(out);
|
|
ossl_raise(eX509ReqError, NULL);
|
|
}
|
|
|
|
return ossl_membio2str(out);
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509req_get_public_key(VALUE self)
|
|
{
|
|
X509_REQ *req;
|
|
EVP_PKEY *pkey;
|
|
|
|
GetX509Req(self, req);
|
|
if (!(pkey = X509_REQ_get_pubkey(req))) { /* adds reference */
|
|
ossl_raise(eX509ReqError, NULL);
|
|
}
|
|
|
|
return ossl_pkey_new(pkey); /* NO DUP - OK */
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509req_set_public_key(VALUE self, VALUE key)
|
|
{
|
|
X509_REQ *req;
|
|
EVP_PKEY *pkey;
|
|
|
|
GetX509Req(self, req);
|
|
pkey = GetPKeyPtr(key); /* NO NEED TO DUP */
|
|
if (!X509_REQ_set_pubkey(req, pkey)) {
|
|
ossl_raise(eX509ReqError, NULL);
|
|
}
|
|
|
|
return key;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509req_sign(VALUE self, VALUE key, VALUE digest)
|
|
{
|
|
X509_REQ *req;
|
|
EVP_PKEY *pkey;
|
|
const EVP_MD *md;
|
|
|
|
GetX509Req(self, req);
|
|
pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
|
|
md = ossl_evp_get_digestbyname(digest);
|
|
if (!X509_REQ_sign(req, pkey, md)) {
|
|
ossl_raise(eX509ReqError, NULL);
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
/*
|
|
* Checks that cert signature is made with PRIVversion of this PUBLIC 'key'
|
|
*/
|
|
static VALUE
|
|
ossl_x509req_verify(VALUE self, VALUE key)
|
|
{
|
|
X509_REQ *req;
|
|
EVP_PKEY *pkey;
|
|
|
|
GetX509Req(self, req);
|
|
pkey = GetPKeyPtr(key); /* NO NEED TO DUP */
|
|
switch (X509_REQ_verify(req, pkey)) {
|
|
case 1:
|
|
return Qtrue;
|
|
case 0:
|
|
ossl_clear_error();
|
|
return Qfalse;
|
|
default:
|
|
ossl_raise(eX509ReqError, NULL);
|
|
}
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509req_get_attributes(VALUE self)
|
|
{
|
|
X509_REQ *req;
|
|
int count, i;
|
|
X509_ATTRIBUTE *attr;
|
|
VALUE ary;
|
|
|
|
GetX509Req(self, req);
|
|
|
|
count = X509_REQ_get_attr_count(req);
|
|
if (count < 0) {
|
|
OSSL_Debug("count < 0???");
|
|
return rb_ary_new();
|
|
}
|
|
ary = rb_ary_new2(count);
|
|
for (i=0; i<count; i++) {
|
|
attr = X509_REQ_get_attr(req, i);
|
|
rb_ary_push(ary, ossl_x509attr_new(attr));
|
|
}
|
|
|
|
return ary;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509req_set_attributes(VALUE self, VALUE ary)
|
|
{
|
|
X509_REQ *req;
|
|
X509_ATTRIBUTE *attr;
|
|
long i;
|
|
VALUE item;
|
|
|
|
Check_Type(ary, T_ARRAY);
|
|
for (i=0;i<RARRAY_LEN(ary); i++) {
|
|
OSSL_Check_Kind(RARRAY_AREF(ary, i), cX509Attr);
|
|
}
|
|
GetX509Req(self, req);
|
|
while ((attr = X509_REQ_delete_attr(req, 0)))
|
|
X509_ATTRIBUTE_free(attr);
|
|
for (i=0;i<RARRAY_LEN(ary); i++) {
|
|
item = RARRAY_AREF(ary, i);
|
|
attr = GetX509AttrPtr(item);
|
|
if (!X509_REQ_add1_attr(req, attr)) {
|
|
ossl_raise(eX509ReqError, NULL);
|
|
}
|
|
}
|
|
return ary;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509req_add_attribute(VALUE self, VALUE attr)
|
|
{
|
|
X509_REQ *req;
|
|
|
|
GetX509Req(self, req);
|
|
if (!X509_REQ_add1_attr(req, GetX509AttrPtr(attr))) {
|
|
ossl_raise(eX509ReqError, NULL);
|
|
}
|
|
|
|
return attr;
|
|
}
|
|
|
|
/*
|
|
* X509_REQUEST init
|
|
*/
|
|
void
|
|
Init_ossl_x509req(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
|
|
|
|
eX509ReqError = rb_define_class_under(mX509, "RequestError", eOSSLError);
|
|
|
|
cX509Req = rb_define_class_under(mX509, "Request", rb_cObject);
|
|
|
|
rb_define_alloc_func(cX509Req, ossl_x509req_alloc);
|
|
rb_define_method(cX509Req, "initialize", ossl_x509req_initialize, -1);
|
|
rb_define_method(cX509Req, "initialize_copy", ossl_x509req_copy, 1);
|
|
|
|
rb_define_method(cX509Req, "to_pem", ossl_x509req_to_pem, 0);
|
|
rb_define_method(cX509Req, "to_der", ossl_x509req_to_der, 0);
|
|
rb_define_alias(cX509Req, "to_s", "to_pem");
|
|
rb_define_method(cX509Req, "to_text", ossl_x509req_to_text, 0);
|
|
rb_define_method(cX509Req, "version", ossl_x509req_get_version, 0);
|
|
rb_define_method(cX509Req, "version=", ossl_x509req_set_version, 1);
|
|
rb_define_method(cX509Req, "subject", ossl_x509req_get_subject, 0);
|
|
rb_define_method(cX509Req, "subject=", ossl_x509req_set_subject, 1);
|
|
rb_define_method(cX509Req, "signature_algorithm", ossl_x509req_get_signature_algorithm, 0);
|
|
rb_define_method(cX509Req, "public_key", ossl_x509req_get_public_key, 0);
|
|
rb_define_method(cX509Req, "public_key=", ossl_x509req_set_public_key, 1);
|
|
rb_define_method(cX509Req, "sign", ossl_x509req_sign, 2);
|
|
rb_define_method(cX509Req, "verify", ossl_x509req_verify, 1);
|
|
rb_define_method(cX509Req, "attributes", ossl_x509req_get_attributes, 0);
|
|
rb_define_method(cX509Req, "attributes=", ossl_x509req_set_attributes, 1);
|
|
rb_define_method(cX509Req, "add_attribute", ossl_x509req_add_attribute, 1);
|
|
}
|