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
240 lines
7.1 KiB
C
240 lines
7.1 KiB
C
/*
|
|
* 'OpenSSL for Ruby' project
|
|
* Copyright (C) 2001 Michal Rokos <m.rokos@sh.cvut.cz>
|
|
* All rights reserved.
|
|
*/
|
|
/*
|
|
* This program is licensed under the same licence as Ruby.
|
|
* (See the file 'LICENCE'.)
|
|
*/
|
|
#if !defined(_OSSL_PKEY_H_)
|
|
#define _OSSL_PKEY_H_
|
|
|
|
extern VALUE mPKey;
|
|
extern VALUE cPKey;
|
|
extern VALUE ePKeyError;
|
|
extern const rb_data_type_t ossl_evp_pkey_type;
|
|
|
|
#define OSSL_PKEY_SET_PRIVATE(obj) rb_iv_set((obj), "private", Qtrue)
|
|
#define OSSL_PKEY_SET_PUBLIC(obj) rb_iv_set((obj), "private", Qfalse)
|
|
#define OSSL_PKEY_IS_PRIVATE(obj) (rb_iv_get((obj), "private") == Qtrue)
|
|
|
|
#define NewPKey(klass) \
|
|
TypedData_Wrap_Struct((klass), &ossl_evp_pkey_type, 0)
|
|
#define SetPKey(obj, pkey) do { \
|
|
if (!(pkey)) { \
|
|
rb_raise(rb_eRuntimeError, "PKEY wasn't initialized!"); \
|
|
} \
|
|
RTYPEDDATA_DATA(obj) = (pkey); \
|
|
OSSL_PKEY_SET_PUBLIC(obj); \
|
|
} while (0)
|
|
#define GetPKey(obj, pkey) do {\
|
|
TypedData_Get_Struct((obj), EVP_PKEY, &ossl_evp_pkey_type, (pkey)); \
|
|
if (!(pkey)) { \
|
|
rb_raise(rb_eRuntimeError, "PKEY wasn't initialized!");\
|
|
} \
|
|
} while (0)
|
|
|
|
struct ossl_generate_cb_arg {
|
|
int yield;
|
|
int stop;
|
|
int state;
|
|
};
|
|
int ossl_generate_cb_2(int p, int n, BN_GENCB *cb);
|
|
void ossl_generate_cb_stop(void *ptr);
|
|
|
|
VALUE ossl_pkey_new(EVP_PKEY *);
|
|
EVP_PKEY *GetPKeyPtr(VALUE);
|
|
EVP_PKEY *DupPKeyPtr(VALUE);
|
|
EVP_PKEY *GetPrivPKeyPtr(VALUE);
|
|
void Init_ossl_pkey(void);
|
|
|
|
/*
|
|
* RSA
|
|
*/
|
|
extern VALUE cRSA;
|
|
extern VALUE eRSAError;
|
|
|
|
VALUE ossl_rsa_new(EVP_PKEY *);
|
|
void Init_ossl_rsa(void);
|
|
|
|
/*
|
|
* DSA
|
|
*/
|
|
extern VALUE cDSA;
|
|
extern VALUE eDSAError;
|
|
|
|
VALUE ossl_dsa_new(EVP_PKEY *);
|
|
void Init_ossl_dsa(void);
|
|
|
|
/*
|
|
* DH
|
|
*/
|
|
extern VALUE cDH;
|
|
extern VALUE eDHError;
|
|
|
|
VALUE ossl_dh_new(EVP_PKEY *);
|
|
void Init_ossl_dh(void);
|
|
|
|
/*
|
|
* EC
|
|
*/
|
|
extern VALUE cEC;
|
|
extern VALUE eECError;
|
|
extern VALUE cEC_GROUP;
|
|
extern VALUE eEC_GROUP;
|
|
extern VALUE cEC_POINT;
|
|
extern VALUE eEC_POINT;
|
|
VALUE ossl_ec_new(EVP_PKEY *);
|
|
void Init_ossl_ec(void);
|
|
|
|
#define OSSL_PKEY_BN_DEF_GETTER0(_keytype, _type, _name, _get) \
|
|
/* \
|
|
* call-seq: \
|
|
* _keytype##.##_name -> aBN \
|
|
*/ \
|
|
static VALUE ossl_##_keytype##_get_##_name(VALUE self) \
|
|
{ \
|
|
_type *obj; \
|
|
const BIGNUM *bn; \
|
|
\
|
|
Get##_type(self, obj); \
|
|
_get; \
|
|
if (bn == NULL) \
|
|
return Qnil; \
|
|
return ossl_bn_new(bn); \
|
|
}
|
|
|
|
#define OSSL_PKEY_BN_DEF_GETTER3(_keytype, _type, _group, a1, a2, a3) \
|
|
OSSL_PKEY_BN_DEF_GETTER0(_keytype, _type, a1, \
|
|
_type##_get0_##_group(obj, &bn, NULL, NULL)) \
|
|
OSSL_PKEY_BN_DEF_GETTER0(_keytype, _type, a2, \
|
|
_type##_get0_##_group(obj, NULL, &bn, NULL)) \
|
|
OSSL_PKEY_BN_DEF_GETTER0(_keytype, _type, a3, \
|
|
_type##_get0_##_group(obj, NULL, NULL, &bn))
|
|
|
|
#define OSSL_PKEY_BN_DEF_GETTER2(_keytype, _type, _group, a1, a2) \
|
|
OSSL_PKEY_BN_DEF_GETTER0(_keytype, _type, a1, \
|
|
_type##_get0_##_group(obj, &bn, NULL)) \
|
|
OSSL_PKEY_BN_DEF_GETTER0(_keytype, _type, a2, \
|
|
_type##_get0_##_group(obj, NULL, &bn))
|
|
|
|
#define OSSL_PKEY_BN_DEF_SETTER3(_keytype, _type, _group, a1, a2, a3) \
|
|
/* \
|
|
* call-seq: \
|
|
* _keytype##.set_##_group(a1, a2, a3) -> self \
|
|
*/ \
|
|
static VALUE ossl_##_keytype##_set_##_group(VALUE self, VALUE v1, VALUE v2, VALUE v3) \
|
|
{ \
|
|
_type *obj; \
|
|
BIGNUM *bn1 = NULL, *orig_bn1 = NIL_P(v1) ? NULL : GetBNPtr(v1);\
|
|
BIGNUM *bn2 = NULL, *orig_bn2 = NIL_P(v2) ? NULL : GetBNPtr(v2);\
|
|
BIGNUM *bn3 = NULL, *orig_bn3 = NIL_P(v3) ? NULL : GetBNPtr(v3);\
|
|
\
|
|
Get##_type(self, obj); \
|
|
if (orig_bn1 && !(bn1 = BN_dup(orig_bn1)) || \
|
|
orig_bn2 && !(bn2 = BN_dup(orig_bn2)) || \
|
|
orig_bn3 && !(bn3 = BN_dup(orig_bn3))) { \
|
|
BN_clear_free(bn1); \
|
|
BN_clear_free(bn2); \
|
|
BN_clear_free(bn3); \
|
|
ossl_raise(eBNError, NULL); \
|
|
} \
|
|
\
|
|
if (!_type##_set0_##_group(obj, bn1, bn2, bn3)) { \
|
|
BN_clear_free(bn1); \
|
|
BN_clear_free(bn2); \
|
|
BN_clear_free(bn3); \
|
|
ossl_raise(ePKeyError, #_type"_set0_"#_group); \
|
|
} \
|
|
return self; \
|
|
}
|
|
|
|
#define OSSL_PKEY_BN_DEF_SETTER2(_keytype, _type, _group, a1, a2) \
|
|
/* \
|
|
* call-seq: \
|
|
* _keytype##.set_##_group(a1, a2) -> self \
|
|
*/ \
|
|
static VALUE ossl_##_keytype##_set_##_group(VALUE self, VALUE v1, VALUE v2) \
|
|
{ \
|
|
_type *obj; \
|
|
BIGNUM *bn1 = NULL, *orig_bn1 = NIL_P(v1) ? NULL : GetBNPtr(v1);\
|
|
BIGNUM *bn2 = NULL, *orig_bn2 = NIL_P(v2) ? NULL : GetBNPtr(v2);\
|
|
\
|
|
Get##_type(self, obj); \
|
|
if (orig_bn1 && !(bn1 = BN_dup(orig_bn1)) || \
|
|
orig_bn2 && !(bn2 = BN_dup(orig_bn2))) { \
|
|
BN_clear_free(bn1); \
|
|
BN_clear_free(bn2); \
|
|
ossl_raise(eBNError, NULL); \
|
|
} \
|
|
\
|
|
if (!_type##_set0_##_group(obj, bn1, bn2)) { \
|
|
BN_clear_free(bn1); \
|
|
BN_clear_free(bn2); \
|
|
ossl_raise(ePKeyError, #_type"_set0_"#_group); \
|
|
} \
|
|
return self; \
|
|
}
|
|
|
|
#define OSSL_PKEY_BN_DEF_SETTER_OLD(_keytype, _type, _group, _name) \
|
|
/* \
|
|
* call-seq: \
|
|
* _keytype##.##_name = bn -> bn \
|
|
*/ \
|
|
static VALUE ossl_##_keytype##_set_##_name(VALUE self, VALUE bignum) \
|
|
{ \
|
|
_type *obj; \
|
|
BIGNUM *bn; \
|
|
\
|
|
rb_warning("#"#_name"= is deprecated; use #set_"#_group); \
|
|
Get##_type(self, obj); \
|
|
if (NIL_P(bignum)) { \
|
|
BN_clear_free(obj->_name); \
|
|
obj->_name = NULL; \
|
|
return Qnil; \
|
|
} \
|
|
\
|
|
bn = GetBNPtr(bignum); \
|
|
if (obj->_name == NULL) \
|
|
obj->_name = BN_new(); \
|
|
if (obj->_name == NULL) \
|
|
ossl_raise(eBNError, NULL); \
|
|
if (BN_copy(obj->_name, bn) == NULL) \
|
|
ossl_raise(eBNError, NULL); \
|
|
return bignum; \
|
|
}
|
|
|
|
#if defined(HAVE_OPAQUE_OPENSSL) /* OpenSSL 1.1.0 */
|
|
#define OSSL_PKEY_BN_DEF3(_keytype, _type, _group, a1, a2, a3) \
|
|
OSSL_PKEY_BN_DEF_GETTER3(_keytype, _type, _group, a1, a2, a3) \
|
|
OSSL_PKEY_BN_DEF_SETTER3(_keytype, _type, _group, a1, a2, a3)
|
|
|
|
#define OSSL_PKEY_BN_DEF2(_keytype, _type, _group, a1, a2) \
|
|
OSSL_PKEY_BN_DEF_GETTER2(_keytype, _type, _group, a1, a2) \
|
|
OSSL_PKEY_BN_DEF_SETTER2(_keytype, _type, _group, a1, a2)
|
|
|
|
#define DEF_OSSL_PKEY_BN(class, keytype, name) \
|
|
rb_define_method((class), #name, ossl_##keytype##_get_##name, 0)
|
|
|
|
#else
|
|
#define OSSL_PKEY_BN_DEF3(_keytype, _type, _group, a1, a2, a3) \
|
|
OSSL_PKEY_BN_DEF_GETTER3(_keytype, _type, _group, a1, a2, a3) \
|
|
OSSL_PKEY_BN_DEF_SETTER3(_keytype, _type, _group, a1, a2, a3) \
|
|
OSSL_PKEY_BN_DEF_SETTER_OLD(_keytype, _type, _group, a1) \
|
|
OSSL_PKEY_BN_DEF_SETTER_OLD(_keytype, _type, _group, a2) \
|
|
OSSL_PKEY_BN_DEF_SETTER_OLD(_keytype, _type, _group, a3)
|
|
|
|
#define OSSL_PKEY_BN_DEF2(_keytype, _type, _group, a1, a2) \
|
|
OSSL_PKEY_BN_DEF_GETTER2(_keytype, _type, _group, a1, a2) \
|
|
OSSL_PKEY_BN_DEF_SETTER2(_keytype, _type, _group, a1, a2) \
|
|
OSSL_PKEY_BN_DEF_SETTER_OLD(_keytype, _type, _group, a1) \
|
|
OSSL_PKEY_BN_DEF_SETTER_OLD(_keytype, _type, _group, a2)
|
|
|
|
#define DEF_OSSL_PKEY_BN(class, keytype, name) do { \
|
|
rb_define_method((class), #name, ossl_##keytype##_get_##name, 0);\
|
|
rb_define_method((class), #name "=", ossl_##keytype##_set_##name, 1);\
|
|
} while (0)
|
|
#endif /* HAVE_OPAQUE_OPENSSL */
|
|
|
|
#endif /* _OSSL_PKEY_H_ */
|