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
401 lines
9.5 KiB
C
401 lines
9.5 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 NewSPKI(klass) \
|
|
TypedData_Wrap_Struct((klass), &ossl_netscape_spki_type, 0)
|
|
#define SetSPKI(obj, spki) do { \
|
|
if (!(spki)) { \
|
|
ossl_raise(rb_eRuntimeError, "SPKI wasn't initialized!"); \
|
|
} \
|
|
RTYPEDDATA_DATA(obj) = (spki); \
|
|
} while (0)
|
|
#define GetSPKI(obj, spki) do { \
|
|
TypedData_Get_Struct((obj), NETSCAPE_SPKI, &ossl_netscape_spki_type, (spki)); \
|
|
if (!(spki)) { \
|
|
ossl_raise(rb_eRuntimeError, "SPKI wasn't initialized!"); \
|
|
} \
|
|
} while (0)
|
|
|
|
/*
|
|
* Classes
|
|
*/
|
|
VALUE mNetscape;
|
|
VALUE cSPKI;
|
|
VALUE eSPKIError;
|
|
|
|
/*
|
|
* Public functions
|
|
*/
|
|
|
|
/*
|
|
* Private functions
|
|
*/
|
|
|
|
static void
|
|
ossl_netscape_spki_free(void *spki)
|
|
{
|
|
NETSCAPE_SPKI_free(spki);
|
|
}
|
|
|
|
static const rb_data_type_t ossl_netscape_spki_type = {
|
|
"OpenSSL/NETSCAPE_SPKI",
|
|
{
|
|
0, ossl_netscape_spki_free,
|
|
},
|
|
0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
|
|
};
|
|
|
|
static VALUE
|
|
ossl_spki_alloc(VALUE klass)
|
|
{
|
|
NETSCAPE_SPKI *spki;
|
|
VALUE obj;
|
|
|
|
obj = NewSPKI(klass);
|
|
if (!(spki = NETSCAPE_SPKI_new())) {
|
|
ossl_raise(eSPKIError, NULL);
|
|
}
|
|
SetSPKI(obj, spki);
|
|
|
|
return obj;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* SPKI.new([request]) => spki
|
|
*
|
|
* === Parameters
|
|
* * _request_ - optional raw request, either in PEM or DER format.
|
|
*/
|
|
static VALUE
|
|
ossl_spki_initialize(int argc, VALUE *argv, VALUE self)
|
|
{
|
|
NETSCAPE_SPKI *spki;
|
|
VALUE buffer;
|
|
const unsigned char *p;
|
|
|
|
if (rb_scan_args(argc, argv, "01", &buffer) == 0) {
|
|
return self;
|
|
}
|
|
StringValue(buffer);
|
|
if (!(spki = NETSCAPE_SPKI_b64_decode(RSTRING_PTR(buffer), RSTRING_LENINT(buffer)))) {
|
|
ossl_clear_error();
|
|
p = (unsigned char *)RSTRING_PTR(buffer);
|
|
if (!(spki = d2i_NETSCAPE_SPKI(NULL, &p, RSTRING_LEN(buffer)))) {
|
|
ossl_raise(eSPKIError, NULL);
|
|
}
|
|
}
|
|
NETSCAPE_SPKI_free(DATA_PTR(self));
|
|
SetSPKI(self, spki);
|
|
|
|
return self;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* spki.to_der => DER-encoded string
|
|
*
|
|
* Returns the DER encoding of this SPKI.
|
|
*/
|
|
static VALUE
|
|
ossl_spki_to_der(VALUE self)
|
|
{
|
|
NETSCAPE_SPKI *spki;
|
|
VALUE str;
|
|
long len;
|
|
unsigned char *p;
|
|
|
|
GetSPKI(self, spki);
|
|
if ((len = i2d_NETSCAPE_SPKI(spki, NULL)) <= 0)
|
|
ossl_raise(eX509CertError, NULL);
|
|
str = rb_str_new(0, len);
|
|
p = (unsigned char *)RSTRING_PTR(str);
|
|
if (i2d_NETSCAPE_SPKI(spki, &p) <= 0)
|
|
ossl_raise(eX509CertError, NULL);
|
|
ossl_str_adjust(str, p);
|
|
|
|
return str;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* spki.to_pem => PEM-encoded string
|
|
*
|
|
* Returns the PEM encoding of this SPKI.
|
|
*/
|
|
static VALUE
|
|
ossl_spki_to_pem(VALUE self)
|
|
{
|
|
NETSCAPE_SPKI *spki;
|
|
char *data;
|
|
VALUE str;
|
|
|
|
GetSPKI(self, spki);
|
|
if (!(data = NETSCAPE_SPKI_b64_encode(spki))) {
|
|
ossl_raise(eSPKIError, NULL);
|
|
}
|
|
str = ossl_buf2str(data, rb_long2int(strlen(data)));
|
|
|
|
return str;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* spki.to_text => string
|
|
*
|
|
* Returns a textual representation of this SPKI, useful for debugging
|
|
* purposes.
|
|
*/
|
|
static VALUE
|
|
ossl_spki_print(VALUE self)
|
|
{
|
|
NETSCAPE_SPKI *spki;
|
|
BIO *out;
|
|
|
|
GetSPKI(self, spki);
|
|
if (!(out = BIO_new(BIO_s_mem()))) {
|
|
ossl_raise(eSPKIError, NULL);
|
|
}
|
|
if (!NETSCAPE_SPKI_print(out, spki)) {
|
|
BIO_free(out);
|
|
ossl_raise(eSPKIError, NULL);
|
|
}
|
|
|
|
return ossl_membio2str(out);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* spki.public_key => pkey
|
|
*
|
|
* Returns the public key associated with the SPKI, an instance of
|
|
* OpenSSL::PKey.
|
|
*/
|
|
static VALUE
|
|
ossl_spki_get_public_key(VALUE self)
|
|
{
|
|
NETSCAPE_SPKI *spki;
|
|
EVP_PKEY *pkey;
|
|
|
|
GetSPKI(self, spki);
|
|
if (!(pkey = NETSCAPE_SPKI_get_pubkey(spki))) { /* adds an reference */
|
|
ossl_raise(eSPKIError, NULL);
|
|
}
|
|
|
|
return ossl_pkey_new(pkey); /* NO DUP - OK */
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* spki.public_key = pub => pkey
|
|
*
|
|
* === Parameters
|
|
* * _pub_ - the public key to be set for this instance
|
|
*
|
|
* Sets the public key to be associated with the SPKI, an instance of
|
|
* OpenSSL::PKey. This should be the public key corresponding to the
|
|
* private key used for signing the SPKI.
|
|
*/
|
|
static VALUE
|
|
ossl_spki_set_public_key(VALUE self, VALUE key)
|
|
{
|
|
NETSCAPE_SPKI *spki;
|
|
|
|
GetSPKI(self, spki);
|
|
if (!NETSCAPE_SPKI_set_pubkey(spki, GetPKeyPtr(key))) { /* NO NEED TO DUP */
|
|
ossl_raise(eSPKIError, NULL);
|
|
}
|
|
|
|
return key;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* spki.challenge => string
|
|
*
|
|
* Returns the challenge string associated with this SPKI.
|
|
*/
|
|
static VALUE
|
|
ossl_spki_get_challenge(VALUE self)
|
|
{
|
|
NETSCAPE_SPKI *spki;
|
|
|
|
GetSPKI(self, spki);
|
|
if (spki->spkac->challenge->length <= 0) {
|
|
OSSL_Debug("Challenge.length <= 0?");
|
|
return rb_str_new(0, 0);
|
|
}
|
|
|
|
return rb_str_new((const char *)spki->spkac->challenge->data,
|
|
spki->spkac->challenge->length);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* spki.challenge = str => string
|
|
*
|
|
* === Parameters
|
|
* * _str_ - the challenge string to be set for this instance
|
|
*
|
|
* Sets the challenge to be associated with the SPKI. May be used by the
|
|
* server, e.g. to prevent replay.
|
|
*/
|
|
static VALUE
|
|
ossl_spki_set_challenge(VALUE self, VALUE str)
|
|
{
|
|
NETSCAPE_SPKI *spki;
|
|
|
|
StringValue(str);
|
|
GetSPKI(self, spki);
|
|
if (!ASN1_STRING_set(spki->spkac->challenge, RSTRING_PTR(str),
|
|
RSTRING_LENINT(str))) {
|
|
ossl_raise(eSPKIError, NULL);
|
|
}
|
|
|
|
return str;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* spki.sign(key, digest) => spki
|
|
*
|
|
* === Parameters
|
|
* * _key_ - the private key to be used for signing this instance
|
|
* * _digest_ - the digest to be used for signing this instance
|
|
*
|
|
* To sign an SPKI, the private key corresponding to the public key set
|
|
* for this instance should be used, in addition to a digest algorithm in
|
|
* the form of an OpenSSL::Digest. The private key should be an instance of
|
|
* OpenSSL::PKey.
|
|
*/
|
|
static VALUE
|
|
ossl_spki_sign(VALUE self, VALUE key, VALUE digest)
|
|
{
|
|
NETSCAPE_SPKI *spki;
|
|
EVP_PKEY *pkey;
|
|
const EVP_MD *md;
|
|
|
|
pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
|
|
md = ossl_evp_get_digestbyname(digest);
|
|
GetSPKI(self, spki);
|
|
if (!NETSCAPE_SPKI_sign(spki, pkey, md)) {
|
|
ossl_raise(eSPKIError, NULL);
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* spki.verify(key) => boolean
|
|
*
|
|
* === Parameters
|
|
* * _key_ - the public key to be used for verifying the SPKI signature
|
|
*
|
|
* Returns +true+ if the signature is valid, +false+ otherwise. To verify an
|
|
* SPKI, the public key contained within the SPKI should be used.
|
|
*/
|
|
static VALUE
|
|
ossl_spki_verify(VALUE self, VALUE key)
|
|
{
|
|
NETSCAPE_SPKI *spki;
|
|
|
|
GetSPKI(self, spki);
|
|
switch (NETSCAPE_SPKI_verify(spki, GetPKeyPtr(key))) { /* NO NEED TO DUP */
|
|
case 0:
|
|
return Qfalse;
|
|
case 1:
|
|
return Qtrue;
|
|
default:
|
|
ossl_raise(eSPKIError, NULL);
|
|
}
|
|
return Qnil; /* dummy */
|
|
}
|
|
|
|
/* Document-class: OpenSSL::Netscape::SPKI
|
|
*
|
|
* A Simple Public Key Infrastructure implementation (pronounced "spooky").
|
|
* The structure is defined as
|
|
* PublicKeyAndChallenge ::= SEQUENCE {
|
|
* spki SubjectPublicKeyInfo,
|
|
* challenge IA5STRING
|
|
* }
|
|
*
|
|
* SignedPublicKeyAndChallenge ::= SEQUENCE {
|
|
* publicKeyAndChallenge PublicKeyAndChallenge,
|
|
* signatureAlgorithm AlgorithmIdentifier,
|
|
* signature BIT STRING
|
|
* }
|
|
* where the definitions of SubjectPublicKeyInfo and AlgorithmIdentifier can
|
|
* be found in RFC5280. SPKI is typically used in browsers for generating
|
|
* a public/private key pair and a subsequent certificate request, using
|
|
* the HTML <keygen> element.
|
|
*
|
|
* == Examples
|
|
*
|
|
* === Creating an SPKI
|
|
* key = OpenSSL::PKey::RSA.new 2048
|
|
* spki = OpenSSL::Netscape::SPKI.new
|
|
* spki.challenge = "RandomChallenge"
|
|
* spki.public_key = key.public_key
|
|
* spki.sign(key, OpenSSL::Digest::SHA256.new)
|
|
* #send a request containing this to a server generating a certificate
|
|
* === Verifying an SPKI request
|
|
* request = #...
|
|
* spki = OpenSSL::Netscape::SPKI.new request
|
|
* unless spki.verify(spki.public_key)
|
|
* # signature is invalid
|
|
* end
|
|
* #proceed
|
|
*/
|
|
|
|
/* Document-module: OpenSSL::Netscape
|
|
*
|
|
* OpenSSL::Netscape is a namespace for SPKI (Simple Public Key
|
|
* Infrastructure) which implements Signed Public Key and Challenge.
|
|
* See {RFC 2692}[http://tools.ietf.org/html/rfc2692] and {RFC
|
|
* 2693}[http://tools.ietf.org/html/rfc2692] for details.
|
|
*/
|
|
|
|
/* Document-class: OpenSSL::Netscape::SPKIError
|
|
*
|
|
* Generic Exception class that is raised if an error occurs during an
|
|
* operation on an instance of OpenSSL::Netscape::SPKI.
|
|
*/
|
|
|
|
void
|
|
Init_ossl_ns_spki(void)
|
|
{
|
|
#if 0
|
|
mOSSL = rb_define_module("OpenSSL");
|
|
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
|
#endif
|
|
|
|
mNetscape = rb_define_module_under(mOSSL, "Netscape");
|
|
|
|
eSPKIError = rb_define_class_under(mNetscape, "SPKIError", eOSSLError);
|
|
|
|
cSPKI = rb_define_class_under(mNetscape, "SPKI", rb_cObject);
|
|
|
|
rb_define_alloc_func(cSPKI, ossl_spki_alloc);
|
|
rb_define_method(cSPKI, "initialize", ossl_spki_initialize, -1);
|
|
|
|
rb_define_method(cSPKI, "to_der", ossl_spki_to_der, 0);
|
|
rb_define_method(cSPKI, "to_pem", ossl_spki_to_pem, 0);
|
|
rb_define_alias(cSPKI, "to_s", "to_pem");
|
|
rb_define_method(cSPKI, "to_text", ossl_spki_print, 0);
|
|
rb_define_method(cSPKI, "public_key", ossl_spki_get_public_key, 0);
|
|
rb_define_method(cSPKI, "public_key=", ossl_spki_set_public_key, 1);
|
|
rb_define_method(cSPKI, "sign", ossl_spki_sign, 2);
|
|
rb_define_method(cSPKI, "verify", ossl_spki_verify, 1);
|
|
rb_define_method(cSPKI, "challenge", ossl_spki_get_challenge, 0);
|
|
rb_define_method(cSPKI, "challenge=", ossl_spki_set_challenge, 1);
|
|
}
|