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
256 lines
7.2 KiB
C
256 lines
7.2 KiB
C
/*
|
|
* This program is licensed under the same licence as Ruby.
|
|
* (See the file 'LICENCE'.)
|
|
*/
|
|
#include "ossl.h"
|
|
|
|
#define NewPKCS12(klass) \
|
|
TypedData_Wrap_Struct((klass), &ossl_pkcs12_type, 0)
|
|
|
|
#define SetPKCS12(obj, p12) do { \
|
|
if(!(p12)) ossl_raise(rb_eRuntimeError, "PKCS12 wasn't initialized."); \
|
|
RTYPEDDATA_DATA(obj) = (p12); \
|
|
} while (0)
|
|
|
|
#define GetPKCS12(obj, p12) do { \
|
|
TypedData_Get_Struct((obj), PKCS12, &ossl_pkcs12_type, (p12)); \
|
|
if(!(p12)) ossl_raise(rb_eRuntimeError, "PKCS12 wasn't initialized."); \
|
|
} while (0)
|
|
|
|
#define ossl_pkcs12_set_key(o,v) rb_iv_set((o), "@key", (v))
|
|
#define ossl_pkcs12_set_cert(o,v) rb_iv_set((o), "@certificate", (v))
|
|
#define ossl_pkcs12_set_ca_certs(o,v) rb_iv_set((o), "@ca_certs", (v))
|
|
#define ossl_pkcs12_get_key(o) rb_iv_get((o), "@key")
|
|
#define ossl_pkcs12_get_cert(o) rb_iv_get((o), "@certificate")
|
|
#define ossl_pkcs12_get_ca_certs(o) rb_iv_get((o), "@ca_certs")
|
|
|
|
/*
|
|
* Classes
|
|
*/
|
|
VALUE cPKCS12;
|
|
VALUE ePKCS12Error;
|
|
|
|
/*
|
|
* Private
|
|
*/
|
|
static void
|
|
ossl_pkcs12_free(void *ptr)
|
|
{
|
|
PKCS12_free(ptr);
|
|
}
|
|
|
|
static const rb_data_type_t ossl_pkcs12_type = {
|
|
"OpenSSL/PKCS12",
|
|
{
|
|
0, ossl_pkcs12_free,
|
|
},
|
|
0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
|
|
};
|
|
|
|
static VALUE
|
|
ossl_pkcs12_s_allocate(VALUE klass)
|
|
{
|
|
PKCS12 *p12;
|
|
VALUE obj;
|
|
|
|
obj = NewPKCS12(klass);
|
|
if(!(p12 = PKCS12_new())) ossl_raise(ePKCS12Error, NULL);
|
|
SetPKCS12(obj, p12);
|
|
|
|
return obj;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_pkcs12_initialize_copy(VALUE self, VALUE other)
|
|
{
|
|
PKCS12 *p12, *p12_old, *p12_new;
|
|
|
|
rb_check_frozen(self);
|
|
GetPKCS12(self, p12_old);
|
|
GetPKCS12(other, p12);
|
|
|
|
p12_new = ASN1_dup((i2d_of_void *)i2d_PKCS12, (d2i_of_void *)d2i_PKCS12, (char *)p12);
|
|
if (!p12_new)
|
|
ossl_raise(ePKCS12Error, "ASN1_dup");
|
|
|
|
SetPKCS12(self, p12_new);
|
|
PKCS12_free(p12_old);
|
|
|
|
return self;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* PKCS12.create(pass, name, key, cert [, ca, [, key_pbe [, cert_pbe [, key_iter [, mac_iter [, keytype]]]]]])
|
|
*
|
|
* === Parameters
|
|
* * _pass_ - string
|
|
* * _name_ - A string describing the key.
|
|
* * _key_ - Any PKey.
|
|
* * _cert_ - A X509::Certificate.
|
|
* * The public_key portion of the certificate must contain a valid public key.
|
|
* * The not_before and not_after fields must be filled in.
|
|
* * _ca_ - An optional array of X509::Certificate's.
|
|
* * _key_pbe_ - string
|
|
* * _cert_pbe_ - string
|
|
* * _key_iter_ - integer
|
|
* * _mac_iter_ - integer
|
|
* * _keytype_ - An integer representing an MSIE specific extension.
|
|
*
|
|
* Any optional arguments may be supplied as +nil+ to preserve the OpenSSL defaults.
|
|
*
|
|
* See the OpenSSL documentation for PKCS12_create().
|
|
*/
|
|
static VALUE
|
|
ossl_pkcs12_s_create(int argc, VALUE *argv, VALUE self)
|
|
{
|
|
VALUE pass, name, pkey, cert, ca, key_nid, cert_nid, key_iter, mac_iter, keytype;
|
|
VALUE obj;
|
|
char *passphrase, *friendlyname;
|
|
EVP_PKEY *key;
|
|
X509 *x509;
|
|
STACK_OF(X509) *x509s;
|
|
int nkey = 0, ncert = 0, kiter = 0, miter = 0, ktype = 0;
|
|
PKCS12 *p12;
|
|
|
|
rb_scan_args(argc, argv, "46", &pass, &name, &pkey, &cert, &ca, &key_nid, &cert_nid, &key_iter, &mac_iter, &keytype);
|
|
passphrase = NIL_P(pass) ? NULL : StringValueCStr(pass);
|
|
friendlyname = NIL_P(name) ? NULL : StringValueCStr(name);
|
|
key = GetPKeyPtr(pkey);
|
|
x509 = GetX509CertPtr(cert);
|
|
/* TODO: make a VALUE to nid function */
|
|
if (!NIL_P(key_nid)) {
|
|
if ((nkey = OBJ_txt2nid(StringValueCStr(key_nid))) == NID_undef)
|
|
ossl_raise(rb_eArgError, "Unknown PBE algorithm %"PRIsVALUE, key_nid);
|
|
}
|
|
if (!NIL_P(cert_nid)) {
|
|
if ((ncert = OBJ_txt2nid(StringValueCStr(cert_nid))) == NID_undef)
|
|
ossl_raise(rb_eArgError, "Unknown PBE algorithm %"PRIsVALUE, cert_nid);
|
|
}
|
|
if (!NIL_P(key_iter))
|
|
kiter = NUM2INT(key_iter);
|
|
if (!NIL_P(mac_iter))
|
|
miter = NUM2INT(mac_iter);
|
|
if (!NIL_P(keytype))
|
|
ktype = NUM2INT(keytype);
|
|
|
|
obj = NewPKCS12(cPKCS12);
|
|
x509s = NIL_P(ca) ? NULL : ossl_x509_ary2sk(ca);
|
|
p12 = PKCS12_create(passphrase, friendlyname, key, x509, x509s,
|
|
nkey, ncert, kiter, miter, ktype);
|
|
sk_X509_pop_free(x509s, X509_free);
|
|
if(!p12) ossl_raise(ePKCS12Error, NULL);
|
|
SetPKCS12(obj, p12);
|
|
|
|
ossl_pkcs12_set_key(obj, pkey);
|
|
ossl_pkcs12_set_cert(obj, cert);
|
|
ossl_pkcs12_set_ca_certs(obj, ca);
|
|
|
|
return obj;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* PKCS12.new -> pkcs12
|
|
* PKCS12.new(str) -> pkcs12
|
|
* PKCS12.new(str, pass) -> pkcs12
|
|
*
|
|
* === Parameters
|
|
* * _str_ - Must be a DER encoded PKCS12 string.
|
|
* * _pass_ - string
|
|
*/
|
|
static VALUE
|
|
ossl_pkcs12_initialize(int argc, VALUE *argv, VALUE self)
|
|
{
|
|
BIO *in;
|
|
VALUE arg, pass, pkey, cert, ca;
|
|
char *passphrase;
|
|
EVP_PKEY *key;
|
|
X509 *x509;
|
|
STACK_OF(X509) *x509s = NULL;
|
|
int st = 0;
|
|
PKCS12 *pkcs = DATA_PTR(self);
|
|
|
|
if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) return self;
|
|
passphrase = NIL_P(pass) ? NULL : StringValueCStr(pass);
|
|
in = ossl_obj2bio(&arg);
|
|
d2i_PKCS12_bio(in, &pkcs);
|
|
DATA_PTR(self) = pkcs;
|
|
BIO_free(in);
|
|
|
|
pkey = cert = ca = Qnil;
|
|
/* OpenSSL's bug; PKCS12_parse() puts errors even if it succeeds.
|
|
* Fixed in OpenSSL 1.0.0t, 1.0.1p, 1.0.2d */
|
|
ERR_set_mark();
|
|
if(!PKCS12_parse(pkcs, passphrase, &key, &x509, &x509s))
|
|
ossl_raise(ePKCS12Error, "PKCS12_parse");
|
|
ERR_pop_to_mark();
|
|
if (key) {
|
|
pkey = rb_protect((VALUE (*)(VALUE))ossl_pkey_new, (VALUE)key, &st);
|
|
if (st) goto err;
|
|
}
|
|
if (x509) {
|
|
cert = rb_protect((VALUE (*)(VALUE))ossl_x509_new, (VALUE)x509, &st);
|
|
if (st) goto err;
|
|
}
|
|
if (x509s) {
|
|
ca = rb_protect((VALUE (*)(VALUE))ossl_x509_sk2ary, (VALUE)x509s, &st);
|
|
if (st) goto err;
|
|
}
|
|
|
|
err:
|
|
X509_free(x509);
|
|
sk_X509_pop_free(x509s, X509_free);
|
|
ossl_pkcs12_set_key(self, pkey);
|
|
ossl_pkcs12_set_cert(self, cert);
|
|
ossl_pkcs12_set_ca_certs(self, ca);
|
|
if(st) rb_jump_tag(st);
|
|
|
|
return self;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_pkcs12_to_der(VALUE self)
|
|
{
|
|
PKCS12 *p12;
|
|
VALUE str;
|
|
long len;
|
|
unsigned char *p;
|
|
|
|
GetPKCS12(self, p12);
|
|
if((len = i2d_PKCS12(p12, NULL)) <= 0)
|
|
ossl_raise(ePKCS12Error, NULL);
|
|
str = rb_str_new(0, len);
|
|
p = (unsigned char *)RSTRING_PTR(str);
|
|
if(i2d_PKCS12(p12, &p) <= 0)
|
|
ossl_raise(ePKCS12Error, NULL);
|
|
ossl_str_adjust(str, p);
|
|
|
|
return str;
|
|
}
|
|
|
|
void
|
|
Init_ossl_pkcs12(void)
|
|
{
|
|
#if 0
|
|
mOSSL = rb_define_module("OpenSSL");
|
|
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
|
#endif
|
|
|
|
/*
|
|
* Defines a file format commonly used to store private keys with
|
|
* accompanying public key certificates, protected with a password-based
|
|
* symmetric key.
|
|
*/
|
|
cPKCS12 = rb_define_class_under(mOSSL, "PKCS12", rb_cObject);
|
|
ePKCS12Error = rb_define_class_under(cPKCS12, "PKCS12Error", eOSSLError);
|
|
rb_define_singleton_method(cPKCS12, "create", ossl_pkcs12_s_create, -1);
|
|
|
|
rb_define_alloc_func(cPKCS12, ossl_pkcs12_s_allocate);
|
|
rb_define_method(cPKCS12, "initialize_copy", ossl_pkcs12_initialize_copy, 1);
|
|
rb_attr(cPKCS12, rb_intern("key"), 1, 0, Qfalse);
|
|
rb_attr(cPKCS12, rb_intern("certificate"), 1, 0, Qfalse);
|
|
rb_attr(cPKCS12, rb_intern("ca_certs"), 1, 0, Qfalse);
|
|
rb_define_method(cPKCS12, "initialize", ossl_pkcs12_initialize, -1);
|
|
rb_define_method(cPKCS12, "to_der", ossl_pkcs12_to_der, 0);
|
|
}
|