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
173 lines
4.2 KiB
C
173 lines
4.2 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'.)
|
|
*/
|
|
#if !defined(_OSSL_H_)
|
|
#define _OSSL_H_
|
|
|
|
#include RUBY_EXTCONF_H
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <ruby.h>
|
|
#include <ruby/io.h>
|
|
#include <ruby/thread.h>
|
|
#include <openssl/opensslv.h>
|
|
#include <openssl/err.h>
|
|
#include <openssl/asn1.h>
|
|
#include <openssl/x509v3.h>
|
|
#include <openssl/ssl.h>
|
|
#include <openssl/pkcs12.h>
|
|
#include <openssl/pkcs7.h>
|
|
#include <openssl/hmac.h>
|
|
#include <openssl/rand.h>
|
|
#include <openssl/conf.h>
|
|
#include <openssl/conf_api.h>
|
|
#include <openssl/crypto.h>
|
|
#if !defined(OPENSSL_NO_ENGINE)
|
|
# include <openssl/engine.h>
|
|
#endif
|
|
#if !defined(OPENSSL_NO_OCSP)
|
|
# include <openssl/ocsp.h>
|
|
#endif
|
|
|
|
/*
|
|
* Common Module
|
|
*/
|
|
extern VALUE mOSSL;
|
|
|
|
/*
|
|
* Common Error Class
|
|
*/
|
|
extern VALUE eOSSLError;
|
|
|
|
/*
|
|
* CheckTypes
|
|
*/
|
|
#define OSSL_Check_Kind(obj, klass) do {\
|
|
if (!rb_obj_is_kind_of((obj), (klass))) {\
|
|
ossl_raise(rb_eTypeError, "wrong argument (%"PRIsVALUE")! (Expected kind of %"PRIsVALUE")",\
|
|
rb_obj_class(obj), (klass));\
|
|
}\
|
|
} while (0)
|
|
|
|
/*
|
|
* Type conversions
|
|
*/
|
|
#if !defined(NUM2UINT64T) /* in case Ruby starts to provide */
|
|
# if SIZEOF_LONG == 8
|
|
# define NUM2UINT64T(x) ((uint64_t)NUM2ULONG(x))
|
|
# elif defined(HAVE_LONG_LONG) && SIZEOF_LONG_LONG == 8
|
|
# define NUM2UINT64T(x) ((uint64_t)NUM2ULL(x))
|
|
# else
|
|
# error "unknown platform; no 64-bit width integer"
|
|
# endif
|
|
#endif
|
|
|
|
/*
|
|
* Data Conversion
|
|
*/
|
|
STACK_OF(X509) *ossl_x509_ary2sk(VALUE);
|
|
STACK_OF(X509) *ossl_protect_x509_ary2sk(VALUE,int*);
|
|
VALUE ossl_x509_sk2ary(const STACK_OF(X509) *certs);
|
|
VALUE ossl_x509crl_sk2ary(const STACK_OF(X509_CRL) *crl);
|
|
VALUE ossl_x509name_sk2ary(const STACK_OF(X509_NAME) *names);
|
|
VALUE ossl_buf2str(char *buf, int len);
|
|
VALUE ossl_str_new(const char *, long, int *);
|
|
#define ossl_str_adjust(str, p) \
|
|
do{\
|
|
long len = RSTRING_LEN(str);\
|
|
long newlen = (long)((p) - (unsigned char*)RSTRING_PTR(str));\
|
|
assert(newlen <= len);\
|
|
rb_str_set_len((str), newlen);\
|
|
}while(0)
|
|
/*
|
|
* Convert binary string to hex string. The caller is responsible for
|
|
* ensuring out has (2 * len) bytes of capacity.
|
|
*/
|
|
void ossl_bin2hex(unsigned char *in, char *out, size_t len);
|
|
|
|
/*
|
|
* Our default PEM callback
|
|
*/
|
|
/* Convert the argument to String and validate the length. Note this may raise. */
|
|
VALUE ossl_pem_passwd_value(VALUE);
|
|
/* Can be casted to pem_password_cb. If a password (String) is passed as the
|
|
* "arbitrary data" (typically the last parameter of PEM_{read,write}_
|
|
* functions), uses the value. If not, but a block is given, yields to it.
|
|
* If not either, fallbacks to PEM_def_callback() which reads from stdin. */
|
|
int ossl_pem_passwd_cb(char *, int, int, void *);
|
|
|
|
/*
|
|
* Clear BIO* with this in PEM/DER fallback scenarios to avoid decoding
|
|
* errors piling up in OpenSSL::Errors
|
|
*/
|
|
#define OSSL_BIO_reset(bio) do { \
|
|
(void)BIO_reset((bio)); \
|
|
ossl_clear_error(); \
|
|
} while (0)
|
|
|
|
/*
|
|
* ERRor messages
|
|
*/
|
|
NORETURN(void ossl_raise(VALUE, const char *, ...));
|
|
/* Clear OpenSSL error queue. If dOSSL is set, rb_warn() them. */
|
|
void ossl_clear_error(void);
|
|
|
|
/*
|
|
* String to DER String
|
|
*/
|
|
VALUE ossl_to_der(VALUE);
|
|
VALUE ossl_to_der_if_possible(VALUE);
|
|
|
|
/*
|
|
* Debug
|
|
*/
|
|
extern VALUE dOSSL;
|
|
|
|
#if defined(HAVE_VA_ARGS_MACRO)
|
|
#define OSSL_Debug(...) do { \
|
|
if (dOSSL == Qtrue) { \
|
|
fprintf(stderr, "OSSL_DEBUG: "); \
|
|
fprintf(stderr, __VA_ARGS__); \
|
|
fprintf(stderr, " [%s:%d]\n", __FILE__, __LINE__); \
|
|
} \
|
|
} while (0)
|
|
|
|
#else
|
|
void ossl_debug(const char *, ...);
|
|
#define OSSL_Debug ossl_debug
|
|
#endif
|
|
|
|
/*
|
|
* Include all parts
|
|
*/
|
|
#include "openssl_missing.h"
|
|
#include "ruby_missing.h"
|
|
#include "ossl_asn1.h"
|
|
#include "ossl_bio.h"
|
|
#include "ossl_bn.h"
|
|
#include "ossl_cipher.h"
|
|
#include "ossl_config.h"
|
|
#include "ossl_digest.h"
|
|
#include "ossl_hmac.h"
|
|
#include "ossl_ns_spki.h"
|
|
#include "ossl_ocsp.h"
|
|
#include "ossl_pkcs12.h"
|
|
#include "ossl_pkcs7.h"
|
|
#include "ossl_pkey.h"
|
|
#include "ossl_rand.h"
|
|
#include "ossl_ssl.h"
|
|
#include "ossl_version.h"
|
|
#include "ossl_x509.h"
|
|
#include "ossl_engine.h"
|
|
#include "ossl_kdf.h"
|
|
|
|
void Init_openssl(void);
|
|
|
|
#endif /* _OSSL_H_ */
|