mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
a55320b093
Import Ruby/OpenSSL 2.1.0.beta2. The full commit log since commit e72d960db262 which was imported by r60013 can be found at: https://github.com/ruby/openssl/compare/e72d960db262...v2.1.0.beta2 ---------------------------------------------------------------- Kazuki Yamaguchi (26): bn: use ALLOCV() macro instead of xmalloc() appveyor.yml: remove 'openssl version' line test/test_ssl_session: skip tests for session_remove_cb x509ext: implement X509::Extension#== x509attr: implement X509::Attribute#== x509cert: implement X509::Certificate#== x509revoked: add missing X509::Revoked#to_der x509crl, x509revoked: implement X509::{CRL,Revoked}#== x509req: implement X509::Request#== ssl: extract rb_intern("call") cipher: disallow setting AAD for non-AEAD ciphers test/test_cipher: fix test_non_aead_cipher_set_auth_data failure ssl: fix conflict of options in SSLContext#set_params buffering: let #write accept multiple arguments pkey: make pkey_check_public_key() non-static x509cert, x509crl, x509req, ns_spki: check sanity of public key test/envutil: port assert_warning from Ruby trunk test/utils: remove a pointless .public_key call in issue_cert ssl: add SSLContext#add_certificate test/test_ssl: fix test_security_level Drop support for LibreSSL 2.4 kdf: add HKDF support test/test_x509cert: fix flaky test test/test_x509crl: fix random failure History.md: fix a typo Ruby/OpenSSL 2.1.0.beta2 Mark Wright (1): Fix build failure against OpenSSL 1.1 built with no-deprecated Thanks rhenium for the code review and fixes. Peter Karman (1): Add RSA sign_pss() and verify_pss() methods aeris (1): TLS Fallback Signaling Cipher Suite Value kazu (1): Use caller with length to reduce unused strings git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
405 lines
9.6 KiB
C
405 lines
9.6 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;
|
|
EVP_PKEY *pkey;
|
|
|
|
GetSPKI(self, spki);
|
|
pkey = GetPKeyPtr(key);
|
|
ossl_pkey_check_public_key(pkey);
|
|
if (!NETSCAPE_SPKI_set_pubkey(spki, pkey))
|
|
ossl_raise(eSPKIError, "NETSCAPE_SPKI_set_pubkey");
|
|
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;
|
|
EVP_PKEY *pkey;
|
|
|
|
GetSPKI(self, spki);
|
|
pkey = GetPKeyPtr(key);
|
|
ossl_pkey_check_public_key(pkey);
|
|
switch (NETSCAPE_SPKI_verify(spki, pkey)) {
|
|
case 0:
|
|
ossl_clear_error();
|
|
return Qfalse;
|
|
case 1:
|
|
return Qtrue;
|
|
default:
|
|
ossl_raise(eSPKIError, "NETSCAPE_SPKI_verify");
|
|
}
|
|
}
|
|
|
|
/* 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);
|
|
}
|