archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 18:13:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Update rubygems to 2.0.6. [Bug #13935]

Browse source 
The patch is provided by Kazuki Yamaguchi.

From: Kazuki Yamaguchi <k@rhe.jp>
Date: Mon, 25 Sep 2017 01:32:02 +0900
Subject: [PATCH] openssl: import v2.0.6

Import Ruby/OpenSSL 2.0.6. This contains only bug fixes and test
improvements. The full commit log since v2.0.5 (imported at r59567, to
trunk) can be found at:

        https://github.com/ruby/openssl/compare/v2.0.5...v2.0.6

All the changes included in this patch are already imported to trunk by
r59734, r59751, r59857, and r60013.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@62842 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2018-03-19 15:11:08 +00:00
parent 093c6ce7c2
commit b503ff8b43
43 changed files with 1255 additions and 1146 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ext/openssl/History.md
View file

@ -1,3 +1,23 @@
Version 2.0.6
=============
Bug fixes
---------
* The session_remove_cb set to an OpenSSL::SSL::SSLContext is no longer called
during GC.
* A possible deadlock in OpenSSL::SSL::SSLSocket#sysread is fixed.
[[GitHub #139]](https://github.com/ruby/openssl/pull/139)
* OpenSSL::BN#hash could return an unnormalized fixnum value on Windows.
[[Bug #13877]](https://bugs.ruby-lang.org/issues/13877)
* OpenSSL::SSL::SSLSocket#sysread and #sysread_nonblock set the length of the
destination buffer String to 0 on error.
[[GitHub #153]](https://github.com/ruby/openssl/pull/153)
* Possible deadlock is fixed. This happened only when built with older versions
of OpenSSL (before 1.1.0) or LibreSSL.
[[GitHub #155]](https://github.com/ruby/openssl/pull/155)
Version 2.0.5 Version 2.0.5
============= =============

9
ext/openssl/lib/openssl/buffering.rb
View file

@ -164,10 +164,9 @@ module OpenSSL::Buffering
# when the peer requests a new TLS/SSL handshake. See openssl the FAQ for # when the peer requests a new TLS/SSL handshake. See openssl the FAQ for
# more details. http://www.openssl.org/support/faq.html # more details. http://www.openssl.org/support/faq.html
# #
# By specifying a keyword argument _exception_ to +false+, you can indicate # By specifying `exception: false`, the options hash allows you to indicate
# that read_nonblock should not raise an IO::Wait*able exception, but # that read_nonblock should not raise an IO::Wait*able exception, but
# return the symbol +:wait_writable+ or +:wait_readable+ instead. At EOF, # return the symbol :wait_writable or :wait_readable instead.
# it will return +nil+ instead of raising EOFError.
def read_nonblock(maxlen, buf=nil, exception: true) def read_nonblock(maxlen, buf=nil, exception: true)
if maxlen == 0 if maxlen == 0
@ -377,9 +376,9 @@ module OpenSSL::Buffering
# is when the peer requests a new TLS/SSL handshake. See the openssl FAQ # is when the peer requests a new TLS/SSL handshake. See the openssl FAQ
# for more details. http://www.openssl.org/support/faq.html # for more details. http://www.openssl.org/support/faq.html
# #
# By specifying a keyword argument _exception_ to +false+, you can indicate # By specifying `exception: false`, the options hash allows you to indicate
# that write_nonblock should not raise an IO::Wait*able exception, but # that write_nonblock should not raise an IO::Wait*able exception, but
# return the symbol +:wait_writable+ or +:wait_readable+ instead. # return the symbol :wait_writable or :wait_readable instead.
def write_nonblock(s, exception: true) def write_nonblock(s, exception: true)
flush flush

8
ext/openssl/openssl.gemspec
View file

@ -1,16 +1,16 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
# stub: openssl 2.0.5 ruby lib # stub: openssl 2.0.6 ruby lib
# stub: ext/openssl/extconf.rb # stub: ext/openssl/extconf.rb
Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = "openssl".freeze s.name = "openssl".freeze
s.version = "2.0.5" s.version = "2.0.6"
s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version= s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
s.metadata = { "msys2_mingw_dependencies" => "openssl" } if s.respond_to? :metadata= s.metadata = { "msys2_mingw_dependencies" => "openssl" } if s.respond_to? :metadata=
s.require_paths = ["lib".freeze] s.require_paths = ["lib".freeze]
s.authors = ["Martin Bosslet".freeze, "SHIBATA Hiroshi".freeze, "Zachary Scott".freeze, "Kazuki Yamaguchi".freeze] s.authors = ["Martin Bosslet".freeze, "SHIBATA Hiroshi".freeze, "Zachary Scott".freeze, "Kazuki Yamaguchi".freeze]
s.date = "2017-08-08" s.date = "2017-09-24"
s.description = "It wraps the OpenSSL library.".freeze s.description = "It wraps the OpenSSL library.".freeze
s.email = ["ruby-core@ruby-lang.org".freeze] s.email = ["ruby-core@ruby-lang.org".freeze]
s.extensions = ["ext/openssl/extconf.rb".freeze] s.extensions = ["ext/openssl/extconf.rb".freeze]
@ -20,7 +20,7 @@ Gem::Specification.new do |s|
s.licenses = ["Ruby".freeze] s.licenses = ["Ruby".freeze]
s.rdoc_options = ["--main".freeze, "README.md".freeze] s.rdoc_options = ["--main".freeze, "README.md".freeze]
s.required_ruby_version = Gem::Requirement.new(">= 2.3.0".freeze) s.required_ruby_version = Gem::Requirement.new(">= 2.3.0".freeze)
s.rubygems_version = "2.6.12".freeze s.rubygems_version = "2.6.13".freeze
s.summary = "OpenSSL provides SSL, TLS and general purpose cryptography.".freeze s.summary = "OpenSSL provides SSL, TLS and general purpose cryptography.".freeze
if s.respond_to? :specification_version then if s.respond_to? :specification_version then

183
ext/openssl/ossl.c
View file

@ -414,44 +414,123 @@ ossl_fips_mode_set(VALUE self, VALUE enabled)
#endif #endif
} }
#if defined(OSSL_DEBUG)
#if !defined(LIBRESSL_VERSION_NUMBER) && \
(OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(OPENSSL_NO_CRYPTO_MDEBUG) || \
defined(CRYPTO_malloc_debug_init))
/*
* call-seq:
* OpenSSL.mem_check_start -> nil
*
* Calls CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON). Starts tracking memory
* allocations. See also OpenSSL.print_mem_leaks.
*
* This is available only when built with a capable OpenSSL and --enable-debug
* configure option.
*/
static VALUE
mem_check_start(VALUE self)
{
CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
return Qnil;
}
/*
* call-seq:
* OpenSSL.print_mem_leaks -> true | false
*
* For debugging the Ruby/OpenSSL library. Calls CRYPTO_mem_leaks_fp(stderr).
* Prints detected memory leaks to standard error. This cleans the global state
* up thus you cannot use any methods of the library after calling this.
*
* Returns true if leaks detected, false otherwise.
*
* This is available only when built with a capable OpenSSL and --enable-debug
* configure option.
*
* === Example
* OpenSSL.mem_check_start
* NOT_GCED = OpenSSL::PKey::RSA.new(256)
*
* END {
* GC.start
* OpenSSL.print_mem_leaks # will print the leakage
* }
*/
static VALUE
print_mem_leaks(VALUE self)
{
#if OPENSSL_VERSION_NUMBER >= 0x10100000
int ret;
#endif
BN_CTX_free(ossl_bn_ctx);
ossl_bn_ctx = NULL;
#if OPENSSL_VERSION_NUMBER >= 0x10100000
ret = CRYPTO_mem_leaks_fp(stderr);
if (ret < 0)
ossl_raise(eOSSLError, "CRYPTO_mem_leaks_fp");
return ret ? Qfalse : Qtrue;
#else
CRYPTO_mem_leaks_fp(stderr);
return Qnil;
#endif
}
#endif
#endif
#if !defined(HAVE_OPENSSL_110_THREADING_API) #if !defined(HAVE_OPENSSL_110_THREADING_API)
/** /**
* Stores locks needed for OpenSSL thread safety * Stores locks needed for OpenSSL thread safety
*/ */
static rb_nativethread_lock_t *ossl_locks;
static void
ossl_lock_unlock(int mode, rb_nativethread_lock_t *lock)
{
if (mode & CRYPTO_LOCK) {
rb_nativethread_lock_lock(lock);
} else {
rb_nativethread_lock_unlock(lock);
}
}
static void
ossl_lock_callback(int mode, int type, const char *file, int line)
{
ossl_lock_unlock(mode, &ossl_locks[type]);
}
struct CRYPTO_dynlock_value { struct CRYPTO_dynlock_value {
rb_nativethread_lock_t lock; rb_nativethread_lock_t lock;
rb_nativethread_id_t owner;
size_t count;
}; };
static void
ossl_lock_init(struct CRYPTO_dynlock_value *l)
{
rb_nativethread_lock_initialize(&l->lock);
l->count = 0;
}
static void
ossl_lock_unlock(int mode, struct CRYPTO_dynlock_value *l)
{
if (mode & CRYPTO_LOCK) {
/* TODO: rb_nativethread_id_t is not necessarily compared with ==. */
rb_nativethread_id_t tid = rb_nativethread_self();
if (l->count && l->owner == tid) {
l->count++;
return;
}
rb_nativethread_lock_lock(&l->lock);
l->owner = tid;
l->count = 1;
} else {
if (!--l->count)
rb_nativethread_lock_unlock(&l->lock);
}
}
static struct CRYPTO_dynlock_value * static struct CRYPTO_dynlock_value *
ossl_dyn_create_callback(const char *file, int line) ossl_dyn_create_callback(const char *file, int line)
{ {
struct CRYPTO_dynlock_value *dynlock = (struct CRYPTO_dynlock_value *)OPENSSL_malloc((int)sizeof(struct CRYPTO_dynlock_value)); /* Do not use xmalloc() here, since it may raise NoMemoryError */
rb_nativethread_lock_initialize(&dynlock->lock); struct CRYPTO_dynlock_value *dynlock =
OPENSSL_malloc(sizeof(struct CRYPTO_dynlock_value));
if (dynlock)
ossl_lock_init(dynlock);
return dynlock; return dynlock;
} }
static void static void
ossl_dyn_lock_callback(int mode, struct CRYPTO_dynlock_value *l, const char *file, int line) ossl_dyn_lock_callback(int mode, struct CRYPTO_dynlock_value *l, const char *file, int line)
{ {
ossl_lock_unlock(mode, &l->lock); ossl_lock_unlock(mode, l);
} }
static void static void
@ -475,21 +554,22 @@ static unsigned long ossl_thread_id(void)
} }
#endif #endif
static struct CRYPTO_dynlock_value *ossl_locks;
static void
ossl_lock_callback(int mode, int type, const char *file, int line)
{
ossl_lock_unlock(mode, &ossl_locks[type]);
}
static void Init_ossl_locks(void) static void Init_ossl_locks(void)
{ {
int i; int i;
int num_locks = CRYPTO_num_locks(); int num_locks = CRYPTO_num_locks();
if ((unsigned)num_locks >= INT_MAX / (int)sizeof(VALUE)) { ossl_locks = ALLOC_N(struct CRYPTO_dynlock_value, num_locks);
rb_raise(rb_eRuntimeError, "CRYPTO_num_locks() is too big: %d", num_locks); for (i = 0; i < num_locks; i++)
} ossl_lock_init(&ossl_locks[i]);
ossl_locks = (rb_nativethread_lock_t *) OPENSSL_malloc(num_locks * (int)sizeof(rb_nativethread_lock_t));
if (!ossl_locks) {
rb_raise(rb_eNoMemError, "CRYPTO_num_locks() is too big: %d", num_locks);
}
for (i = 0; i < num_locks; i++) {
rb_nativethread_lock_initialize(&ossl_locks[i]);
}
#ifdef HAVE_CRYPTO_THREADID_PTR #ifdef HAVE_CRYPTO_THREADID_PTR
CRYPTO_THREADID_set_callback(ossl_threadid_func); CRYPTO_THREADID_set_callback(ossl_threadid_func);
@ -1114,15 +1194,40 @@ Init_openssl(void)
Init_ossl_ocsp(); Init_ossl_ocsp();
Init_ossl_engine(); Init_ossl_engine();
Init_ossl_asn1(); Init_ossl_asn1();
}
#if defined(OSSL_DEBUG) #if defined(OSSL_DEBUG)
/* /*
* Check if all symbols are OK with 'make LDSHARED=gcc all' * For debugging Ruby/OpenSSL. Enable only when built with --enable-debug
*/ */
int #if !defined(LIBRESSL_VERSION_NUMBER) && \
main(int argc, char *argv[]) (OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(OPENSSL_NO_CRYPTO_MDEBUG) || \
{ defined(CRYPTO_malloc_debug_init))
return 0; rb_define_module_function(mOSSL, "mem_check_start", mem_check_start, 0);
rb_define_module_function(mOSSL, "print_mem_leaks", print_mem_leaks, 0);
#if defined(CRYPTO_malloc_debug_init) /* <= 1.0.2 */
CRYPTO_malloc_debug_init();
#endif
#if defined(V_CRYPTO_MDEBUG_ALL) /* <= 1.0.2 */
CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);
#endif
#if OPENSSL_VERSION_NUMBER < 0x10100000 /* <= 1.0.2 */
{
int i;
/*
* See crypto/ex_data.c; call def_get_class() immediately to avoid
* allocations. 15 is the maximum number that is used as the class index
* in OpenSSL 1.0.2.
*/
for (i = 0; i <= 15; i++) {
if (CRYPTO_get_ex_new_index(i, 0, (void *)"ossl-mdebug-dummy", 0, 0, 0) < 0)
rb_raise(rb_eRuntimeError, "CRYPTO_get_ex_new_index for "
"class index %d failed", i);
}
}
#endif
#endif
#endif
} }
#endif /* OSSL_DEBUG */

12
ext/openssl/ossl_cipher.c
View file

@ -631,13 +631,11 @@ ossl_cipher_get_auth_tag(int argc, VALUE *argv, VALUE self)
* call-seq: * call-seq:
* cipher.auth_tag = string -> string * cipher.auth_tag = string -> string
* *
* Sets the authentication tag to verify the contents of the * Sets the authentication tag to verify the integrity of the ciphertext.
* ciphertext. The tag must be set after calling Cipher#decrypt, * This can be called only when the cipher supports AE. The tag must be set
* Cipher#key= and Cipher#iv=, but before assigning the associated * after calling Cipher#decrypt, Cipher#key= and Cipher#iv=, but before
* authenticated data using Cipher#auth_data= and of course, before * calling Cipher#final. After all decryption is performed, the tag is
* decrypting any of the ciphertext. After all decryption is * verified automatically in the call to Cipher#final.
* performed, the tag is verified automatically in the call to
* Cipher#final.
* *
* For OCB mode, the tag length must be supplied with #auth_tag_len= * For OCB mode, the tag length must be supplied with #auth_tag_len=
* beforehand. * beforehand.

39
ext/openssl/ossl_ssl.c
View file

@ -476,6 +476,13 @@ ossl_sslctx_session_remove_cb(SSL_CTX *ctx, SSL_SESSION *sess)
void *ptr; void *ptr;
int state = 0; int state = 0;
/*
* This callback is also called for all sessions in the internal store
* when SSL_CTX_free() is called.
*/
if (rb_during_gc())
return;
OSSL_Debug("SSL SESSION remove callback entered"); OSSL_Debug("SSL SESSION remove callback entered");
if ((ptr = SSL_CTX_get_ex_data(ctx, ossl_ssl_ex_ptr_idx)) == NULL) if ((ptr = SSL_CTX_get_ex_data(ctx, ossl_ssl_ex_ptr_idx)) == NULL)
@ -1601,10 +1608,10 @@ ossl_ssl_connect(VALUE self)
* retry * retry
* end * end
* *
* By specifying a keyword argument _exception_ to +false+, you can indicate * By specifying `exception: false`, the options hash allows you to indicate
* that connect_nonblock should not raise an IO::WaitReadable or * that connect_nonblock should not raise an IO::WaitReadable or
* IO::WaitWritable exception, but return the symbol +:wait_readable+ or * IO::WaitWritable exception, but return the symbol :wait_readable or
* +:wait_writable+ instead. * :wait_writable instead.
*/ */
static VALUE static VALUE
ossl_ssl_connect_nonblock(int argc, VALUE *argv, VALUE self) ossl_ssl_connect_nonblock(int argc, VALUE *argv, VALUE self)
@ -1649,10 +1656,10 @@ ossl_ssl_accept(VALUE self)
* retry * retry
* end * end
* *
* By specifying a keyword argument _exception_ to +false+, you can indicate * By specifying `exception: false`, the options hash allows you to indicate
* that accept_nonblock should not raise an IO::WaitReadable or * that accept_nonblock should not raise an IO::WaitReadable or
* IO::WaitWritable exception, but return the symbol +:wait_readable+ or * IO::WaitWritable exception, but return the symbol :wait_readable or
* +:wait_writable+ instead. * :wait_writable instead.
*/ */
static VALUE static VALUE
ossl_ssl_accept_nonblock(int argc, VALUE *argv, VALUE self) ossl_ssl_accept_nonblock(int argc, VALUE *argv, VALUE self)
@ -1681,22 +1688,26 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
} }
ilen = NUM2INT(len); ilen = NUM2INT(len);
if(NIL_P(str)) str = rb_str_new(0, ilen); if (NIL_P(str))
else{ str = rb_str_new(0, ilen);
else {
StringValue(str); StringValue(str);
if (RSTRING_LEN(str) >= ilen)
rb_str_modify(str); rb_str_modify(str);
rb_str_resize(str, ilen); else
rb_str_modify_expand(str, ilen - RSTRING_LEN(str));
} }
if(ilen == 0) return str; OBJ_TAINT(str);
rb_str_set_len(str, 0);
if (ilen == 0)
return str;
GetSSL(self, ssl); GetSSL(self, ssl);
io = rb_attr_get(self, id_i_io); io = rb_attr_get(self, id_i_io);
GetOpenFile(io, fptr); GetOpenFile(io, fptr);
if (ssl_started(ssl)) { if (ssl_started(ssl)) {
if(!nonblock && SSL_pending(ssl) <= 0)
rb_thread_wait_fd(FPTR_TO_FD(fptr));
for (;;){ for (;;){
nread = SSL_read(ssl, RSTRING_PTR(str), RSTRING_LENINT(str)); nread = SSL_read(ssl, RSTRING_PTR(str), ilen);
switch(ssl_get_error(ssl, nread)){ switch(ssl_get_error(ssl, nread)){
case SSL_ERROR_NONE: case SSL_ERROR_NONE:
goto end; goto end;
@ -1746,8 +1757,6 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
end: end:
rb_str_set_len(str, nread); rb_str_set_len(str, nread);
OBJ_TAINT(str);
return str; return str;
} }

2
ext/openssl/ossl_version.h
View file

@ -10,6 +10,6 @@
#if !defined(_OSSL_VERSION_H_) #if !defined(_OSSL_VERSION_H_)
#define _OSSL_VERSION_H_ #define _OSSL_VERSION_H_
#define OSSL_VERSION "2.0.5" #define OSSL_VERSION "2.0.6"
#endif /* _OSSL_VERSION_H_ */ #endif /* _OSSL_VERSION_H_ */

10
ext/openssl/ruby_missing.h
View file

@ -15,9 +15,15 @@
#define FPTR_TO_FD(fptr) ((fptr)->fd) #define FPTR_TO_FD(fptr) ((fptr)->fd)
/* Ruby 2.4 */
#ifndef RB_INTEGER_TYPE_P #ifndef RB_INTEGER_TYPE_P
/* for Ruby 2.3 compatibility */ # define RB_INTEGER_TYPE_P(obj) (RB_FIXNUM_P(obj) || RB_TYPE_P(obj, T_BIGNUM))
#define RB_INTEGER_TYPE_P(obj) (RB_FIXNUM_P(obj) || RB_TYPE_P(obj, T_BIGNUM)) #endif
/* Ruby 2.5 */
#ifndef ST2FIX
# define RB_ST2FIX(h) LONG2FIX((long)(h))
# define ST2FIX(h) RB_ST2FIX(h)
#endif #endif
#endif /* _OSSL_RUBY_MISSING_H_ */ #endif /* _OSSL_RUBY_MISSING_H_ */

5
test/openssl/fixtures/pkey/dh1024.pem Normal file
View file

@ -0,0 +1,5 @@
-----BEGIN DH PARAMETERS-----
MIGHAoGBAKnKQ8MNK6nYZzLrrcuTsLxuiJGXoOO5gT+tljOTbHBuiktdMTITzIY0
pFxIvjG05D7HoBZQfrR0c92NGWPkAiCkhQKB8JCbPVzwNLDy6DZ0pmofDKrEsYHG
AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
-----END DH PARAMETERS-----

12
test/openssl/fixtures/pkey/dsa1024.pem Normal file
View file

@ -0,0 +1,12 @@
-----BEGIN DSA PRIVATE KEY-----
MIIBugIBAAKBgQCH9aAoXvWWThIjkA6D+nI1F9ksF9iDq594rkiGNOT9sPDOdB+n
D+qeeeeloRlj19ymCSADPI0ZLRgkchkAEnY2RnqnhHOjVf/roGgRbW+iQDMbQ9wa
/pvc6/fAbsu1goE1hBYjm98/sZEeXavj8tR56IXnjF1b6Nx0+sgeUKFKEQIVAMiz
4BJUFeTtddyM4uadBM7HKLPRAoGAZdLBSYNGiij7vAjesF5mGUKTIgPd+JKuBEDx
OaBclsgfdoyoF/TMOkIty+PVlYD+//Vl2xnoUEIRaMXHwHfm0r2xUX++oeRaSScg
YizJdUxe5jvBuBszGPRc/mGpb9YvP0sB+FL1KmuxYmdODfCe51zl8uM/CVhouJ3w
DjmRGscCgYAuFlfC7p+e8huCKydfcv/beftqjewiOPpQ3u5uI6KPCtCJPpDhs3+4
IihH2cPsAlqwGF4tlibW1+/z/OZ1AZinPK3y7b2jSJASEaPeEltVzB92hcd1khk2
jTYcmSsV4VddplOPK9czytR/GbbibxsrhhgZUbd8LPbvIgaiadJ1PgIUBnJ/5vN2
CVArsEzlPUCbohPvZnE=
-----END DSA PRIVATE KEY-----

8
test/openssl/fixtures/pkey/dsa256.pem Normal file
View file

@ -0,0 +1,8 @@
-----BEGIN DSA PRIVATE KEY-----
MIH3AgEAAkEAhk2libbY2a8y2Pt21+YPYGZeW6wzaW2yfj5oiClXro9XMR7XWLkE
9B7XxLNFCS2gmCCdMsMW1HulaHtLFQmB2wIVAM43JZrcgpu6ajZ01VkLc93gu/Ed
AkAOhujZrrKV5CzBKutKLb0GVyVWmdC7InoNSMZEeGU72rT96IjM59YzoqmD0pGM
3I1o4cGqg1D1DfM1rQlnN1eSAkBq6xXfEDwJ1mLNxF6q8Zm/ugFYWR5xcX/3wFiT
b4+EjHP/DbNh9Vm5wcfnDBJ1zKvrMEf2xqngYdrV/3CiGJeKAhRvL57QvJZcQGvn
ISNX5cMzFHRW3Q==
-----END DSA PRIVATE KEY-----

8
test/openssl/fixtures/pkey/dsa512.pem Normal file
View file

@ -0,0 +1,8 @@
-----BEGIN DSA PRIVATE KEY-----
MIH4AgEAAkEA5lB4GvEwjrsMlGDqGsxrbqeFRh6o9OWt6FgTYiEEHaOYhkIxv0Ok
RZPDNwOG997mDjBnvDJ1i56OmS3MbTnovwIVAJgub/aDrSDB4DZGH7UyarcaGy6D
AkB9HdFw/3td8K4l1FZHv7TCZeJ3ZLb7dF3TWoGUP003RCqoji3/lHdKoVdTQNuR
S/m6DlCwhjRjiQ/lBRgCLCcaAkEAjN891JBjzpMj4bWgsACmMggFf57DS0Ti+5++
Q1VB8qkJN7rA7/2HrCR3gTsWNb1YhAsnFsoeRscC+LxXoXi9OAIUBG98h4tilg6S
55jreJD3Se3slps=
-----END DSA PRIVATE KEY-----

5
test/openssl/fixtures/pkey/p256.pem Normal file
View file

@ -0,0 +1,5 @@
-----BEGIN EC PRIVATE KEY-----
MHcCAQEEIID49FDqcf1O1eO8saTgG70UbXQw9Fqwseliit2aWhH1oAoGCCqGSM49
AwEHoUQDQgAEFglk2c+oVUIKQ64eZG9bhLNPWB7lSZ/ArK41eGy5wAzU/0G51Xtt
CeBUl+MahZtn9fO1JKdF4qJmS39dXnpENg==
-----END EC PRIVATE KEY-----

15
test/openssl/fixtures/pkey/rsa1024.pem Normal file
View file

@ -0,0 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
MIICXgIBAAKBgQDLwsSw1ECnPtT+PkOgHhcGA71nwC2/nL85VBGnRqDxOqjVh7Cx
aKPERYHsk4BPCkE3brtThPWc9kjHEQQ7uf9Y1rbCz0layNqHyywQEVLFmp1cpIt/
Q3geLv8ZD9pihowKJDyMDiN6ArYUmZczvW4976MU3+l54E6lF/JfFEU5hwIDAQAB
AoGBAKSl/MQarye1yOysqX6P8fDFQt68VvtXkNmlSiKOGuzyho0M+UVSFcs6k1L0
maDE25AMZUiGzuWHyaU55d7RXDgeskDMakD1v6ZejYtxJkSXbETOTLDwUWTn618T
gnb17tU1jktUtU67xK/08i/XodlgnQhs6VoHTuCh3Hu77O6RAkEA7+gxqBuZR572
74/akiW/SuXm0SXPEviyO1MuSRwtI87B02D0qgV8D1UHRm4AhMnJ8MCs1809kMQE
JiQUCrp9mQJBANlt2ngBO14us6NnhuAseFDTBzCHXwUUu1YKHpMMmxpnGqaldGgX
sOZB3lgJsT9VlGf3YGYdkLTNVbogQKlKpB8CQQDiSwkb4vyQfDe8/NpU5Not0fII
8jsDUCb+opWUTMmfbxWRR3FBNu8wnym/m19N4fFj8LqYzHX4KY0oVPu6qvJxAkEA
wa5snNekFcqONLIE4G5cosrIrb74sqL8GbGb+KuTAprzj5z1K8Bm0UW9lTjVDjDi
qRYgZfZSL+x1P/54+xTFSwJAY1FxA/N3QPCXCjPh5YqFxAMQs2VVYTfg+t0MEcJD
dPMQD5JX6g5HKnHFg2mZtoXQrWmJSn7p8GJK8yNTopEErA==
-----END RSA PRIVATE KEY-----

27
test/openssl/fixtures/pkey/rsa2048.pem Normal file
View file

@ -0,0 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
MIIEpAIBAAKCAQEAuV9ht9J7k4NBs38jOXvvTKY9gW8nLICSno5EETR1cuF7i4pN
s9I1QJGAFAX0BEO4KbzXmuOvfCpD3CU+Slp1enenfzq/t/e/1IRW0wkJUJUFQign
4CtrkJL+P07yx18UjyPlBXb81ApEmAB5mrJVSrWmqbjs07JbuS4QQGGXLc+Su96D
kYKmSNVjBiLxVVSpyZfAY3hD37d60uG+X8xdW5v68JkRFIhdGlb6JL8fllf/A/bl
NwdJOhVr9mESHhwGjwfSeTDPfd8ZLE027E5lyAVX9KZYcU00mOX+fdxOSnGqS/8J
DRh0EPHDL15RcJjV2J6vZjPb0rOYGDoMcH+94wIDAQABAoIBAAzsamqfYQAqwXTb
I0CJtGg6msUgU7HVkOM+9d3hM2L791oGHV6xBAdpXW2H8LgvZHJ8eOeSghR8+dgq
PIqAffo4x1Oma+FOg3A0fb0evyiACyrOk+EcBdbBeLo/LcvahBtqnDfiUMQTpy6V
seSoFCwuN91TSCeGIsDpRjbG1vxZgtx+uI+oH5+ytqJOmfCksRDCkMglGkzyfcl0
Xc5CUhIJ0my53xijEUQl19rtWdMnNnnkdbG8PT3LZlOta5Do86BElzUYka0C6dUc
VsBDQ0Nup0P6rEQgy7tephHoRlUGTYamsajGJaAo1F3IQVIrRSuagi7+YpSpCqsW
wORqorkCgYEA7RdX6MDVrbw7LePnhyuaqTiMK+055/R1TqhB1JvvxJ1CXk2rDL6G
0TLHQ7oGofd5LYiemg4ZVtWdJe43BPZlVgT6lvL/iGo8JnrncB9Da6L7nrq/+Rvj
XGjf1qODCK+LmreZWEsaLPURIoR/Ewwxb9J2zd0CaMjeTwafJo1CZvcCgYEAyCgb
aqoWvUecX8VvARfuA593Lsi50t4MEArnOXXcd1RnXoZWhbx5rgO8/ATKfXr0BK/n
h2GF9PfKzHFm/4V6e82OL7gu/kLy2u9bXN74vOvWFL5NOrOKPM7Kg+9I131kNYOw
Ivnr/VtHE5s0dY7JChYWE1F3vArrOw3T00a4CXUCgYEA0SqY+dS2LvIzW4cHCe9k
IQqsT0yYm5TFsUEr4sA3xcPfe4cV8sZb9k/QEGYb1+SWWZ+AHPV3UW5fl8kTbSNb
v4ng8i8rVVQ0ANbJO9e5CUrepein2MPL0AkOATR8M7t7dGGpvYV0cFk8ZrFx0oId
U0PgYDotF/iueBWlbsOM430CgYEAqYI95dFyPI5/AiSkY5queeb8+mQH62sdcCCr
vd/w/CZA/K5sbAo4SoTj8dLk4evU6HtIa0DOP63y071eaxvRpTNqLUOgmLh+D6gS
Cc7TfLuFrD+WDBatBd5jZ+SoHccVrLR/4L8jeodo5FPW05A+9gnKXEXsTxY4LOUC
9bS4e1kCgYAqVXZh63JsMwoaxCYmQ66eJojKa47VNrOeIZDZvd2BPVf30glBOT41
gBoDG3WMPZoQj9pb7uMcrnvs4APj2FIhMU8U15LcPAj59cD6S6rWnAxO8NFK7HQG
4Jxg3JNNf8ErQoCHb1B3oVdXJkmbJkARoDpBKmTCgKtP8ADYLmVPQw==
-----END RSA PRIVATE KEY-----

7
test/openssl/test_asn1.rb
View file

@ -1,10 +1,12 @@
# frozen_string_literal: false # frozen_string_literal: false
require_relative 'utils' require_relative 'utils'
if defined?(OpenSSL::TestUtils)
class OpenSSL::TestASN1 < OpenSSL::TestCase class OpenSSL::TestASN1 < OpenSSL::TestCase
def test_decode def test_decode
subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCA") subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCA")
key = OpenSSL::TestUtils::TEST_KEY_RSA1024 key = Fixtures.pkey("rsa1024")
now = Time.at(Time.now.to_i) # suppress usec now = Time.at(Time.now.to_i) # suppress usec
s = 0xdeadbeafdeadbeafdeadbeafdeadbeaf s = 0xdeadbeafdeadbeafdeadbeafdeadbeaf
exts = [ exts = [
@ -582,5 +584,6 @@ rEzBQ0F9dUyqQ9gyRg8KHhDfv9HzT1d/rnUZMkoombwYBRIUChGCYV0GnJcan2Zm
end end
assert_equal(:UNIVERSAL, asn1.tag_class) assert_equal(:UNIVERSAL, asn1.tag_class)
end end
end
end if defined?(OpenSSL::TestUtils) end

1
test/openssl/test_bn.rb
View file

@ -55,6 +55,7 @@ class OpenSSL::TestBN < OpenSSL::TestCase
assert_equal(false, bn1.eql?(bn3)) assert_equal(false, bn1.eql?(bn3))
assert_equal(bn1.hash, bn2.hash) assert_equal(bn1.hash, bn2.hash)
assert_not_equal(bn3.hash, bn1.hash) assert_not_equal(bn3.hash, bn1.hash)
assert_instance_of(String, bn1.hash.to_s)
end end
end end

7
test/openssl/test_buffering.rb
View file

@ -1,9 +1,9 @@
# frozen_string_literal: false # frozen_string_literal: false
require_relative 'utils' require_relative 'utils'
require 'stringio'
if defined?(OpenSSL::TestUtils)
class OpenSSL::TestBuffering < OpenSSL::TestCase class OpenSSL::TestBuffering < OpenSSL::TestCase
class IO class IO
include OpenSSL::Buffering include OpenSSL::Buffering
@ -85,5 +85,6 @@ class OpenSSL::TestBuffering < OpenSSL::TestCase
end end
assert_equal([97, 98, 99], res) assert_equal([97, 98, 99], res)
end end
end
end if defined?(OpenSSL::TestUtils) end

12
test/openssl/test_config.rb
View file

@ -1,6 +1,8 @@
# frozen_string_literal: false # frozen_string_literal: false
require_relative 'utils' require_relative 'utils'
if defined?(OpenSSL::TestUtils)
class OpenSSL::TestConfig < OpenSSL::TestCase class OpenSSL::TestConfig < OpenSSL::TestCase
def setup def setup
super super
@ -171,7 +173,7 @@ __EOC__
def test_value def test_value
# suppress deprecation warnings # suppress deprecation warnings
OpenSSL::TestUtils.silent do EnvUtil.suppress_warning do
assert_equal('CA_default', @it.value('ca', 'default_ca')) assert_equal('CA_default', @it.value('ca', 'default_ca'))
assert_equal(nil, @it.value('ca', 'no such key')) assert_equal(nil, @it.value('ca', 'no such key'))
assert_equal(nil, @it.value('no such section', 'no such key')) assert_equal(nil, @it.value('no such section', 'no such key'))
@ -184,7 +186,7 @@ __EOC__
end end
def test_value_ENV def test_value_ENV
OpenSSL::TestUtils.silent do EnvUtil.suppress_warning do
key = ENV.keys.first key = ENV.keys.first
assert_not_nil(key) # make sure we have at least one ENV var. assert_not_nil(key) # make sure we have at least one ENV var.
assert_equal(ENV[key], @it.value('ENV', key)) assert_equal(ENV[key], @it.value('ENV', key))
@ -199,7 +201,7 @@ __EOC__
end end
def test_section def test_section
OpenSSL::TestUtils.silent do EnvUtil.suppress_warning do
assert_equal({'HOME' => '.'}, @it.section('default')) assert_equal({'HOME' => '.'}, @it.section('default'))
assert_equal({'dir' => './demoCA', 'certs' => './certs'}, @it.section('CA_default')) assert_equal({'dir' => './demoCA', 'certs' => './certs'}, @it.section('CA_default'))
assert_equal({}, @it.section('no_such_section')) assert_equal({}, @it.section('no_such_section'))
@ -297,4 +299,6 @@ __EOC__
@it['newsection'] = {'a' => 'b'} @it['newsection'] = {'a' => 'b'}
assert_not_equal(@it.sections.sort, c.sections.sort) assert_not_equal(@it.sections.sort, c.sections.sort)
end end
end if defined?(OpenSSL::TestUtils) end
end

19
test/openssl/test_digest.rb
View file

@ -54,13 +54,10 @@ class OpenSSL::TestDigest < OpenSSL::TestCase
end end
def test_digest_constants def test_digest_constants
algs = %w(MD4 MD5 RIPEMD160 SHA1) algs = %w(MD4 MD5 RIPEMD160 SHA1 SHA224 SHA256 SHA384 SHA512)
if OpenSSL::OPENSSL_VERSION_NUMBER < 0x10100000 if !libressl? && !openssl?(1, 1, 0)
algs += %w(DSS1 SHA) algs += %w(DSS1 SHA)
end end
if OpenSSL::OPENSSL_VERSION_NUMBER > 0x00908000
algs += %w(SHA224 SHA256 SHA384 SHA512)
end
algs.each do |alg| algs.each do |alg|
assert_not_nil(OpenSSL::Digest.new(alg)) assert_not_nil(OpenSSL::Digest.new(alg))
klass = OpenSSL::Digest.const_get(alg) klass = OpenSSL::Digest.const_get(alg)
@ -73,12 +70,11 @@ class OpenSSL::TestDigest < OpenSSL::TestCase
check_digest(OpenSSL::ASN1::ObjectId.new("SHA1")) check_digest(OpenSSL::ASN1::ObjectId.new("SHA1"))
end end
if OpenSSL::OPENSSL_VERSION_NUMBER > 0x00908000
def encode16(str) def encode16(str)
str.unpack("H*").first str.unpack("H*").first
end end
def test_098_features def test_sha2
sha224_a = "abd37534c7d9a2efb9465de931cd7055ffdb8879563ae98078d6d6d5" sha224_a = "abd37534c7d9a2efb9465de931cd7055ffdb8879563ae98078d6d6d5"
sha256_a = "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" sha256_a = "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb"
sha384_a = "54a59b9f22b0b80880d8427e548b7c23abd873486e1f035dce9cd697e85175033caa88e6d57bc35efae0b5afd3145f31" sha384_a = "54a59b9f22b0b80880d8427e548b7c23abd873486e1f035dce9cd697e85175033caa88e6d57bc35efae0b5afd3145f31"
@ -101,7 +97,6 @@ class OpenSSL::TestDigest < OpenSSL::TestCase
check_digest(OpenSSL::ASN1::ObjectId.new("SHA384")) check_digest(OpenSSL::ASN1::ObjectId.new("SHA384"))
check_digest(OpenSSL::ASN1::ObjectId.new("SHA512")) check_digest(OpenSSL::ASN1::ObjectId.new("SHA512"))
end end
end
def test_openssl_digest def test_openssl_digest
assert_equal OpenSSL::Digest::MD5, OpenSSL::Digest("MD5") assert_equal OpenSSL::Digest::MD5, OpenSSL::Digest("MD5")
@ -121,14 +116,6 @@ class OpenSSL::TestDigest < OpenSSL::TestCase
d = OpenSSL::Digest.new(oid.oid) d = OpenSSL::Digest.new(oid.oid)
assert_not_nil(d) assert_not_nil(d)
end end
def libressl?
OpenSSL::OPENSSL_VERSION.include?('LibreSSL')
end
def version_since(verary)
(OpenSSL::OPENSSL_LIBRARY_VERSION.scan(/\d+/).map(&:to_i) <=> verary) != -1
end
end end
end end

28
test/openssl/test_engine.rb
View file

@ -1,8 +1,9 @@
# frozen_string_literal: false # frozen_string_literal: false
require_relative 'utils' require_relative 'utils'
class OpenSSL::TestEngine < OpenSSL::TestCase if defined?(OpenSSL::TestUtils) && defined?(OpenSSL::Engine)
class OpenSSL::TestEngine < OpenSSL::TestCase
def test_engines_free # [ruby-dev:44173] def test_engines_free # [ruby-dev:44173]
with_openssl <<-'end;' with_openssl <<-'end;'
OpenSSL::Engine.load("openssl") OpenSSL::Engine.load("openssl")
@ -51,32 +52,28 @@ class OpenSSL::TestEngine < OpenSSL::TestCase
end end
def test_openssl_engine_cipher_rc4 def test_openssl_engine_cipher_rc4
with_openssl <<-'end;'
begin begin
OpenSSL::Cipher.new("rc4")
rescue OpenSSL::Cipher::CipherError
pend "RC4 is not supported"
end
with_openssl(<<-'end;', ignore_stderr: true)
engine = get_engine engine = get_engine
algo = "RC4" #AES is not supported by openssl Engine (<=1.0.0e) algo = "RC4"
data = "a" * 1000 data = "a" * 1000
key = OpenSSL::Random.random_bytes(16) key = OpenSSL::Random.random_bytes(16)
# suppress message from openssl Engine's RC4 cipher [ruby-core:41026]
err_back = $stderr.dup
$stderr.reopen(IO::NULL)
encrypted = crypt_data(data, key, :encrypt) { engine.cipher(algo) } encrypted = crypt_data(data, key, :encrypt) { engine.cipher(algo) }
decrypted = crypt_data(encrypted, key, :decrypt) { OpenSSL::Cipher.new(algo) } decrypted = crypt_data(encrypted, key, :decrypt) { OpenSSL::Cipher.new(algo) }
assert_equal(data, decrypted) assert_equal(data, decrypted)
ensure
if err_back
$stderr.reopen(err_back)
err_back.close
end
end
end; end;
end end
private private
# this is required because OpenSSL::Engine methods change global state # this is required because OpenSSL::Engine methods change global state
def with_openssl(code) def with_openssl(code, **opts)
assert_separately([{ "OSSL_MDEBUG" => nil }, "-ropenssl"], <<~"end;") assert_separately([{ "OSSL_MDEBUG" => nil }, "-ropenssl"], <<~"end;", **opts)
require #{__FILE__.dump} require #{__FILE__.dump}
include OpenSSL::TestEngine::Utils include OpenSSL::TestEngine::Utils
#{code} #{code}
@ -95,5 +92,6 @@ class OpenSSL::TestEngine < OpenSSL::TestCase
cipher.update(data) + cipher.final cipher.update(data) + cipher.final
end end
end end
end
end if defined?(OpenSSL::TestUtils) && defined?(OpenSSL::Engine) end

6
test/openssl/test_hmac.rb
View file

@ -1,6 +1,8 @@
# frozen_string_literal: false # frozen_string_literal: false
require_relative 'utils' require_relative 'utils'
if defined?(OpenSSL::TestUtils)
class OpenSSL::TestHMAC < OpenSSL::TestCase class OpenSSL::TestHMAC < OpenSSL::TestCase
def test_hmac def test_hmac
# RFC 2202 2. Test Cases for HMAC-MD5 # RFC 2202 2. Test Cases for HMAC-MD5
@ -37,4 +39,6 @@ class OpenSSL::TestHMAC < OpenSSL::TestCase
second = h1.update("test").hexdigest second = h1.update("test").hexdigest
assert_equal first, second assert_equal first, second
end end
end if defined?(OpenSSL::TestUtils) end
end

4
test/openssl/test_ns_spki.rb
View file

@ -17,8 +17,8 @@ class OpenSSL::TestNSSPI < OpenSSL::TestCase
end end
def test_build_data def test_build_data
key1 = OpenSSL::TestUtils::TEST_KEY_RSA1024 key1 = Fixtures.pkey("rsa1024")
key2 = OpenSSL::TestUtils::TEST_KEY_RSA2048 key2 = Fixtures.pkey("rsa2048")
spki = OpenSSL::Netscape::SPKI.new spki = OpenSSL::Netscape::SPKI.new
spki.challenge = "RandomString" spki.challenge = "RandomString"
spki.public_key = key1.public_key spki.public_key = key1.public_key

10
test/openssl/test_ocsp.rb
View file

@ -13,7 +13,7 @@ class OpenSSL::TestOCSP < OpenSSL::TestCase
# @cert2 @ocsp_cert # @cert2 @ocsp_cert
ca_subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCA") ca_subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCA")
@ca_key = OpenSSL::TestUtils::TEST_KEY_RSA1024 @ca_key = Fixtures.pkey("rsa1024")
ca_exts = [ ca_exts = [
["basicConstraints", "CA:TRUE", true], ["basicConstraints", "CA:TRUE", true],
["keyUsage", "cRLSign,keyCertSign", true], ["keyUsage", "cRLSign,keyCertSign", true],
@ -22,7 +22,7 @@ class OpenSSL::TestOCSP < OpenSSL::TestCase
ca_subj, @ca_key, 1, ca_exts, nil, nil) ca_subj, @ca_key, 1, ca_exts, nil, nil)
cert_subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCA2") cert_subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCA2")
@cert_key = OpenSSL::TestUtils::TEST_KEY_RSA1024 @cert_key = Fixtures.pkey("rsa1024")
cert_exts = [ cert_exts = [
["basicConstraints", "CA:TRUE", true], ["basicConstraints", "CA:TRUE", true],
["keyUsage", "cRLSign,keyCertSign", true], ["keyUsage", "cRLSign,keyCertSign", true],
@ -31,14 +31,14 @@ class OpenSSL::TestOCSP < OpenSSL::TestCase
cert_subj, @cert_key, 5, cert_exts, @ca_cert, @ca_key) cert_subj, @cert_key, 5, cert_exts, @ca_cert, @ca_key)
cert2_subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCert") cert2_subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCert")
@cert2_key = OpenSSL::TestUtils::TEST_KEY_RSA1024 @cert2_key = Fixtures.pkey("rsa1024")
cert2_exts = [ cert2_exts = [
] ]
@cert2 = OpenSSL::TestUtils.issue_cert( @cert2 = OpenSSL::TestUtils.issue_cert(
cert2_subj, @cert2_key, 10, cert2_exts, @cert, @cert_key) cert2_subj, @cert2_key, 10, cert2_exts, @cert, @cert_key)
ocsp_subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCAOCSP") ocsp_subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCAOCSP")
@ocsp_key = OpenSSL::TestUtils::TEST_KEY_RSA2048 @ocsp_key = Fixtures.pkey("rsa2048")
ocsp_exts = [ ocsp_exts = [
["extendedKeyUsage", "OCSPSigning", true], ["extendedKeyUsage", "OCSPSigning", true],
] ]
@ -122,7 +122,7 @@ class OpenSSL::TestOCSP < OpenSSL::TestCase
assert_equal true, req.verify([@cert], store, OpenSSL::OCSP::NOINTERN) assert_equal true, req.verify([@cert], store, OpenSSL::OCSP::NOINTERN)
ret = req.verify([@cert], store) ret = req.verify([@cert], store)
if ret || OpenSSL::OPENSSL_VERSION =~ /OpenSSL/ && OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10002000 if ret || openssl?(1, 0, 2) || libressl?(2, 4, 2)
assert_equal true, ret assert_equal true, ret
else else
# RT2560; OCSP_request_verify() does not find signer cert from 'certs' when # RT2560; OCSP_request_verify() does not find signer cert from 'certs' when

198
test/openssl/test_pair.rb
View file

@ -1,61 +1,46 @@
# frozen_string_literal: false # frozen_string_literal: false
require_relative 'utils' require_relative 'utils'
require_relative 'ut_eof'
if defined?(OpenSSL::TestUtils) if defined?(OpenSSL::TestUtils)
require 'socket'
require_relative 'ut_eof'
module OpenSSL::SSLPairM module OpenSSL::SSLPairM
def server def setup
host = "127.0.0.1" svr_dn = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=localhost")
port = 0 ee_exts = [
ctx = OpenSSL::SSL::SSLContext.new() ["keyUsage", "keyEncipherment,digitalSignature", true],
ctx.ciphers = "ADH" ]
ctx.security_level = 0 @svr_key = OpenSSL::TestUtils::Fixtures.pkey("rsa1024")
ctx.tmp_dh_callback = proc { OpenSSL::TestUtils::TEST_KEY_DH1024 } @svr_cert = issue_cert(svr_dn, @svr_key, 1, ee_exts, nil, nil)
tcps = create_tcp_server(host, port)
ssls = OpenSSL::SSL::SSLServer.new(tcps, ctx)
return ssls
end
def client(port)
host = "127.0.0.1"
ctx = OpenSSL::SSL::SSLContext.new()
ctx.ciphers = "ADH"
ctx.security_level = 0
s = create_tcp_client(host, port)
ssl = OpenSSL::SSL::SSLSocket.new(s, ctx)
ssl.connect
ssl.sync_close = true
ssl
end end
def ssl_pair def ssl_pair
ssls = server host = "127.0.0.1"
tcps = create_tcp_server(host, 0)
port = tcps.connect_address.ip_port
th = Thread.new { th = Thread.new {
sctx = OpenSSL::SSL::SSLContext.new
sctx.cert = @svr_cert
sctx.key = @svr_key
sctx.tmp_dh_callback = proc { OpenSSL::TestUtils::Fixtures.pkey_dh("dh1024") }
sctx.options |= OpenSSL::SSL::OP_NO_COMPRESSION
ssls = OpenSSL::SSL::SSLServer.new(tcps, sctx)
ns = ssls.accept ns = ssls.accept
ssls.close ssls.close
ns ns
} }
port = ssls.to_io.local_address.ip_port
c = client(port) tcpc = create_tcp_client(host, port)
c = OpenSSL::SSL::SSLSocket.new(tcpc)
c.connect
s = th.value s = th.value
if block_given?
begin
yield c, s yield c, s
ensure ensure
c.close unless c.closed? tcpc&.close
s.close unless s.closed? tcps&.close
end s&.close
else
return c, s
end
ensure
if th&.alive?
th.kill
th.join
end
end end
end end
@ -85,23 +70,27 @@ end
module OpenSSL::TestEOF1M module OpenSSL::TestEOF1M
def open_file(content) def open_file(content)
s1, s2 = ssl_pair ssl_pair { |s1, s2|
begin
th = Thread.new { s2 << content; s2.close } th = Thread.new { s2 << content; s2.close }
yield s1 yield s1
ensure ensure
th.join if th th&.join
s1.close end
}
end end
end end
module OpenSSL::TestEOF2M module OpenSSL::TestEOF2M
def open_file(content) def open_file(content)
s1, s2 = ssl_pair ssl_pair { |s1, s2|
begin
th = Thread.new { s1 << content; s1.close } th = Thread.new { s1 << content; s1.close }
yield s2 yield s2
ensure ensure
th.join if th th&.join
s2.close end
}
end end
end end
@ -189,6 +178,27 @@ module OpenSSL::TestPairM
} }
end end
def test_multibyte_read_write
# German a umlaut
auml = [%w{ C3 A4 }.join('')].pack('H*')
auml.force_encoding(Encoding::UTF_8)
bsize = auml.bytesize
ssl_pair { |s1, s2|
assert_equal bsize, s1.write(auml)
read = s2.read(bsize)
assert_equal Encoding::ASCII_8BIT, read.encoding
assert_equal bsize, read.bytesize
assert_equal auml, read.force_encoding(Encoding::UTF_8)
s1.puts(auml)
read = s2.gets
assert_equal Encoding::ASCII_8BIT, read.encoding
assert_equal bsize + 1, read.bytesize
assert_equal auml + "\n", read.force_encoding(Encoding::UTF_8)
}
end
def test_read_nonblock def test_read_nonblock
ssl_pair {|s1, s2| ssl_pair {|s1, s2|
err = nil err = nil
@ -208,7 +218,7 @@ module OpenSSL::TestPairM
assert_nothing_raised("[ruby-core:20298]") { ret = s2.read_nonblock(10) } assert_nothing_raised("[ruby-core:20298]") { ret = s2.read_nonblock(10) }
assert_equal("def\n", ret) assert_equal("def\n", ret)
s1.close s1.close
sleep 0.1 IO.select([s2])
assert_raise(EOFError) { s2.read_nonblock(10) } assert_raise(EOFError) { s2.read_nonblock(10) }
} }
end end
@ -224,49 +234,71 @@ module OpenSSL::TestPairM
assert_nothing_raised("[ruby-core:20298]") { ret = s2.read_nonblock(10, exception: false) } assert_nothing_raised("[ruby-core:20298]") { ret = s2.read_nonblock(10, exception: false) }
assert_equal("def\n", ret) assert_equal("def\n", ret)
s1.close s1.close
sleep 0.1 IO.select([s2])
assert_equal(nil, s2.read_nonblock(10, exception: false)) assert_equal(nil, s2.read_nonblock(10, exception: false))
} }
end end
def write_nonblock(socket, meth, str) def test_read_with_outbuf
ret = socket.send(meth, str) ssl_pair { |s1, s2|
ret.is_a?(Symbol) ? 0 : ret s1.write("abc\n")
end buf = ""
ret = s2.read(2, buf)
assert_same ret, buf
assert_equal "ab", ret
def write_nonblock_no_ex(socket, str) buf = "garbage"
ret = socket.write_nonblock str, exception: false ret = s2.read(2, buf)
ret.is_a?(Symbol) ? 0 : ret assert_same ret, buf
assert_equal "c\n", ret
buf = "garbage"
assert_equal :wait_readable, s2.read_nonblock(100, buf, exception: false)
assert_equal "", buf
s1.close
buf = "garbage"
assert_equal nil, s2.read(100, buf)
assert_equal "", buf
}
end end
def test_write_nonblock def test_write_nonblock
ssl_pair {|s1, s2| ssl_pair {|s1, s2|
n = 0 assert_equal 3, s1.write_nonblock("foo")
assert_equal "foo", s2.read(3)
data = "x" * 16384
written = 0
while true
begin begin
n += write_nonblock s1, :write_nonblock, "a" * 100000 written += s1.write_nonblock(data)
n += write_nonblock s1, :write_nonblock, "b" * 100000 rescue IO::WaitWritable, IO::WaitReadable
n += write_nonblock s1, :write_nonblock, "c" * 100000 break
n += write_nonblock s1, :write_nonblock, "d" * 100000
n += write_nonblock s1, :write_nonblock, "e" * 100000
n += write_nonblock s1, :write_nonblock, "f" * 100000
rescue IO::WaitWritable
end end
s1.close end
assert_equal(n, s2.read.length) assert written > 0
assert_equal written, s2.read(written).bytesize
} }
end end
def test_write_nonblock_no_exceptions def test_write_nonblock_no_exceptions
ssl_pair {|s1, s2| ssl_pair {|s1, s2|
n = 0 assert_equal 3, s1.write_nonblock("foo", exception: false)
n += write_nonblock_no_ex s1, "a" * 100000 assert_equal "foo", s2.read(3)
n += write_nonblock_no_ex s1, "b" * 100000
n += write_nonblock_no_ex s1, "c" * 100000 data = "x" * 16384
n += write_nonblock_no_ex s1, "d" * 100000 written = 0
n += write_nonblock_no_ex s1, "e" * 100000 while true
n += write_nonblock_no_ex s1, "f" * 100000 case ret = s1.write_nonblock(data, exception: false)
s1.close when :wait_readable, :wait_writable
assert_equal(n, s2.read.length) break
else
written += ret
end
end
assert written > 0
assert_equal written, s2.read(written).bytesize
} }
end end
@ -354,9 +386,9 @@ module OpenSSL::TestPairM
def test_connect_accept_nonblock_no_exception def test_connect_accept_nonblock_no_exception
ctx2 = OpenSSL::SSL::SSLContext.new ctx2 = OpenSSL::SSL::SSLContext.new
ctx2.ciphers = "ADH" ctx2.cert = @svr_cert
ctx2.security_level = 0 ctx2.key = @svr_key
ctx2.tmp_dh_callback = proc { OpenSSL::TestUtils::TEST_KEY_DH1024 } ctx2.tmp_dh_callback = proc { OpenSSL::TestUtils::Fixtures.pkey_dh("dh1024") }
sock1, sock2 = tcp_pair sock1, sock2 = tcp_pair
@ -365,8 +397,6 @@ module OpenSSL::TestPairM
assert_equal :wait_readable, accepted assert_equal :wait_readable, accepted
ctx1 = OpenSSL::SSL::SSLContext.new ctx1 = OpenSSL::SSL::SSLContext.new
ctx1.ciphers = "ADH"
ctx1.security_level = 0
s1 = OpenSSL::SSL::SSLSocket.new(sock1, ctx1) s1 = OpenSSL::SSL::SSLSocket.new(sock1, ctx1)
th = Thread.new do th = Thread.new do
rets = [] rets = []
@ -404,9 +434,9 @@ module OpenSSL::TestPairM
def test_connect_accept_nonblock def test_connect_accept_nonblock
ctx = OpenSSL::SSL::SSLContext.new() ctx = OpenSSL::SSL::SSLContext.new()
ctx.ciphers = "ADH" ctx.cert = @svr_cert
ctx.security_level = 0 ctx.key = @svr_key
ctx.tmp_dh_callback = proc { OpenSSL::TestUtils::TEST_KEY_DH1024 } ctx.tmp_dh_callback = proc { OpenSSL::TestUtils::Fixtures.pkey_dh("dh1024") }
sock1, sock2 = tcp_pair sock1, sock2 = tcp_pair
@ -428,8 +458,6 @@ module OpenSSL::TestPairM
sleep 0.1 sleep 0.1
ctx = OpenSSL::SSL::SSLContext.new() ctx = OpenSSL::SSL::SSLContext.new()
ctx.ciphers = "ADH"
ctx.security_level = 0
s1 = OpenSSL::SSL::SSLSocket.new(sock1, ctx) s1 = OpenSSL::SSL::SSLSocket.new(sock1, ctx)
begin begin
sleep 0.2 sleep 0.2

43
test/openssl/test_pkcs12.rb
View file

@ -5,8 +5,6 @@ if defined?(OpenSSL::TestUtils)
module OpenSSL module OpenSSL
class TestPKCS12 < OpenSSL::TestCase class TestPKCS12 < OpenSSL::TestCase
include OpenSSL::TestUtils
def setup def setup
super super
ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA") ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
@ -16,7 +14,7 @@ module OpenSSL
["subjectKeyIdentifier","hash",false], ["subjectKeyIdentifier","hash",false],
["authorityKeyIdentifier","keyid:always",false], ["authorityKeyIdentifier","keyid:always",false],
] ]
@cacert = issue_cert(ca, TEST_KEY_RSA2048, 1, ca_exts, nil, nil) @cacert = issue_cert(ca, Fixtures.pkey("rsa2048"), 1, ca_exts, nil, nil)
inter_ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=Intermediate CA") inter_ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=Intermediate CA")
inter_ca_key = OpenSSL::PKey.read <<-_EOS_ inter_ca_key = OpenSSL::PKey.read <<-_EOS_
@ -36,25 +34,26 @@ FJx7d3f29gkzynCLJDkCQGQZlEZJC4vWmWJGRKJ24P6MyQn3VsPfErSKOg4lvyM3
Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es= Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es=
-----END RSA PRIVATE KEY----- -----END RSA PRIVATE KEY-----
_EOS_ _EOS_
@inter_cacert = issue_cert(inter_ca, inter_ca_key, 2, ca_exts, @cacert, TEST_KEY_RSA2048) @inter_cacert = issue_cert(inter_ca, inter_ca_key, 2, ca_exts, @cacert, Fixtures.pkey("rsa2048"))
exts = [ exts = [
["keyUsage","digitalSignature",true], ["keyUsage","digitalSignature",true],
["subjectKeyIdentifier","hash",false], ["subjectKeyIdentifier","hash",false],
] ]
ee = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=Ruby PKCS12 Test Certificate") ee = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=Ruby PKCS12 Test Certificate")
@mycert = issue_cert(ee, TEST_KEY_RSA1024, 3, exts, @inter_cacert, inter_ca_key) @mykey = Fixtures.pkey("rsa1024")
@mycert = issue_cert(ee, @mykey, 3, exts, @inter_cacert, inter_ca_key)
end end
def test_create def test_create
pkcs12 = OpenSSL::PKCS12.create( pkcs12 = OpenSSL::PKCS12.create(
"omg", "omg",
"hello", "hello",
TEST_KEY_RSA1024, @mykey,
@mycert @mycert
) )
assert_equal @mycert, pkcs12.certificate assert_equal @mycert.to_der, pkcs12.certificate.to_der
assert_equal TEST_KEY_RSA1024, pkcs12.key assert_equal @mykey.to_der, pkcs12.key.to_der
assert_nil pkcs12.ca_certs assert_nil pkcs12.ca_certs
end end
@ -62,11 +61,11 @@ Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es=
pkcs12 = OpenSSL::PKCS12.create( pkcs12 = OpenSSL::PKCS12.create(
nil, nil,
"hello", "hello",
TEST_KEY_RSA1024, @mykey,
@mycert @mycert
) )
assert_equal @mycert, pkcs12.certificate assert_equal @mycert.to_der, pkcs12.certificate.to_der
assert_equal TEST_KEY_RSA1024, pkcs12.key assert_equal @mykey.to_der, pkcs12.key.to_der
assert_nil pkcs12.ca_certs assert_nil pkcs12.ca_certs
decoded = OpenSSL::PKCS12.new(pkcs12.to_der) decoded = OpenSSL::PKCS12.new(pkcs12.to_der)
@ -79,7 +78,7 @@ Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es=
pkcs12 = OpenSSL::PKCS12.create( pkcs12 = OpenSSL::PKCS12.create(
"omg", "omg",
"hello", "hello",
TEST_KEY_RSA1024, @mykey,
@mycert, @mycert,
chain chain
) )
@ -94,7 +93,7 @@ Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es=
pkcs12 = OpenSSL::PKCS12.create( pkcs12 = OpenSSL::PKCS12.create(
passwd, passwd,
"hello", "hello",
TEST_KEY_RSA1024, @mykey,
@mycert, @mycert,
chain chain
) )
@ -104,7 +103,7 @@ Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es=
assert_include_cert @cacert, decoded.ca_certs assert_include_cert @cacert, decoded.ca_certs
assert_include_cert @inter_cacert, decoded.ca_certs assert_include_cert @inter_cacert, decoded.ca_certs
assert_cert @mycert, decoded.certificate assert_cert @mycert, decoded.certificate
assert_equal TEST_KEY_RSA1024.to_der, decoded.key.to_der assert_equal @mykey.to_der, decoded.key.to_der
end end
def test_create_with_bad_nid def test_create_with_bad_nid
@ -112,7 +111,7 @@ Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es=
OpenSSL::PKCS12.create( OpenSSL::PKCS12.create(
"omg", "omg",
"hello", "hello",
TEST_KEY_RSA1024, @mykey,
@mycert, @mycert,
[], [],
"foo" "foo"
@ -124,7 +123,7 @@ Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es=
OpenSSL::PKCS12.create( OpenSSL::PKCS12.create(
"omg", "omg",
"hello", "hello",
TEST_KEY_RSA1024, @mykey,
@mycert, @mycert,
[], [],
nil, nil,
@ -136,7 +135,7 @@ Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es=
OpenSSL::PKCS12.create( OpenSSL::PKCS12.create(
"omg", "omg",
"hello", "hello",
TEST_KEY_RSA1024, @mykey,
@mycert, @mycert,
[], [],
nil, nil,
@ -150,7 +149,7 @@ Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es=
OpenSSL::PKCS12.create( OpenSSL::PKCS12.create(
"omg", "omg",
"hello", "hello",
TEST_KEY_RSA1024, @mykey,
@mycert, @mycert,
[], [],
nil, nil,
@ -163,7 +162,7 @@ Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es=
OpenSSL::PKCS12.create( OpenSSL::PKCS12.create(
"omg", "omg",
"hello", "hello",
TEST_KEY_RSA1024, @mykey,
@mycert, @mycert,
[], [],
nil, nil,
@ -216,7 +215,7 @@ vyl2WuMdEwQIMWFFphPkIUICAggA
EOF EOF
p12 = OpenSSL::PKCS12.new(str, "abc123") p12 = OpenSSL::PKCS12.new(str, "abc123")
assert_equal TEST_KEY_RSA1024.to_der, p12.key.to_der assert_equal @mykey.to_der, p12.key.to_der
assert_equal @mycert.subject.to_der, p12.certificate.subject.to_der assert_equal @mycert.subject.to_der, p12.certificate.subject.to_der
assert_equal [], Array(p12.ca_certs) assert_equal [], Array(p12.ca_certs)
end end
@ -275,13 +274,13 @@ Kw4DAhoFAAQUYAuwVtGD1TdgbFK4Yal2XBgwUR4ECEawsN3rNaa6AgIIAA==
EOF EOF
p12 = OpenSSL::PKCS12.new(str, "abc123") p12 = OpenSSL::PKCS12.new(str, "abc123")
assert_equal TEST_KEY_RSA1024.to_der, p12.key.to_der assert_equal @mykey.to_der, p12.key.to_der
assert_equal nil, p12.certificate assert_equal nil, p12.certificate
assert_equal [], Array(p12.ca_certs) assert_equal [], Array(p12.ca_certs)
end end
def test_dup def test_dup
p12 = OpenSSL::PKCS12.create("pass", "name", TEST_KEY_RSA1024, @mycert) p12 = OpenSSL::PKCS12.create("pass", "name", @mykey, @mycert)
assert_equal p12.to_der, p12.dup.to_der assert_equal p12.to_der, p12.dup.to_der
end end

6
test/openssl/test_pkcs5.rb
View file

@ -1,8 +1,9 @@
# frozen_string_literal: false # frozen_string_literal: false
require_relative 'utils' require_relative 'utils'
class OpenSSL::TestPKCS5 < OpenSSL::TestCase if defined?(OpenSSL::TestUtils)
class OpenSSL::TestPKCS5 < OpenSSL::TestCase
def test_pbkdf2_hmac_sha1_rfc6070_c_1_len_20 def test_pbkdf2_hmac_sha1_rfc6070_c_1_len_20
p ="password" p ="password"
s = "salt" s = "salt"
@ -94,5 +95,6 @@ class OpenSSL::TestPKCS5 < OpenSSL::TestCase
value2 = OpenSSL::PKCS5.pbkdf2_hmac(p, s, c, dk_len, digest) value2 = OpenSSL::PKCS5.pbkdf2_hmac(p, s, c, dk_len, digest)
assert_equal(value1, value2) assert_equal(value1, value2)
end if OpenSSL::PKCS5.respond_to?(:pbkdf2_hmac) end if OpenSSL::PKCS5.respond_to?(:pbkdf2_hmac)
end
end if defined?(OpenSSL::TestUtils) end

8
test/openssl/test_pkcs7.rb
View file

@ -6,8 +6,8 @@ if defined?(OpenSSL::TestUtils)
class OpenSSL::TestPKCS7 < OpenSSL::TestCase class OpenSSL::TestPKCS7 < OpenSSL::TestCase
def setup def setup
super super
@rsa1024 = OpenSSL::TestUtils::TEST_KEY_RSA1024 @rsa1024 = Fixtures.pkey("rsa1024")
@rsa2048 = OpenSSL::TestUtils::TEST_KEY_RSA2048 @rsa2048 = Fixtures.pkey("rsa2048")
ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA") ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
ee1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE1") ee1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE1")
ee2 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE2") ee2 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE2")
@ -28,10 +28,6 @@ class OpenSSL::TestPKCS7 < OpenSSL::TestCase
@ee2_cert = issue_cert(ee2, @rsa1024, 3, ee_exts, @ca_cert, @rsa2048) @ee2_cert = issue_cert(ee2, @rsa1024, 3, ee_exts, @ca_cert, @rsa2048)
end end
def issue_cert(*args)
OpenSSL::TestUtils.issue_cert(*args)
end
def test_signed def test_signed
store = OpenSSL::X509::Store.new store = OpenSSL::X509::Store.new
store.add_cert(@ca_cert) store.add_cert(@ca_cert)

21
test/openssl/test_pkey_dh.rb
View file

@ -4,8 +4,6 @@ require_relative 'utils'
if defined?(OpenSSL::TestUtils) if defined?(OpenSSL::TestUtils)
class OpenSSL::TestPKeyDH < OpenSSL::PKeyTestCase class OpenSSL::TestPKeyDH < OpenSSL::PKeyTestCase
DH1024 = OpenSSL::TestUtils::TEST_KEY_DH1024
NEW_KEYLEN = 256 NEW_KEYLEN = 256
def test_DEFAULT_parameters def test_DEFAULT_parameters
@ -37,12 +35,13 @@ class OpenSSL::TestPKeyDH < OpenSSL::PKeyTestCase
end end
def test_DHparams def test_DHparams
dh1024 = Fixtures.pkey_dh("dh1024")
asn1 = OpenSSL::ASN1::Sequence([ asn1 = OpenSSL::ASN1::Sequence([
OpenSSL::ASN1::Integer(DH1024.p), OpenSSL::ASN1::Integer(dh1024.p),
OpenSSL::ASN1::Integer(DH1024.g) OpenSSL::ASN1::Integer(dh1024.g)
]) ])
key = OpenSSL::PKey::DH.new(asn1.to_der) key = OpenSSL::PKey::DH.new(asn1.to_der)
assert_same_dh dup_public(DH1024), key assert_same_dh dup_public(dh1024), key
pem = <<~EOF pem = <<~EOF
-----BEGIN DH PARAMETERS----- -----BEGIN DH PARAMETERS-----
@ -52,14 +51,14 @@ class OpenSSL::TestPKeyDH < OpenSSL::PKeyTestCase
-----END DH PARAMETERS----- -----END DH PARAMETERS-----
EOF EOF
key = OpenSSL::PKey::DH.new(pem) key = OpenSSL::PKey::DH.new(pem)
assert_same_dh dup_public(DH1024), key assert_same_dh dup_public(dh1024), key
assert_equal asn1.to_der, DH1024.to_der assert_equal asn1.to_der, dh1024.to_der
assert_equal pem, DH1024.export assert_equal pem, dh1024.export
end end
def test_public_key def test_public_key
dh = OpenSSL::TestUtils::TEST_KEY_DH1024 dh = Fixtures.pkey_dh("dh1024")
public_key = dh.public_key public_key = dh.public_key
assert_no_key(public_key) #implies public_key.public? is false! assert_no_key(public_key) #implies public_key.public? is false!
assert_equal(dh.to_der, public_key.to_der) assert_equal(dh.to_der, public_key.to_der)
@ -67,14 +66,14 @@ class OpenSSL::TestPKeyDH < OpenSSL::PKeyTestCase
end end
def test_generate_key def test_generate_key
dh = OpenSSL::TestUtils::TEST_KEY_DH1024.public_key # creates a copy dh = Fixtures.pkey_dh("dh1024").public_key # creates a copy
assert_no_key(dh) assert_no_key(dh)
dh.generate_key! dh.generate_key!
assert_key(dh) assert_key(dh)
end end
def test_key_exchange def test_key_exchange
dh = OpenSSL::TestUtils::TEST_KEY_DH1024 dh = Fixtures.pkey_dh("dh1024")
dh2 = dh.public_key dh2 = dh.public_key
dh.generate_key! dh.generate_key!
dh2.generate_key! dh2.generate_key!

65
test/openssl/test_pkey_dsa.rb
View file

@ -1,12 +1,9 @@
# frozen_string_literal: false # frozen_string_literal: false
require_relative 'utils' require_relative 'utils'
require 'base64'
if defined?(OpenSSL::TestUtils) if defined?(OpenSSL::TestUtils)
class OpenSSL::TestPKeyDSA < OpenSSL::PKeyTestCase class OpenSSL::TestPKeyDSA < OpenSSL::PKeyTestCase
DSA512 = OpenSSL::TestUtils::TEST_KEY_DSA512
def test_private def test_private
key = OpenSSL::PKey::DSA.new(256) key = OpenSSL::PKey::DSA.new(256)
assert(key.private?) assert(key.private?)
@ -37,27 +34,28 @@ class OpenSSL::TestPKeyDSA < OpenSSL::PKeyTestCase
end end
def test_sign_verify def test_sign_verify
dsa512 = Fixtures.pkey("dsa512")
data = "Sign me!" data = "Sign me!"
if defined?(OpenSSL::Digest::DSS1) if defined?(OpenSSL::Digest::DSS1)
signature = DSA512.sign(OpenSSL::Digest::DSS1.new, data) signature = dsa512.sign(OpenSSL::Digest::DSS1.new, data)
assert_equal true, DSA512.verify(OpenSSL::Digest::DSS1.new, signature, data) assert_equal true, dsa512.verify(OpenSSL::Digest::DSS1.new, signature, data)
end end
return if OpenSSL::OPENSSL_VERSION_NUMBER <= 0x010000000 return unless openssl?(1, 0, 0)
signature = DSA512.sign("SHA1", data) signature = dsa512.sign("SHA1", data)
assert_equal true, DSA512.verify("SHA1", signature, data) assert_equal true, dsa512.verify("SHA1", signature, data)
signature0 = (<<~'end;').unpack("m")[0] signature0 = (<<~'end;').unpack("m")[0]
MCwCFH5h40plgU5Fh0Z4wvEEpz0eE9SnAhRPbkRB8ggsN/vsSEYMXvJwjGg/ MCwCFH5h40plgU5Fh0Z4wvEEpz0eE9SnAhRPbkRB8ggsN/vsSEYMXvJwjGg/
6g== 6g==
end; end;
assert_equal true, DSA512.verify("SHA256", signature0, data) assert_equal true, dsa512.verify("SHA256", signature0, data)
signature1 = signature0.succ signature1 = signature0.succ
assert_equal false, DSA512.verify("SHA256", signature1, data) assert_equal false, dsa512.verify("SHA256", signature1, data)
end end
def test_sys_sign_verify def test_sys_sign_verify
key = OpenSSL::TestUtils::TEST_KEY_DSA256 key = Fixtures.pkey("dsa256")
data = 'Sign me!' data = 'Sign me!'
digest = OpenSSL::Digest::SHA1.digest(data) digest = OpenSSL::Digest::SHA1.digest(data)
sig = key.syssign(digest) sig = key.syssign(digest)
@ -66,17 +64,18 @@ class OpenSSL::TestPKeyDSA < OpenSSL::PKeyTestCase
def test_DSAPrivateKey def test_DSAPrivateKey
# OpenSSL DSAPrivateKey format; similar to RSAPrivateKey # OpenSSL DSAPrivateKey format; similar to RSAPrivateKey
dsa512 = Fixtures.pkey("dsa512")
asn1 = OpenSSL::ASN1::Sequence([ asn1 = OpenSSL::ASN1::Sequence([
OpenSSL::ASN1::Integer(0), OpenSSL::ASN1::Integer(0),
OpenSSL::ASN1::Integer(DSA512.p), OpenSSL::ASN1::Integer(dsa512.p),
OpenSSL::ASN1::Integer(DSA512.q), OpenSSL::ASN1::Integer(dsa512.q),
OpenSSL::ASN1::Integer(DSA512.g), OpenSSL::ASN1::Integer(dsa512.g),
OpenSSL::ASN1::Integer(DSA512.pub_key), OpenSSL::ASN1::Integer(dsa512.pub_key),
OpenSSL::ASN1::Integer(DSA512.priv_key) OpenSSL::ASN1::Integer(dsa512.priv_key)
]) ])
key = OpenSSL::PKey::DSA.new(asn1.to_der) key = OpenSSL::PKey::DSA.new(asn1.to_der)
assert_predicate key, :private? assert_predicate key, :private?
assert_same_dsa DSA512, key assert_same_dsa dsa512, key
pem = <<~EOF pem = <<~EOF
-----BEGIN DSA PRIVATE KEY----- -----BEGIN DSA PRIVATE KEY-----
@ -89,14 +88,15 @@ class OpenSSL::TestPKeyDSA < OpenSSL::PKeyTestCase
-----END DSA PRIVATE KEY----- -----END DSA PRIVATE KEY-----
EOF EOF
key = OpenSSL::PKey::DSA.new(pem) key = OpenSSL::PKey::DSA.new(pem)
assert_same_dsa DSA512, key assert_same_dsa dsa512, key
assert_equal asn1.to_der, DSA512.to_der assert_equal asn1.to_der, dsa512.to_der
assert_equal pem, DSA512.export assert_equal pem, dsa512.export
end end
def test_DSAPrivateKey_encrypted def test_DSAPrivateKey_encrypted
# key = abcdef # key = abcdef
dsa512 = Fixtures.pkey("dsa512")
pem = <<~EOF pem = <<~EOF
-----BEGIN DSA PRIVATE KEY----- -----BEGIN DSA PRIVATE KEY-----
Proc-Type: 4,ENCRYPTED Proc-Type: 4,ENCRYPTED
@ -111,35 +111,36 @@ class OpenSSL::TestPKeyDSA < OpenSSL::PKeyTestCase
-----END DSA PRIVATE KEY----- -----END DSA PRIVATE KEY-----
EOF EOF
key = OpenSSL::PKey::DSA.new(pem, "abcdef") key = OpenSSL::PKey::DSA.new(pem, "abcdef")
assert_same_dsa DSA512, key assert_same_dsa dsa512, key
key = OpenSSL::PKey::DSA.new(pem) { "abcdef" } key = OpenSSL::PKey::DSA.new(pem) { "abcdef" }
assert_same_dsa DSA512, key assert_same_dsa dsa512, key
cipher = OpenSSL::Cipher.new("aes-128-cbc") cipher = OpenSSL::Cipher.new("aes-128-cbc")
exported = DSA512.to_pem(cipher, "abcdef\0\1") exported = dsa512.to_pem(cipher, "abcdef\0\1")
assert_same_dsa DSA512, OpenSSL::PKey::DSA.new(exported, "abcdef\0\1") assert_same_dsa dsa512, OpenSSL::PKey::DSA.new(exported, "abcdef\0\1")
assert_raise(OpenSSL::PKey::DSAError) { assert_raise(OpenSSL::PKey::DSAError) {
OpenSSL::PKey::DSA.new(exported, "abcdef") OpenSSL::PKey::DSA.new(exported, "abcdef")
} }
end end
def test_PUBKEY def test_PUBKEY
dsa512 = Fixtures.pkey("dsa512")
asn1 = OpenSSL::ASN1::Sequence([ asn1 = OpenSSL::ASN1::Sequence([
OpenSSL::ASN1::Sequence([ OpenSSL::ASN1::Sequence([
OpenSSL::ASN1::ObjectId("DSA"), OpenSSL::ASN1::ObjectId("DSA"),
OpenSSL::ASN1::Sequence([ OpenSSL::ASN1::Sequence([
OpenSSL::ASN1::Integer(DSA512.p), OpenSSL::ASN1::Integer(dsa512.p),
OpenSSL::ASN1::Integer(DSA512.q), OpenSSL::ASN1::Integer(dsa512.q),
OpenSSL::ASN1::Integer(DSA512.g) OpenSSL::ASN1::Integer(dsa512.g)
]) ])
]), ]),
OpenSSL::ASN1::BitString( OpenSSL::ASN1::BitString(
OpenSSL::ASN1::Integer(DSA512.pub_key).to_der OpenSSL::ASN1::Integer(dsa512.pub_key).to_der
) )
]) ])
key = OpenSSL::PKey::DSA.new(asn1.to_der) key = OpenSSL::PKey::DSA.new(asn1.to_der)
assert_not_predicate key, :private? assert_not_predicate key, :private?
assert_same_dsa dup_public(DSA512), key assert_same_dsa dup_public(dsa512), key
pem = <<~EOF pem = <<~EOF
-----BEGIN PUBLIC KEY----- -----BEGIN PUBLIC KEY-----
@ -152,10 +153,10 @@ class OpenSSL::TestPKeyDSA < OpenSSL::PKeyTestCase
-----END PUBLIC KEY----- -----END PUBLIC KEY-----
EOF EOF
key = OpenSSL::PKey::DSA.new(pem) key = OpenSSL::PKey::DSA.new(pem)
assert_same_dsa dup_public(DSA512), key assert_same_dsa dup_public(dsa512), key
assert_equal asn1.to_der, dup_public(DSA512).to_der assert_equal asn1.to_der, dup_public(dsa512).to_der
assert_equal pem, dup_public(DSA512).export assert_equal pem, dup_public(dsa512).export
end end
def test_read_DSAPublicKey_pem def test_read_DSAPublicKey_pem

46
test/openssl/test_pkey_ec.rb
View file

@ -4,8 +4,6 @@ require_relative 'utils'
if defined?(OpenSSL::TestUtils) && defined?(OpenSSL::PKey::EC) if defined?(OpenSSL::TestUtils) && defined?(OpenSSL::PKey::EC)
class OpenSSL::TestEC < OpenSSL::PKeyTestCase class OpenSSL::TestEC < OpenSSL::PKeyTestCase
P256 = OpenSSL::TestUtils::TEST_KEY_EC_P256V1
def test_ec_key def test_ec_key
builtin_curves = OpenSSL::PKey::EC.builtin_curves builtin_curves = OpenSSL::PKey::EC.builtin_curves
assert_not_empty builtin_curves assert_not_empty builtin_curves
@ -74,17 +72,18 @@ class OpenSSL::TestEC < OpenSSL::PKeyTestCase
end end
def test_sign_verify def test_sign_verify
p256 = Fixtures.pkey("p256")
data = "Sign me!" data = "Sign me!"
signature = P256.sign("SHA1", data) signature = p256.sign("SHA1", data)
assert_equal true, P256.verify("SHA1", signature, data) assert_equal true, p256.verify("SHA1", signature, data)
signature0 = (<<~'end;').unpack("m")[0] signature0 = (<<~'end;').unpack("m")[0]
MEQCIEOTY/hD7eI8a0qlzxkIt8LLZ8uwiaSfVbjX2dPAvN11AiAQdCYx56Fq MEQCIEOTY/hD7eI8a0qlzxkIt8LLZ8uwiaSfVbjX2dPAvN11AiAQdCYx56Fq
QdBp1B4sxJoA8jvODMMklMyBKVmudboA6A== QdBp1B4sxJoA8jvODMMklMyBKVmudboA6A==
end; end;
assert_equal true, P256.verify("SHA256", signature0, data) assert_equal true, p256.verify("SHA256", signature0, data)
signature1 = signature0.succ signature1 = signature0.succ
assert_equal false, P256.verify("SHA256", signature1, data) assert_equal false, p256.verify("SHA256", signature1, data)
end end
def test_dsa_sign_verify def test_dsa_sign_verify
@ -124,21 +123,22 @@ class OpenSSL::TestEC < OpenSSL::PKeyTestCase
end end
def test_ECPrivateKey def test_ECPrivateKey
p256 = Fixtures.pkey("p256")
asn1 = OpenSSL::ASN1::Sequence([ asn1 = OpenSSL::ASN1::Sequence([
OpenSSL::ASN1::Integer(1), OpenSSL::ASN1::Integer(1),
OpenSSL::ASN1::OctetString(P256.private_key.to_s(2)), OpenSSL::ASN1::OctetString(p256.private_key.to_s(2)),
OpenSSL::ASN1::ASN1Data.new( OpenSSL::ASN1::ASN1Data.new(
[OpenSSL::ASN1::ObjectId("prime256v1")], [OpenSSL::ASN1::ObjectId("prime256v1")],
0, :CONTEXT_SPECIFIC 0, :CONTEXT_SPECIFIC
), ),
OpenSSL::ASN1::ASN1Data.new( OpenSSL::ASN1::ASN1Data.new(
[OpenSSL::ASN1::BitString(P256.public_key.to_bn.to_s(2))], [OpenSSL::ASN1::BitString(p256.public_key.to_bn.to_s(2))],
1, :CONTEXT_SPECIFIC 1, :CONTEXT_SPECIFIC
) )
]) ])
key = OpenSSL::PKey::EC.new(asn1.to_der) key = OpenSSL::PKey::EC.new(asn1.to_der)
assert_predicate key, :private? assert_predicate key, :private?
assert_same_ec P256, key assert_same_ec p256, key
pem = <<~EOF pem = <<~EOF
-----BEGIN EC PRIVATE KEY----- -----BEGIN EC PRIVATE KEY-----
@ -148,13 +148,14 @@ class OpenSSL::TestEC < OpenSSL::PKeyTestCase
-----END EC PRIVATE KEY----- -----END EC PRIVATE KEY-----
EOF EOF
key = OpenSSL::PKey::EC.new(pem) key = OpenSSL::PKey::EC.new(pem)
assert_same_ec P256, key assert_same_ec p256, key
assert_equal asn1.to_der, P256.to_der assert_equal asn1.to_der, p256.to_der
assert_equal pem, P256.export assert_equal pem, p256.export
end end
def test_ECPrivateKey_encrypted def test_ECPrivateKey_encrypted
p256 = Fixtures.pkey("p256")
# key = abcdef # key = abcdef
pem = <<~EOF pem = <<~EOF
-----BEGIN EC PRIVATE KEY----- -----BEGIN EC PRIVATE KEY-----
@ -167,31 +168,32 @@ class OpenSSL::TestEC < OpenSSL::PKeyTestCase
-----END EC PRIVATE KEY----- -----END EC PRIVATE KEY-----
EOF EOF
key = OpenSSL::PKey::EC.new(pem, "abcdef") key = OpenSSL::PKey::EC.new(pem, "abcdef")
assert_same_ec P256, key assert_same_ec p256, key
key = OpenSSL::PKey::EC.new(pem) { "abcdef" } key = OpenSSL::PKey::EC.new(pem) { "abcdef" }
assert_same_ec P256, key assert_same_ec p256, key
cipher = OpenSSL::Cipher.new("aes-128-cbc") cipher = OpenSSL::Cipher.new("aes-128-cbc")
exported = P256.to_pem(cipher, "abcdef\0\1") exported = p256.to_pem(cipher, "abcdef\0\1")
assert_same_ec P256, OpenSSL::PKey::EC.new(exported, "abcdef\0\1") assert_same_ec p256, OpenSSL::PKey::EC.new(exported, "abcdef\0\1")
assert_raise(OpenSSL::PKey::ECError) { assert_raise(OpenSSL::PKey::ECError) {
OpenSSL::PKey::EC.new(exported, "abcdef") OpenSSL::PKey::EC.new(exported, "abcdef")
} }
end end
def test_PUBKEY def test_PUBKEY
p256 = Fixtures.pkey("p256")
asn1 = OpenSSL::ASN1::Sequence([ asn1 = OpenSSL::ASN1::Sequence([
OpenSSL::ASN1::Sequence([ OpenSSL::ASN1::Sequence([
OpenSSL::ASN1::ObjectId("id-ecPublicKey"), OpenSSL::ASN1::ObjectId("id-ecPublicKey"),
OpenSSL::ASN1::ObjectId("prime256v1") OpenSSL::ASN1::ObjectId("prime256v1")
]), ]),
OpenSSL::ASN1::BitString( OpenSSL::ASN1::BitString(
P256.public_key.to_bn.to_s(2) p256.public_key.to_bn.to_s(2)
) )
]) ])
key = OpenSSL::PKey::EC.new(asn1.to_der) key = OpenSSL::PKey::EC.new(asn1.to_der)
assert_not_predicate key, :private? assert_not_predicate key, :private?
assert_same_ec dup_public(P256), key assert_same_ec dup_public(p256), key
pem = <<~EOF pem = <<~EOF
-----BEGIN PUBLIC KEY----- -----BEGIN PUBLIC KEY-----
@ -200,10 +202,10 @@ class OpenSSL::TestEC < OpenSSL::PKeyTestCase
-----END PUBLIC KEY----- -----END PUBLIC KEY-----
EOF EOF
key = OpenSSL::PKey::EC.new(pem) key = OpenSSL::PKey::EC.new(pem)
assert_same_ec dup_public(P256), key assert_same_ec dup_public(p256), key
assert_equal asn1.to_der, dup_public(P256).to_der assert_equal asn1.to_der, dup_public(p256).to_der
assert_equal pem, dup_public(P256).export assert_equal pem, dup_public(p256).export
end end
def test_ec_group def test_ec_group
@ -305,7 +307,7 @@ class OpenSSL::TestEC < OpenSSL::PKeyTestCase
raise if $!.message !~ /unsupported field/ raise if $!.message !~ /unsupported field/
end end
p256_key = P256 p256_key = Fixtures.pkey("p256")
p256_g = p256_key.group p256_g = p256_key.group
assert_equal(p256_key.public_key, p256_g.generator.mul(p256_key.private_key)) assert_equal(p256_key.public_key, p256_g.generator.mul(p256_key.private_key))

76
test/openssl/test_pkey_rsa.rb
View file

@ -1,12 +1,9 @@
# frozen_string_literal: false # frozen_string_literal: false
require_relative 'utils' require_relative "utils"
require 'base64'
if defined?(OpenSSL::TestUtils) if defined?(OpenSSL::TestUtils)
class OpenSSL::TestPKeyRSA < OpenSSL::PKeyTestCase class OpenSSL::TestPKeyRSA < OpenSSL::PKeyTestCase
RSA1024 = OpenSSL::TestUtils::TEST_KEY_RSA1024
def test_padding def test_padding
key = OpenSSL::PKey::RSA.new(512, 3) key = OpenSSL::PKey::RSA.new(512, 3)
@ -71,22 +68,23 @@ class OpenSSL::TestPKeyRSA < OpenSSL::PKeyTestCase
end end
def test_sign_verify def test_sign_verify
rsa1024 = Fixtures.pkey("rsa1024")
data = "Sign me!" data = "Sign me!"
signature = RSA1024.sign("SHA1", data) signature = rsa1024.sign("SHA1", data)
assert_equal true, RSA1024.verify("SHA1", signature, data) assert_equal true, rsa1024.verify("SHA1", signature, data)
signature0 = (<<~'end;').unpack("m")[0] signature0 = (<<~'end;').unpack("m")[0]
oLCgbprPvfhM4pjFQiDTFeWI9Sk+Og7Nh9TmIZ/xSxf2CGXQrptlwo7NQ28+ oLCgbprPvfhM4pjFQiDTFeWI9Sk+Og7Nh9TmIZ/xSxf2CGXQrptlwo7NQ28+
WA6YQo8jPH4hSuyWIM4Gz4qRYiYRkl5TDMUYob94zm8Si1HxEiS9354tzvqS WA6YQo8jPH4hSuyWIM4Gz4qRYiYRkl5TDMUYob94zm8Si1HxEiS9354tzvqS
zS8MLW2BtNPuTubMxTItHGTnOzo9sUg0LAHVFt8kHG2NfKAw/gQ= zS8MLW2BtNPuTubMxTItHGTnOzo9sUg0LAHVFt8kHG2NfKAw/gQ=
end; end;
assert_equal true, RSA1024.verify("SHA256", signature0, data) assert_equal true, rsa1024.verify("SHA256", signature0, data)
signature1 = signature0.succ signature1 = signature0.succ
assert_equal false, RSA1024.verify("SHA256", signature1, data) assert_equal false, rsa1024.verify("SHA256", signature1, data)
end end
def test_digest_state_irrelevant_sign def test_digest_state_irrelevant_sign
key = RSA1024 key = Fixtures.pkey("rsa1024")
digest1 = OpenSSL::Digest::SHA1.new digest1 = OpenSSL::Digest::SHA1.new
digest2 = OpenSSL::Digest::SHA1.new digest2 = OpenSSL::Digest::SHA1.new
data = 'Sign me!' data = 'Sign me!'
@ -97,7 +95,7 @@ class OpenSSL::TestPKeyRSA < OpenSSL::PKeyTestCase
end end
def test_digest_state_irrelevant_verify def test_digest_state_irrelevant_verify
key = RSA1024 key = Fixtures.pkey("rsa1024")
digest1 = OpenSSL::Digest::SHA1.new digest1 = OpenSSL::Digest::SHA1.new
digest2 = OpenSSL::Digest::SHA1.new digest2 = OpenSSL::Digest::SHA1.new
data = 'Sign me!' data = 'Sign me!'
@ -116,20 +114,21 @@ class OpenSSL::TestPKeyRSA < OpenSSL::PKeyTestCase
end end
def test_RSAPrivateKey def test_RSAPrivateKey
rsa1024 = Fixtures.pkey("rsa1024")
asn1 = OpenSSL::ASN1::Sequence([ asn1 = OpenSSL::ASN1::Sequence([
OpenSSL::ASN1::Integer(0), OpenSSL::ASN1::Integer(0),
OpenSSL::ASN1::Integer(RSA1024.n), OpenSSL::ASN1::Integer(rsa1024.n),
OpenSSL::ASN1::Integer(RSA1024.e), OpenSSL::ASN1::Integer(rsa1024.e),
OpenSSL::ASN1::Integer(RSA1024.d), OpenSSL::ASN1::Integer(rsa1024.d),
OpenSSL::ASN1::Integer(RSA1024.p), OpenSSL::ASN1::Integer(rsa1024.p),
OpenSSL::ASN1::Integer(RSA1024.q), OpenSSL::ASN1::Integer(rsa1024.q),
OpenSSL::ASN1::Integer(RSA1024.dmp1), OpenSSL::ASN1::Integer(rsa1024.dmp1),
OpenSSL::ASN1::Integer(RSA1024.dmq1), OpenSSL::ASN1::Integer(rsa1024.dmq1),
OpenSSL::ASN1::Integer(RSA1024.iqmp) OpenSSL::ASN1::Integer(rsa1024.iqmp)
]) ])
key = OpenSSL::PKey::RSA.new(asn1.to_der) key = OpenSSL::PKey::RSA.new(asn1.to_der)
assert_predicate key, :private? assert_predicate key, :private?
assert_same_rsa RSA1024, key assert_same_rsa rsa1024, key
pem = <<~EOF pem = <<~EOF
-----BEGIN RSA PRIVATE KEY----- -----BEGIN RSA PRIVATE KEY-----
@ -149,13 +148,14 @@ class OpenSSL::TestPKeyRSA < OpenSSL::PKeyTestCase
-----END RSA PRIVATE KEY----- -----END RSA PRIVATE KEY-----
EOF EOF
key = OpenSSL::PKey::RSA.new(pem) key = OpenSSL::PKey::RSA.new(pem)
assert_same_rsa RSA1024, key assert_same_rsa rsa1024, key
assert_equal asn1.to_der, RSA1024.to_der assert_equal asn1.to_der, rsa1024.to_der
assert_equal pem, RSA1024.export assert_equal pem, rsa1024.export
end end
def test_RSAPrivateKey_encrypted def test_RSAPrivateKey_encrypted
rsa1024 = Fixtures.pkey("rsa1024")
# key = abcdef # key = abcdef
pem = <<~EOF pem = <<~EOF
-----BEGIN RSA PRIVATE KEY----- -----BEGIN RSA PRIVATE KEY-----
@ -178,26 +178,27 @@ class OpenSSL::TestPKeyRSA < OpenSSL::PKeyTestCase
-----END RSA PRIVATE KEY----- -----END RSA PRIVATE KEY-----
EOF EOF
key = OpenSSL::PKey::RSA.new(pem, "abcdef") key = OpenSSL::PKey::RSA.new(pem, "abcdef")
assert_same_rsa RSA1024, key assert_same_rsa rsa1024, key
key = OpenSSL::PKey::RSA.new(pem) { "abcdef" } key = OpenSSL::PKey::RSA.new(pem) { "abcdef" }
assert_same_rsa RSA1024, key assert_same_rsa rsa1024, key
cipher = OpenSSL::Cipher.new("aes-128-cbc") cipher = OpenSSL::Cipher.new("aes-128-cbc")
exported = RSA1024.to_pem(cipher, "abcdef\0\1") exported = rsa1024.to_pem(cipher, "abcdef\0\1")
assert_same_rsa RSA1024, OpenSSL::PKey::RSA.new(exported, "abcdef\0\1") assert_same_rsa rsa1024, OpenSSL::PKey::RSA.new(exported, "abcdef\0\1")
assert_raise(OpenSSL::PKey::RSAError) { assert_raise(OpenSSL::PKey::RSAError) {
OpenSSL::PKey::RSA.new(exported, "abcdef") OpenSSL::PKey::RSA.new(exported, "abcdef")
} }
end end
def test_RSAPublicKey def test_RSAPublicKey
rsa1024 = Fixtures.pkey("rsa1024")
asn1 = OpenSSL::ASN1::Sequence([ asn1 = OpenSSL::ASN1::Sequence([
OpenSSL::ASN1::Integer(RSA1024.n), OpenSSL::ASN1::Integer(rsa1024.n),
OpenSSL::ASN1::Integer(RSA1024.e) OpenSSL::ASN1::Integer(rsa1024.e)
]) ])
key = OpenSSL::PKey::RSA.new(asn1.to_der) key = OpenSSL::PKey::RSA.new(asn1.to_der)
assert_not_predicate key, :private? assert_not_predicate key, :private?
assert_same_rsa dup_public(RSA1024), key assert_same_rsa dup_public(rsa1024), key
pem = <<~EOF pem = <<~EOF
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
@ -207,10 +208,11 @@ class OpenSSL::TestPKeyRSA < OpenSSL::PKeyTestCase
-----END RSA PUBLIC KEY----- -----END RSA PUBLIC KEY-----
EOF EOF
key = OpenSSL::PKey::RSA.new(pem) key = OpenSSL::PKey::RSA.new(pem)
assert_same_rsa dup_public(RSA1024), key assert_same_rsa dup_public(rsa1024), key
end end
def test_PUBKEY def test_PUBKEY
rsa1024 = Fixtures.pkey("rsa1024")
asn1 = OpenSSL::ASN1::Sequence([ asn1 = OpenSSL::ASN1::Sequence([
OpenSSL::ASN1::Sequence([ OpenSSL::ASN1::Sequence([
OpenSSL::ASN1::ObjectId("rsaEncryption"), OpenSSL::ASN1::ObjectId("rsaEncryption"),
@ -218,14 +220,14 @@ class OpenSSL::TestPKeyRSA < OpenSSL::PKeyTestCase
]), ]),
OpenSSL::ASN1::BitString( OpenSSL::ASN1::BitString(
OpenSSL::ASN1::Sequence([ OpenSSL::ASN1::Sequence([
OpenSSL::ASN1::Integer(RSA1024.n), OpenSSL::ASN1::Integer(rsa1024.n),
OpenSSL::ASN1::Integer(RSA1024.e) OpenSSL::ASN1::Integer(rsa1024.e)
]).to_der ]).to_der
) )
]) ])
key = OpenSSL::PKey::RSA.new(asn1.to_der) key = OpenSSL::PKey::RSA.new(asn1.to_der)
assert_not_predicate key, :private? assert_not_predicate key, :private?
assert_same_rsa dup_public(RSA1024), key assert_same_rsa dup_public(rsa1024), key
pem = <<~EOF pem = <<~EOF
-----BEGIN PUBLIC KEY----- -----BEGIN PUBLIC KEY-----
@ -236,14 +238,14 @@ class OpenSSL::TestPKeyRSA < OpenSSL::PKeyTestCase
-----END PUBLIC KEY----- -----END PUBLIC KEY-----
EOF EOF
key = OpenSSL::PKey::RSA.new(pem) key = OpenSSL::PKey::RSA.new(pem)
assert_same_rsa dup_public(RSA1024), key assert_same_rsa dup_public(rsa1024), key
assert_equal asn1.to_der, dup_public(RSA1024).to_der assert_equal asn1.to_der, dup_public(rsa1024).to_der
assert_equal pem, dup_public(RSA1024).export assert_equal pem, dup_public(rsa1024).export
end end
def test_pem_passwd def test_pem_passwd
key = RSA1024 key = Fixtures.pkey("rsa1024")
pem3c = key.to_pem("aes-128-cbc", "key") pem3c = key.to_pem("aes-128-cbc", "key")
assert_match (/ENCRYPTED/), pem3c assert_match (/ENCRYPTED/), pem3c
assert_equal key.to_der, OpenSSL::PKey.read(pem3c, "key").to_der assert_equal key.to_der, OpenSSL::PKey.read(pem3c, "key").to_der

6
test/openssl/test_random.rb
View file

@ -1,6 +1,8 @@
# frozen_string_literal: false # frozen_string_literal: false
require_relative "utils" require_relative "utils"
if defined?(OpenSSL::TestUtils)
class OpenSSL::TestRandom < OpenSSL::TestCase class OpenSSL::TestRandom < OpenSSL::TestCase
def test_random_bytes def test_random_bytes
assert_equal("", OpenSSL::Random.random_bytes(0)) assert_equal("", OpenSSL::Random.random_bytes(0))
@ -12,4 +14,6 @@ class OpenSSL::TestRandom < OpenSSL::TestCase
assert_equal("", OpenSSL::Random.pseudo_bytes(0)) assert_equal("", OpenSSL::Random.pseudo_bytes(0))
assert_equal(12, OpenSSL::Random.pseudo_bytes(12).bytesize) assert_equal(12, OpenSSL::Random.pseudo_bytes(12).bytesize)
end if OpenSSL::Random.methods.include?(:pseudo_bytes) end if OpenSSL::Random.methods.include?(:pseudo_bytes)
end if defined?(OpenSSL::TestCase) end
end

427
test/openssl/test_ssl.rb
View file

@ -35,7 +35,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
readwrite_loop(ctx, ssl) readwrite_loop(ctx, ssl)
} }
start_server(ctx_proc: ctx_proc, server_proc: server_proc) { |server, port| start_server(ctx_proc: ctx_proc, server_proc: server_proc) { |port|
begin begin
sock = TCPSocket.new("127.0.0.1", port) sock = TCPSocket.new("127.0.0.1", port)
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
@ -56,7 +56,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
end end
def test_sysread_and_syswrite def test_sysread_and_syswrite
start_server { |server, port| start_server { |port|
server_connect(port) { |ssl| server_connect(port) { |ssl|
str = "x" * 100 + "\n" str = "x" * 100 + "\n"
ssl.syswrite(str) ssl.syswrite(str)
@ -72,7 +72,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
end end
def test_sync_close def test_sync_close
start_server { |server, port| start_server { |port|
begin begin
sock = TCPSocket.new("127.0.0.1", port) sock = TCPSocket.new("127.0.0.1", port)
ssl = OpenSSL::SSL::SSLSocket.new(sock) ssl = OpenSSL::SSL::SSLSocket.new(sock)
@ -97,7 +97,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
end end
def test_copy_stream def test_copy_stream
start_server do |server, port| start_server do |port|
server_connect(port) do |ssl| server_connect(port) do |ssl|
IO.pipe do |r, w| IO.pipe do |r, w|
str = "hello world\n" str = "hello world\n"
@ -112,21 +112,16 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
def test_client_auth_failure def test_client_auth_failure
vflag = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT vflag = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
start_server(verify_mode: vflag, ignore_listener_error: true) { |server, port| start_server(verify_mode: vflag, ignore_listener_error: true) { |port|
sock = TCPSocket.new("127.0.0.1", port) assert_handshake_error {
ssl = OpenSSL::SSL::SSLSocket.new(sock) server_connect(port) { |ssl| ssl.puts("abc"); ssl.gets }
ssl.sync_close = true }
begin
assert_handshake_error { ssl.connect }
ensure
ssl.close
end
} }
end end
def test_client_auth_success def test_client_auth_success
vflag = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT vflag = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
start_server(verify_mode: vflag) { |server, port| start_server(verify_mode: vflag) { |port|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.key = @cli_key ctx.key = @cli_key
ctx.cert = @cli_cert ctx.cert = @cli_cert
@ -153,19 +148,21 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
def test_client_auth_public_key def test_client_auth_public_key
vflag = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT vflag = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
start_server(verify_mode: vflag, ignore_listener_error: true) do |server, port| start_server(verify_mode: vflag, ignore_listener_error: true) do |port|
assert_raise(ArgumentError) { assert_raise(ArgumentError) {
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.key = @cli_key.public_key ctx.key = @cli_key.public_key
ctx.cert = @cli_cert ctx.cert = @cli_cert
server_connect(port, ctx) { } server_connect(port, ctx) { |ssl| ssl.puts("abc"); ssl.gets }
} }
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.client_cert_cb = Proc.new{ |ssl| ctx.client_cert_cb = Proc.new{ |ssl|
[@cli_cert, @cli_key.public_key] [@cli_cert, @cli_key.public_key]
} }
assert_handshake_error { server_connect(port, ctx) } assert_handshake_error {
server_connect(port, ctx) { |ssl| ssl.puts("abc"); ssl.gets }
}
end end
end end
@ -175,7 +172,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
end end
vflag = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT vflag = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
start_server(verify_mode: vflag, ctx_proc: ctx_proc) { |server, port| start_server(verify_mode: vflag, ctx_proc: ctx_proc) { |port|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
client_ca_from_server = nil client_ca_from_server = nil
ctx.client_cert_cb = Proc.new do |sslconn| ctx.client_cert_cb = Proc.new do |sslconn|
@ -187,8 +184,8 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
end end
def test_read_nonblock_without_session def test_read_nonblock_without_session
OpenSSL::TestUtils.silent do EnvUtil.suppress_warning do
start_server(start_immediately: false) { |server, port| start_server(start_immediately: false) { |port|
sock = TCPSocket.new("127.0.0.1", port) sock = TCPSocket.new("127.0.0.1", port)
ssl = OpenSSL::SSL::SSLSocket.new(sock) ssl = OpenSSL::SSL::SSLSocket.new(sock)
ssl.sync_close = true ssl.sync_close = true
@ -206,26 +203,21 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
def test_starttls def test_starttls
server_proc = -> (ctx, ssl) { server_proc = -> (ctx, ssl) {
begin
while line = ssl.gets while line = ssl.gets
if line =~ /^STARTTLS$/ if line =~ /^STARTTLS$/
ssl.write("x") ssl.write("x")
ssl.flush ssl.flush
ssl.accept ssl.accept
next break
end end
ssl.write(line) ssl.write(line)
end end
rescue OpenSSL::SSL::SSLError readwrite_loop(ctx, ssl)
rescue IOError
ensure
ssl.close rescue nil
end
} }
EnvUtil.suppress_warning do # read/write on not started session EnvUtil.suppress_warning do # read/write on not started session
start_server(start_immediately: false, start_server(start_immediately: false,
server_proc: server_proc) { |server, port| server_proc: server_proc) { |port|
begin begin
sock = TCPSocket.new("127.0.0.1", port) sock = TCPSocket.new("127.0.0.1", port)
ssl = OpenSSL::SSL::SSLSocket.new(sock) ssl = OpenSSL::SSL::SSLSocket.new(sock)
@ -248,7 +240,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
end end
def test_parallel def test_parallel
start_server { |server, port| start_server { |port|
ssls = [] ssls = []
10.times{ 10.times{
sock = TCPSocket.new("127.0.0.1", port) sock = TCPSocket.new("127.0.0.1", port)
@ -269,7 +261,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
end end
def test_verify_result def test_verify_result
start_server(ignore_listener_error: true) { |server, port| start_server(ignore_listener_error: true) { |port|
sock = TCPSocket.new("127.0.0.1", port) sock = TCPSocket.new("127.0.0.1", port)
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
@ -283,7 +275,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
end end
} }
start_server { |server, port| start_server { |port|
sock = TCPSocket.new("127.0.0.1", port) sock = TCPSocket.new("127.0.0.1", port)
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
@ -301,7 +293,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
end end
} }
start_server(ignore_listener_error: true) { |server, port| start_server(ignore_listener_error: true) { |port|
sock = TCPSocket.new("127.0.0.1", port) sock = TCPSocket.new("127.0.0.1", port)
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
@ -321,7 +313,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
end end
def test_exception_in_verify_callback_is_ignored def test_exception_in_verify_callback_is_ignored
start_server(ignore_listener_error: true) { |server, port| start_server(ignore_listener_error: true) { |port|
sock = TCPSocket.new("127.0.0.1", port) sock = TCPSocket.new("127.0.0.1", port)
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
@ -332,7 +324,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx) ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
ssl.sync_close = true ssl.sync_close = true
begin begin
OpenSSL::TestUtils.silent do EnvUtil.suppress_warning do
# SSLError, not RuntimeError # SSLError, not RuntimeError
assert_raise(OpenSSL::SSL::SSLError) { ssl.connect } assert_raise(OpenSSL::SSL::SSLError) { ssl.connect }
end end
@ -359,13 +351,17 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
end end
def test_post_connect_check_with_anon_ciphers def test_post_connect_check_with_anon_ciphers
pend "TLS 1.2 is not supported" unless tls12_supported?
ctx_proc = -> ctx { ctx_proc = -> ctx {
ctx.ssl_version = :TLSv1_2
ctx.ciphers = "aNULL" ctx.ciphers = "aNULL"
ctx.security_level = 0 ctx.security_level = 0
} }
start_server(ctx_proc: ctx_proc) { |server, port| start_server(ctx_proc: ctx_proc) { |port|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.ssl_version = :TLSv1_2
ctx.ciphers = "aNULL" ctx.ciphers = "aNULL"
ctx.security_level = 0 ctx.security_level = 0
server_connect(port, ctx) { |ssl| server_connect(port, ctx) { |ssl|
@ -379,7 +375,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
def test_post_connection_check def test_post_connection_check
sslerr = OpenSSL::SSL::SSLError sslerr = OpenSSL::SSL::SSLError
start_server { |server, port| start_server { |port|
server_connect(port) { |ssl| server_connect(port) { |ssl|
assert_raise(sslerr){ssl.post_connection_check("localhost.localdomain")} assert_raise(sslerr){ssl.post_connection_check("localhost.localdomain")}
assert_raise(sslerr){ssl.post_connection_check("127.0.0.1")} assert_raise(sslerr){ssl.post_connection_check("127.0.0.1")}
@ -400,7 +396,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
["subjectAltName","IP:127.0.0.1",false], ["subjectAltName","IP:127.0.0.1",false],
] ]
@svr_cert = issue_cert(@svr, @svr_key, 4, exts, @ca_cert, @ca_key) @svr_cert = issue_cert(@svr, @svr_key, 4, exts, @ca_cert, @ca_key)
start_server { |server, port| start_server { |port|
server_connect(port) { |ssl| server_connect(port) { |ssl|
assert(ssl.post_connection_check("localhost.localdomain")) assert(ssl.post_connection_check("localhost.localdomain"))
assert(ssl.post_connection_check("127.0.0.1")) assert(ssl.post_connection_check("127.0.0.1"))
@ -420,7 +416,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
["subjectAltName","DNS:*.localdomain",false], ["subjectAltName","DNS:*.localdomain",false],
] ]
@svr_cert = issue_cert(@svr, @svr_key, 5, exts, @ca_cert, @ca_key) @svr_cert = issue_cert(@svr, @svr_key, 5, exts, @ca_cert, @ca_key)
start_server { |server, port| start_server { |port|
server_connect(port) { |ssl| server_connect(port) { |ssl|
assert(ssl.post_connection_check("localhost.localdomain")) assert(ssl.post_connection_check("localhost.localdomain"))
assert_raise(sslerr){ssl.post_connection_check("127.0.0.1")} assert_raise(sslerr){ssl.post_connection_check("127.0.0.1")}
@ -623,48 +619,44 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
end end
def test_tlsext_hostname def test_tlsext_hostname
ctx3 = OpenSSL::SSL::SSLContext.new fooctx = OpenSSL::SSL::SSLContext.new
ctx3.ciphers = "ADH" fooctx.tmp_dh_callback = proc { Fixtures.pkey_dh("dh1024") }
ctx3.tmp_dh_callback = proc { OpenSSL::TestUtils::TEST_KEY_DH1024 } fooctx.cert = @cli_cert
ctx3.security_level = 0 fooctx.key = @cli_key
assert_not_predicate ctx3, :frozen?
ctx_proc = -> ctx { ctx_proc = proc { |ctx|
ctx.ciphers = "ALL:!aNULL"
ctx.servername_cb = proc { |ssl, servername| ctx.servername_cb = proc { |ssl, servername|
case servername case servername
when "foo.example.com" when "foo.example.com"
ctx3 fooctx
when "bar.example.com" when "bar.example.com"
nil nil
else else
raise "unknown hostname" raise "unreachable"
end end
} }
} }
start_server(ctx_proc: ctx_proc) do |server, port| start_server(ctx_proc: ctx_proc) do |port|
ctx = OpenSSL::SSL::SSLContext.new
ctx.ciphers = "ALL"
ctx.security_level = 0
sock = TCPSocket.new("127.0.0.1", port) sock = TCPSocket.new("127.0.0.1", port)
begin begin
ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx) ssl = OpenSSL::SSL::SSLSocket.new(sock)
ssl.hostname = "foo.example.com" ssl.hostname = "foo.example.com"
ssl.connect ssl.connect
assert_match (/^ADH-/), ssl.cipher[0], "the context returned by servername_cb is used" assert_equal @cli_cert.serial, ssl.peer_cert.serial
assert_predicate ctx3, :frozen? assert_predicate fooctx, :frozen?
ensure ensure
ssl&.close
sock.close sock.close
end end
sock = TCPSocket.new("127.0.0.1", port) sock = TCPSocket.new("127.0.0.1", port)
begin begin
ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx) ssl = OpenSSL::SSL::SSLSocket.new(sock)
ssl.hostname = "bar.example.com" ssl.hostname = "bar.example.com"
ssl.connect ssl.connect
assert_not_match (/^A(EC)?DH-/), ssl.cipher[0], "the original context is used" assert_equal @svr_cert.serial, ssl.peer_cert.serial
ensure ensure
ssl&.close
sock.close sock.close
end end
end end
@ -674,9 +666,9 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
hostname = 'example.org' hostname = 'example.org'
ctx2 = OpenSSL::SSL::SSLContext.new ctx2 = OpenSSL::SSL::SSLContext.new
ctx2.ciphers = "aNULL" ctx2.cert = @svr_cert
ctx2.tmp_dh_callback = proc { OpenSSL::TestUtils::TEST_KEY_DH1024 } ctx2.key = @svr_key
ctx2.security_level = 0 ctx2.tmp_dh_callback = proc { Fixtures.pkey_dh("dh1024") }
ctx2.servername_cb = lambda { |args| Object.new } ctx2.servername_cb = lambda { |args| Object.new }
sock1, sock2 = socketpair sock1, sock2 = socketpair
@ -684,8 +676,6 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
s2 = OpenSSL::SSL::SSLSocket.new(sock2, ctx2) s2 = OpenSSL::SSL::SSLSocket.new(sock2, ctx2)
ctx1 = OpenSSL::SSL::SSLContext.new ctx1 = OpenSSL::SSL::SSLContext.new
ctx1.ciphers = "aNULL"
ctx1.security_level = 0
s1 = OpenSSL::SSL::SSLSocket.new(sock1, ctx1) s1 = OpenSSL::SSL::SSLSocket.new(sock1, ctx1)
s1.hostname = hostname s1.hostname = hostname
@ -716,7 +706,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
ctx.key = @svr_key ctx.key = @svr_key
} }
start_server(ctx_proc: ctx_proc, ignore_listener_error: true) do |server, port| start_server(ctx_proc: ctx_proc, ignore_listener_error: true) do |port|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.verify_hostname = true ctx.verify_hostname = true
ctx.cert_store = OpenSSL::X509::Store.new ctx.cert_store = OpenSSL::X509::Store.new
@ -749,31 +739,6 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
end end
end end
def test_multibyte_read_write
#German a umlaut
auml = [%w{ C3 A4 }.join('')].pack('H*')
auml.force_encoding(Encoding::UTF_8)
[10, 1000, 100000].each {|i|
str = nil
num_written = nil
server_proc = Proc.new {|ctx, ssl|
cmp = ssl.read
raw_size = cmp.size
cmp.force_encoding(Encoding::UTF_8)
assert_equal(str, cmp)
assert_equal(num_written, raw_size)
ssl.close
}
start_server(server_proc: server_proc) { |server, port|
server_connect(port) { |ssl|
str = auml * i
num_written = ssl.write(str)
}
}
}
end
def test_unset_OP_ALL def test_unset_OP_ALL
ctx_proc = Proc.new { |ctx| ctx_proc = Proc.new { |ctx|
# If OP_DONT_INSERT_EMPTY_FRAGMENTS is not defined, this test is # If OP_DONT_INSERT_EMPTY_FRAGMENTS is not defined, this test is
@ -781,7 +746,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
# But it also degrades gracefully, so keep it # But it also degrades gracefully, so keep it
ctx.options = OpenSSL::SSL::OP_ALL ctx.options = OpenSSL::SSL::OP_ALL
} }
start_server(ctx_proc: ctx_proc) { |server, port| start_server(ctx_proc: ctx_proc) { |port|
server_connect(port) { |ssl| server_connect(port) { |ssl|
ssl.puts('hello') ssl.puts('hello')
assert_equal("hello\n", ssl.gets) assert_equal("hello\n", ssl.gets)
@ -793,7 +758,7 @@ if OpenSSL::SSL::SSLContext::METHODS.include?(:TLSv1) && OpenSSL::SSL::SSLContex
def test_forbid_ssl_v3_for_client def test_forbid_ssl_v3_for_client
ctx_proc = Proc.new { |ctx| ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_SSLv3 } ctx_proc = Proc.new { |ctx| ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_SSLv3 }
start_server_version(:SSLv23, ctx_proc) { |server, port| start_server_version(:SSLv23, ctx_proc) { |port|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.ssl_version = :SSLv3 ctx.ssl_version = :SSLv3
assert_handshake_error { server_connect(port, ctx) } assert_handshake_error { server_connect(port, ctx) }
@ -801,7 +766,7 @@ if OpenSSL::SSL::SSLContext::METHODS.include?(:TLSv1) && OpenSSL::SSL::SSLContex
end end
def test_forbid_ssl_v3_from_server def test_forbid_ssl_v3_from_server
start_server_version(:SSLv3) { |server, port| start_server_version(:SSLv3) { |port|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_SSLv3 ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_SSLv3
assert_handshake_error { server_connect(port, ctx) } assert_handshake_error { server_connect(port, ctx) }
@ -813,14 +778,15 @@ end
if OpenSSL::SSL::SSLContext::METHODS.include?(:TLSv1_1) && OpenSSL::SSL::SSLContext::METHODS.include?(:TLSv1) if OpenSSL::SSL::SSLContext::METHODS.include?(:TLSv1_1) && OpenSSL::SSL::SSLContext::METHODS.include?(:TLSv1)
def test_tls_v1_1 def test_tls_v1_1
start_server_version(:TLSv1_1) { |server, port| start_server_version(:TLSv1_1) { |port|
server_connect(port) { |ssl| assert_equal("TLSv1.1", ssl.ssl_version) } ctx = OpenSSL::SSL::SSLContext.new(:TLSv1_1)
server_connect(port, ctx) { |ssl| assert_equal("TLSv1.1", ssl.ssl_version) }
} }
end end
def test_forbid_tls_v1_for_client def test_forbid_tls_v1_for_client
ctx_proc = Proc.new { |ctx| ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1 } ctx_proc = Proc.new { |ctx| ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1 }
start_server_version(:SSLv23, ctx_proc) { |server, port| start_server_version(:SSLv23, ctx_proc) { |port|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.ssl_version = :TLSv1 ctx.ssl_version = :TLSv1
assert_handshake_error { server_connect(port, ctx) } assert_handshake_error { server_connect(port, ctx) }
@ -828,7 +794,7 @@ if OpenSSL::SSL::SSLContext::METHODS.include?(:TLSv1_1) && OpenSSL::SSL::SSLCont
end end
def test_forbid_tls_v1_from_server def test_forbid_tls_v1_from_server
start_server_version(:TLSv1) { |server, port| start_server_version(:TLSv1) { |port|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1 ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1
assert_handshake_error { server_connect(port, ctx) } assert_handshake_error { server_connect(port, ctx) }
@ -840,16 +806,16 @@ end
if OpenSSL::SSL::SSLContext::METHODS.include?(:TLSv1_2) && OpenSSL::SSL::SSLContext::METHODS.include?(:TLSv1_1) if OpenSSL::SSL::SSLContext::METHODS.include?(:TLSv1_2) && OpenSSL::SSL::SSLContext::METHODS.include?(:TLSv1_1)
def test_tls_v1_2 def test_tls_v1_2
start_server_version(:TLSv1_2) { |server, port| start_server_version(:TLSv1_2) { |port|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.ssl_version = :TLSv1_2_client ctx.ssl_version = :TLSv1_2_client
server_connect(port, ctx) { |ssl| assert_equal("TLSv1.2", ssl.ssl_version) } server_connect(port, ctx) { |ssl| assert_equal("TLSv1.2", ssl.ssl_version) }
} }
end if OpenSSL::OPENSSL_VERSION_NUMBER > 0x10001000 end
def test_forbid_tls_v1_1_for_client def test_forbid_tls_v1_1_for_client
ctx_proc = Proc.new { |ctx| ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1_1 } ctx_proc = Proc.new { |ctx| ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1_1 }
start_server_version(:SSLv23, ctx_proc) { |server, port| start_server_version(:SSLv23, ctx_proc) { |port|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.ssl_version = :TLSv1_1 ctx.ssl_version = :TLSv1_1
assert_handshake_error { server_connect(port, ctx) } assert_handshake_error { server_connect(port, ctx) }
@ -857,7 +823,7 @@ if OpenSSL::SSL::SSLContext::METHODS.include?(:TLSv1_2) && OpenSSL::SSL::SSLCont
end if defined?(OpenSSL::SSL::OP_NO_TLSv1_1) end if defined?(OpenSSL::SSL::OP_NO_TLSv1_1)
def test_forbid_tls_v1_1_from_server def test_forbid_tls_v1_1_from_server
start_server_version(:TLSv1_1) { |server, port| start_server_version(:TLSv1_1) { |port|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1_1 ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1_1
assert_handshake_error { server_connect(port, ctx) } assert_handshake_error { server_connect(port, ctx) }
@ -866,7 +832,7 @@ if OpenSSL::SSL::SSLContext::METHODS.include?(:TLSv1_2) && OpenSSL::SSL::SSLCont
def test_forbid_tls_v1_2_for_client def test_forbid_tls_v1_2_for_client
ctx_proc = Proc.new { |ctx| ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1_2 } ctx_proc = Proc.new { |ctx| ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1_2 }
start_server_version(:SSLv23, ctx_proc) { |server, port| start_server_version(:SSLv23, ctx_proc) { |port|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.ssl_version = :TLSv1_2 ctx.ssl_version = :TLSv1_2
assert_handshake_error { server_connect(port, ctx) } assert_handshake_error { server_connect(port, ctx) }
@ -874,7 +840,7 @@ if OpenSSL::SSL::SSLContext::METHODS.include?(:TLSv1_2) && OpenSSL::SSL::SSLCont
end if defined?(OpenSSL::SSL::OP_NO_TLSv1_2) end if defined?(OpenSSL::SSL::OP_NO_TLSv1_2)
def test_forbid_tls_v1_2_from_server def test_forbid_tls_v1_2_from_server
start_server_version(:TLSv1_2) { |server, port| start_server_version(:TLSv1_2) { |port|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1_2 ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1_2
assert_handshake_error { server_connect(port, ctx) } assert_handshake_error { server_connect(port, ctx) }
@ -887,14 +853,14 @@ end
num_handshakes = 0 num_handshakes = 0
renegotiation_cb = Proc.new { |ssl| num_handshakes += 1 } renegotiation_cb = Proc.new { |ssl| num_handshakes += 1 }
ctx_proc = Proc.new { |ctx| ctx.renegotiation_cb = renegotiation_cb } ctx_proc = Proc.new { |ctx| ctx.renegotiation_cb = renegotiation_cb }
start_server_version(:SSLv23, ctx_proc) { |server, port| start_server_version(:SSLv23, ctx_proc) { |port|
server_connect(port) { |ssl| server_connect(port) { |ssl|
assert_equal(1, num_handshakes) assert_equal(1, num_handshakes)
} }
} }
end end
if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10002000 if openssl?(1, 0, 2) || libressl?
def test_alpn_protocol_selection_ary def test_alpn_protocol_selection_ary
advertised = ["http/1.1", "spdy/2"] advertised = ["http/1.1", "spdy/2"]
ctx_proc = Proc.new { |ctx| ctx_proc = Proc.new { |ctx|
@ -903,7 +869,7 @@ if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10002000
} }
ctx.alpn_protocols = advertised ctx.alpn_protocols = advertised
} }
start_server_version(:SSLv23, ctx_proc) { |server, port| start_server_version(:SSLv23, ctx_proc) { |port|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.alpn_protocols = advertised ctx.alpn_protocols = advertised
server_connect(port, ctx) { |ssl| server_connect(port, ctx) { |ssl|
@ -916,14 +882,13 @@ if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10002000
sock1, sock2 = socketpair sock1, sock2 = socketpair
ctx1 = OpenSSL::SSL::SSLContext.new ctx1 = OpenSSL::SSL::SSLContext.new
ctx1.ciphers = "aNULL" ctx1.cert = @svr_cert
ctx1.security_level = 0 ctx1.key = @svr_key
ctx1.tmp_dh_callback = proc { Fixtures.pkey_dh("dh1024") }
ctx1.alpn_select_cb = -> (protocols) { nil } ctx1.alpn_select_cb = -> (protocols) { nil }
ssl1 = OpenSSL::SSL::SSLSocket.new(sock1, ctx1) ssl1 = OpenSSL::SSL::SSLSocket.new(sock1, ctx1)
ctx2 = OpenSSL::SSL::SSLContext.new ctx2 = OpenSSL::SSL::SSLContext.new
ctx2.ciphers = "aNULL"
ctx2.security_level = 0
ctx2.alpn_protocols = ["http/1.1"] ctx2.alpn_protocols = ["http/1.1"]
ssl2 = OpenSSL::SSL::SSLSocket.new(sock2, ctx2) ssl2 = OpenSSL::SSL::SSLSocket.new(sock2, ctx2)
@ -942,14 +907,15 @@ if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10002000
end end
end end
if OpenSSL::OPENSSL_VERSION_NUMBER > 0x10001000 &&
OpenSSL::SSL::SSLContext.method_defined?(:npn_select_cb)
# NPN may be disabled by OpenSSL configure option
def test_npn_protocol_selection_ary def test_npn_protocol_selection_ary
pend "TLS 1.2 is not supported" unless tls12_supported?
pend "NPN is not supported" unless \
OpenSSL::SSL::SSLContext.method_defined?(:npn_select_cb)
pend "LibreSSL 2.6 has broken NPN functions" if libressl?(2, 6, 1)
advertised = ["http/1.1", "spdy/2"] advertised = ["http/1.1", "spdy/2"]
ctx_proc = Proc.new { |ctx| ctx.npn_protocols = advertised } ctx_proc = proc { |ctx| ctx.npn_protocols = advertised }
start_server_version(:SSLv23, ctx_proc) { |server, port| start_server_version(:TLSv1_2, ctx_proc) { |port|
selector = lambda { |which| selector = lambda { |which|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.npn_select_cb = -> (protocols) { protocols.send(which) } ctx.npn_select_cb = -> (protocols) { protocols.send(which) }
@ -963,13 +929,18 @@ if OpenSSL::OPENSSL_VERSION_NUMBER > 0x10001000 &&
end end
def test_npn_protocol_selection_enum def test_npn_protocol_selection_enum
pend "TLS 1.2 is not supported" unless tls12_supported?
pend "NPN is not supported" unless \
OpenSSL::SSL::SSLContext.method_defined?(:npn_select_cb)
pend "LibreSSL 2.6 has broken NPN functions" if libressl?(2, 6, 1)
advertised = Object.new advertised = Object.new
def advertised.each def advertised.each
yield "http/1.1" yield "http/1.1"
yield "spdy/2" yield "spdy/2"
end end
ctx_proc = Proc.new { |ctx| ctx.npn_protocols = advertised } ctx_proc = Proc.new { |ctx| ctx.npn_protocols = advertised }
start_server_version(:SSLv23, ctx_proc) { |server, port| start_server_version(:TLSv1_2, ctx_proc) { |port|
selector = lambda { |selected, which| selector = lambda { |selected, which|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.npn_select_cb = -> (protocols) { protocols.to_a.send(which) } ctx.npn_select_cb = -> (protocols) { protocols.to_a.send(which) }
@ -983,8 +954,13 @@ if OpenSSL::OPENSSL_VERSION_NUMBER > 0x10001000 &&
end end
def test_npn_protocol_selection_cancel def test_npn_protocol_selection_cancel
pend "TLS 1.2 is not supported" unless tls12_supported?
pend "NPN is not supported" unless \
OpenSSL::SSL::SSLContext.method_defined?(:npn_select_cb)
pend "LibreSSL 2.6 has broken NPN functions" if libressl?(2, 6, 1)
ctx_proc = Proc.new { |ctx| ctx.npn_protocols = ["http/1.1"] } ctx_proc = Proc.new { |ctx| ctx.npn_protocols = ["http/1.1"] }
start_server_version(:SSLv23, ctx_proc) { |server, port| start_server_version(:TLSv1_2, ctx_proc) { |port|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.npn_select_cb = -> (protocols) { raise RuntimeError.new } ctx.npn_select_cb = -> (protocols) { raise RuntimeError.new }
assert_raise(RuntimeError) { server_connect(port, ctx) } assert_raise(RuntimeError) { server_connect(port, ctx) }
@ -992,8 +968,13 @@ if OpenSSL::OPENSSL_VERSION_NUMBER > 0x10001000 &&
end end
def test_npn_advertised_protocol_too_long def test_npn_advertised_protocol_too_long
pend "TLS 1.2 is not supported" unless tls12_supported?
pend "NPN is not supported" unless \
OpenSSL::SSL::SSLContext.method_defined?(:npn_select_cb)
pend "LibreSSL 2.6 has broken NPN functions" if libressl?(2, 6, 1)
ctx_proc = Proc.new { |ctx| ctx.npn_protocols = ["a" * 256] } ctx_proc = Proc.new { |ctx| ctx.npn_protocols = ["a" * 256] }
start_server_version(:SSLv23, ctx_proc) { |server, port| start_server_version(:TLSv1_2, ctx_proc) { |port|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.npn_select_cb = -> (protocols) { protocols.first } ctx.npn_select_cb = -> (protocols) { protocols.first }
assert_handshake_error { server_connect(port, ctx) } assert_handshake_error { server_connect(port, ctx) }
@ -1001,32 +982,24 @@ if OpenSSL::OPENSSL_VERSION_NUMBER > 0x10001000 &&
end end
def test_npn_selected_protocol_too_long def test_npn_selected_protocol_too_long
pend "TLS 1.2 is not supported" unless tls12_supported?
pend "NPN is not supported" unless \
OpenSSL::SSL::SSLContext.method_defined?(:npn_select_cb)
pend "LibreSSL 2.6 has broken NPN functions" if libressl?(2, 6, 1)
ctx_proc = Proc.new { |ctx| ctx.npn_protocols = ["http/1.1"] } ctx_proc = Proc.new { |ctx| ctx.npn_protocols = ["http/1.1"] }
start_server_version(:SSLv23, ctx_proc) { |server, port| start_server_version(:TLSv1_2, ctx_proc) { |port|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.npn_select_cb = -> (protocols) { "a" * 256 } ctx.npn_select_cb = -> (protocols) { "a" * 256 }
assert_handshake_error { server_connect(port, ctx) } assert_handshake_error { server_connect(port, ctx) }
} }
end end
end
def test_invalid_shutdown_by_gc
assert_nothing_raised {
start_server { |server, port|
10.times {
sock = TCPSocket.new("127.0.0.1", port)
ssl = OpenSSL::SSL::SSLSocket.new(sock)
GC.start
ssl.connect
sock.close
}
}
}
end
def test_close_after_socket_close def test_close_after_socket_close
start_server { |server, port| server_proc = proc { |ctx, ssl|
# Do nothing
}
start_server(server_proc: server_proc) { |port|
sock = TCPSocket.new("127.0.0.1", port) sock = TCPSocket.new("127.0.0.1", port)
ssl = OpenSSL::SSL::SSLSocket.new(sock) ssl = OpenSSL::SSL::SSLSocket.new(sock)
ssl.sync_close = true ssl.sync_close = true
@ -1047,84 +1020,90 @@ end
} }
end end
def test_close_and_socket_close_while_connecting
# test it doesn't cause a segmentation fault
ctx = OpenSSL::SSL::SSLContext.new
ctx.ciphers = "aNULL"
ctx.tmp_dh_callback = proc { OpenSSL::TestUtils::TEST_KEY_DH1024 }
ctx.security_level = 0
sock1, sock2 = socketpair
ssl1 = OpenSSL::SSL::SSLSocket.new(sock1, ctx)
ssl2 = OpenSSL::SSL::SSLSocket.new(sock2, ctx)
t = Thread.new { ssl1.connect }
ssl2.accept
ssl1.close
sock1.close
t.value rescue nil
ensure
ssl1.close if ssl1
ssl2.close if ssl2
sock1.close if sock1
sock2.close if sock2
end
def test_get_ephemeral_key def test_get_ephemeral_key
return unless OpenSSL::SSL::SSLSocket.method_defined?(:tmp_key) # OpenSSL >= 1.0.2
pkey = OpenSSL::PKey unless OpenSSL::SSL::SSLSocket.method_defined?(:tmp_key)
ciphers = { pend "SSL_get_server_tmp_key() is not supported"
'ECDHE-RSA-AES128-SHA' => (pkey::EC if defined?(pkey::EC)), end
'DHE-RSA-AES128-SHA' => (pkey::DH if defined?(pkey::DH)),
'AES128-SHA' => nil if tls12_supported?
# kRSA
ctx_proc1 = proc { |ctx|
ctx.ssl_version = :TLSv1_2
ctx.ciphers = "kRSA"
} }
conf_proc = Proc.new { |ctx| ctx.ciphers = 'ALL' } start_server(ctx_proc: ctx_proc1) do |port|
start_server(ctx_proc: conf_proc) do |server, port|
ciphers.each do |cipher, ephemeral|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
begin ctx.ssl_version = :TLSv1_2
ctx.ciphers = cipher ctx.ciphers = "kRSA"
rescue OpenSSL::SSL::SSLError => e server_connect(port, ctx) { |ssl| assert_nil ssl.tmp_key }
next if /no cipher match/ =~ e.message
raise
end
server_connect(port, ctx) do |ssl|
if ephemeral
assert_instance_of(ephemeral, ssl.tmp_key)
else
assert_nil(ssl.tmp_key)
end end
end end
if defined?(OpenSSL::PKey::DH) && tls12_supported?
# DHE
# TODO: How to test this with TLS 1.3?
ctx_proc2 = proc { |ctx|
ctx.ssl_version = :TLSv1_2
ctx.ciphers = "EDH"
}
start_server(ctx_proc: ctx_proc2) do |port|
ctx = OpenSSL::SSL::SSLContext.new
ctx.ssl_version = :TLSv1_2
ctx.ciphers = "EDH"
server_connect(port, ctx) { |ssl|
assert_instance_of OpenSSL::PKey::DH, ssl.tmp_key
}
end
end
if defined?(OpenSSL::PKey::EC)
# ECDHE
ctx_proc3 = proc { |ctx|
ctx.ciphers = "DEFAULT:!kRSA:!kEDH"
ctx.ecdh_curves = "P-256"
}
start_server(ctx_proc: ctx_proc3) do |port|
ctx = OpenSSL::SSL::SSLContext.new
ctx.ciphers = "DEFAULT:!kRSA:!kEDH"
server_connect(port, ctx) { |ssl|
assert_instance_of OpenSSL::PKey::EC, ssl.tmp_key
}
end end
end end
end end
def test_dh_callback def test_dh_callback
pend "TLS 1.2 is not supported" unless tls12_supported?
called = false called = false
ctx_proc = -> ctx { ctx_proc = -> ctx {
ctx.ssl_version = :TLSv1_2
ctx.ciphers = "DH:!NULL" ctx.ciphers = "DH:!NULL"
ctx.tmp_dh_callback = ->(*args) { ctx.tmp_dh_callback = ->(*args) {
called = true called = true
OpenSSL::TestUtils::TEST_KEY_DH1024 Fixtures.pkey_dh("dh1024")
} }
} }
start_server(ctx_proc: ctx_proc) do |server, port| start_server(ctx_proc: ctx_proc) do |port|
server_connect(port) { |ssl| server_connect(port) { |ssl|
assert called, "dh callback should be called" assert called, "dh callback should be called"
if ssl.respond_to?(:tmp_key) if ssl.respond_to?(:tmp_key)
assert_equal OpenSSL::TestUtils::TEST_KEY_DH1024.to_der, ssl.tmp_key.to_der assert_equal Fixtures.pkey_dh("dh1024").to_der, ssl.tmp_key.to_der
end end
} }
end end
end end
def test_connect_works_when_setting_dh_callback_to_nil def test_connect_works_when_setting_dh_callback_to_nil
pend "TLS 1.2 is not supported" unless tls12_supported?
ctx_proc = -> ctx { ctx_proc = -> ctx {
ctx.ssl_version = :TLSv1_2
ctx.ciphers = "DH:!NULL" # use DH ctx.ciphers = "DH:!NULL" # use DH
ctx.tmp_dh_callback = nil ctx.tmp_dh_callback = nil
} }
start_server(ctx_proc: ctx_proc) do |server, port| start_server(ctx_proc: ctx_proc) do |port|
EnvUtil.suppress_warning { # uses default callback EnvUtil.suppress_warning { # uses default callback
assert_nothing_raised { assert_nothing_raised {
server_connect(port) { } server_connect(port) { }
@ -1133,73 +1112,55 @@ end
end end
end end
def test_ecdh_callback def test_tmp_ecdh_callback
return unless OpenSSL::SSL::SSLContext.instance_methods.include?(:tmp_ecdh_callback) pend "EC is disabled" unless defined?(OpenSSL::PKey::EC)
pend "tmp_ecdh_callback is not supported" unless \
OpenSSL::SSL::SSLContext.method_defined?(:tmp_ecdh_callback)
pend "LibreSSL 2.6 has broken SSL_CTX_set_tmp_ecdh_callback()" \
if libressl?(2, 6, 1)
EnvUtil.suppress_warning do # tmp_ecdh_callback is deprecated (2016-05) EnvUtil.suppress_warning do # tmp_ecdh_callback is deprecated (2016-05)
begin
called = false called = false
ctx2 = OpenSSL::SSL::SSLContext.new ctx_proc = -> ctx {
ctx2.ciphers = "ECDH" ctx.ciphers = "DEFAULT:!kRSA:!kEDH"
# OpenSSL 1.1.0 doesn't have tmp_ecdh_callback so this shouldn't be required ctx.tmp_ecdh_callback = -> (*args) {
ctx2.security_level = 0
ctx2.tmp_ecdh_callback = ->(*args) {
called = true called = true
OpenSSL::PKey::EC.new "prime256v1" OpenSSL::PKey::EC.new "prime256v1"
} }
}
sock1, sock2 = socketpair start_server(ctx_proc: ctx_proc) do |port|
server_connect(port) { |s|
s2 = OpenSSL::SSL::SSLSocket.new(sock2, ctx2) assert called, "tmp_ecdh_callback should be called"
ctx1 = OpenSSL::SSL::SSLContext.new }
ctx1.ciphers = "ECDH"
ctx1.security_level = 0
s1 = OpenSSL::SSL::SSLSocket.new(sock1, ctx1)
th = Thread.new do
s1.connect
end
s2.accept
assert called, 'ecdh callback should be called'
rescue OpenSSL::SSL::SSLError => e
if e.message =~ /no cipher match/
pend "ECDH cipher not supported."
else
raise e
end
ensure
th.join if th
s1.close if s1
s2.close if s2
sock1.close if sock1
sock2.close if sock2
end end
end end
end end
def test_ecdh_curves def test_ecdh_curves
pend "EC is disabled" unless defined?(OpenSSL::PKey::EC)
ctx_proc = -> ctx { ctx_proc = -> ctx {
begin # Enable both ECDHE (~ TLS 1.2) cipher suites and TLS 1.3
ctx.ciphers = "ECDH:!NULL" ctx.ciphers = "DEFAULT:!kRSA:!kEDH"
rescue OpenSSL::SSL::SSLError
pend "ECDH is not enabled in this OpenSSL" if $!.message =~ /no cipher match/
raise
end
ctx.ecdh_curves = "P-384:P-521" ctx.ecdh_curves = "P-384:P-521"
} }
start_server(ctx_proc: ctx_proc, ignore_listener_error: true) do |server, port| start_server(ctx_proc: ctx_proc, ignore_listener_error: true) do |port|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.ecdh_curves = "P-256:P-384" # disable P-521 for OpenSSL >= 1.0.2 ctx.ecdh_curves = "P-256:P-384" # disable P-521 for OpenSSL >= 1.0.2
server_connect(port, ctx) { |ssl| server_connect(port, ctx) { |ssl|
assert ssl.cipher[0].start_with?("ECDH"), "ECDH should be used" cs = ssl.cipher[0]
if /\ATLS/ =~ cs # Is TLS 1.3 is used?
assert_equal "secp384r1", ssl.tmp_key.group.curve_name
else
assert_match (/\AECDH/), cs
if ssl.respond_to?(:tmp_key) if ssl.respond_to?(:tmp_key)
assert_equal "secp384r1", ssl.tmp_key.group.curve_name assert_equal "secp384r1", ssl.tmp_key.group.curve_name
end end
end
} }
if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10002000 && if openssl?(1, 0, 2) || libressl?(2, 5, 1)
!OpenSSL::OPENSSL_VERSION.include?("LibreSSL")
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.ecdh_curves = "P-256" ctx.ecdh_curves = "P-256"
@ -1226,10 +1187,10 @@ end
return return
end end
assert_equal(1, ctx.security_level) assert_equal(1, ctx.security_level)
# assert_raise(OpenSSL::SSL::SSLError) { ctx.key = OpenSSL::TestUtils::TEST_KEY_DSA512 } # assert_raise(OpenSSL::SSL::SSLError) { ctx.key = Fixtures.pkey("dsa512") }
# ctx.key = OpenSSL::TestUtils::TEST_KEY_RSA1024 # ctx.key = Fixtures.pkey("rsa1024")
# ctx.security_level = 2 # ctx.security_level = 2
# assert_raise(OpenSSL::SSL::SSLError) { ctx.key = OpenSSL::TestUtils::TEST_KEY_RSA1024 } # assert_raise(OpenSSL::SSL::SSLError) { ctx.key = Fixtures.pkey("rsa1024") }
pend "FIXME: SSLContext#key= currently does not raise because SSL_CTX_use_certificate() is delayed" pend "FIXME: SSLContext#key= currently does not raise because SSL_CTX_use_certificate() is delayed"
end end
@ -1248,7 +1209,7 @@ end
def test_freeze_calls_setup def test_freeze_calls_setup
bug = "[ruby/openssl#85]" bug = "[ruby/openssl#85]"
start_server(ignore_listener_error: true) { |server, port| start_server(ignore_listener_error: true) { |port|
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
ctx.freeze ctx.freeze
@ -1274,7 +1235,7 @@ end
) )
end end
def server_connect(port, ctx=nil) def server_connect(port, ctx = nil)
sock = TCPSocket.new("127.0.0.1", port) sock = TCPSocket.new("127.0.0.1", port)
ssl = ctx ? OpenSSL::SSL::SSLSocket.new(sock, ctx) : OpenSSL::SSL::SSLSocket.new(sock) ssl = ctx ? OpenSSL::SSL::SSLSocket.new(sock, ctx) : OpenSSL::SSL::SSLSocket.new(sock)
ssl.sync_close = true ssl.sync_close = true

385
test/openssl/test_ssl_session.rb
View file

@ -4,54 +4,12 @@ require_relative "utils"
if defined?(OpenSSL::TestUtils) if defined?(OpenSSL::TestUtils)
class OpenSSL::TestSSLSession < OpenSSL::SSLTestCase class OpenSSL::TestSSLSession < OpenSSL::SSLTestCase
def test_session_equals
session = OpenSSL::SSL::Session.new <<-SESSION
-----BEGIN SSL SESSION PARAMETERS-----
MIIDFgIBAQICAwEEAgA5BCCY3pW6iTkPoD5SENuztz/gZjhvey6XnHbsxd22k0Ol
dgQw8uaN3hCRnlhoIKPWInCFzrp/tQsDRFs9jDjc9pwpy/oKHmJdQQMQA1g8FYnO
gpdVoQYCBE52ikKiBAICASyjggKOMIICijCCAXKgAwIBAgIBAjANBgkqhkiG9w0B
AQUFADA9MRMwEQYKCZImiZPyLGQBGRYDb3JnMRkwFwYKCZImiZPyLGQBGRYJcnVi
eS1sYW5nMQswCQYDVQQDDAJDQTAeFw0xMTA5MTkwMDE4MTBaFw0xMTA5MTkwMDQ4
MTBaMEQxEzARBgoJkiaJk/IsZAEZFgNvcmcxGTAXBgoJkiaJk/IsZAEZFglydWJ5
LWxhbmcxEjAQBgNVBAMMCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
gYkCgYEAy8LEsNRApz7U/j5DoB4XBgO9Z8Atv5y/OVQRp0ag8Tqo1YewsWijxEWB
7JOATwpBN267U4T1nPZIxxEEO7n/WNa2ws9JWsjah8ssEBFSxZqdXKSLf0N4Hi7/
GQ/aYoaMCiQ8jA4jegK2FJmXM71uPe+jFN/peeBOpRfyXxRFOYcCAwEAAaMSMBAw
DgYDVR0PAQH/BAQDAgWgMA0GCSqGSIb3DQEBBQUAA4IBAQARC7GP7InX1t7VEXz2
I8RI57S0/HSJL4fDIYP3zFpitHX1PZeo+7XuzMilvPjjBo/ky9Jzo8TYiY+N+JEz
mY/A/zPA4ZsJ7KYj6/FEdIc/vRlS0CvsbClbNjw1jl/PoB2FLr2b3uuBcZEsyZeP
yq154ijq37Ajf8K5Mi5FgshoP41BPtRPj+VVf61rv1IcEnNWdDCS6DR4XsaNC+zt
G6AqCqkytIXWRuDw6n6vYLF3A/tn2sldLo7/scY0PMDNbo63O/LTxkDHmPhSkD68
8m9SsMeTR+RCiDEZWFPVcAH/8mDfi+5k8uN3qS+gOU/PPrmHGgl5ykiSFgqs4v61
tddwpBAEDjcwMzA5NTYzMTU1MzAwpQMCARM=
-----END SSL SESSION PARAMETERS-----
SESSION
start_server(ignore_listener_error: true) { |_, port|
ctx = OpenSSL::SSL::SSLContext.new
ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT
ctx.session_id_context = self.object_id.to_s
sock = TCPSocket.new '127.0.0.1', port
begin
ssl = OpenSSL::SSL::SSLSocket.new sock, ctx
ssl.session = session
assert_equal session, ssl.session
ensure
sock.close
end
}
end
def test_session def test_session
Timeout.timeout(5) do pend "TLS 1.2 is not supported" unless tls12_supported?
start_server do |server, port|
sock = TCPSocket.new("127.0.0.1", port) ctx_proc = proc { |ctx| ctx.ssl_version = :TLSv1_2 }
ctx = OpenSSL::SSL::SSLContext.new start_server(ctx_proc: ctx_proc) do |port|
ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx) server_connect_with_session(port, nil, nil) { |ssl|
ssl.sync_close = true
ssl.connect
session = ssl.session session = ssl.session
assert(session == OpenSSL::SSL::Session.new(session.to_pem)) assert(session == OpenSSL::SSL::Session.new(session.to_pem))
assert(session == OpenSSL::SSL::Session.new(ssl)) assert(session == OpenSSL::SSL::Session.new(ssl))
@ -68,8 +26,7 @@ tddwpBAEDjcwMzA5NTYzMTU1MzAwpQMCARM=
pem.gsub!(/-----(BEGIN|END) SSL SESSION PARAMETERS-----/, '').gsub!(/[\r\n]+/m, '') pem.gsub!(/-----(BEGIN|END) SSL SESSION PARAMETERS-----/, '').gsub!(/[\r\n]+/m, '')
assert_equal(session.to_der, pem.unpack('m*')[0]) assert_equal(session.to_der, pem.unpack('m*')[0])
assert_not_nil(session.to_text) assert_not_nil(session.to_text)
ssl.close }
end
end end
end end
@ -150,229 +107,267 @@ __EOS__
def test_session_exts_read def test_session_exts_read
assert(OpenSSL::SSL::Session.new(DUMMY_SESSION)) assert(OpenSSL::SSL::Session.new(DUMMY_SESSION))
end if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x009080bf
def test_client_session
last_session = nil
start_server do |server, port|
2.times do
sock = TCPSocket.new("127.0.0.1", port)
ctx = OpenSSL::SSL::SSLContext.new
ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
ssl.sync_close = true
ssl.session = last_session if last_session
ssl.connect
session = ssl.session
if last_session
assert(ssl.session_reused?)
assert_equal(session.id, last_session.id)
assert_equal(session.to_pem, last_session.to_pem)
assert_equal(session.to_der, last_session.to_der)
# Older version of OpenSSL may not be consistent. Look up which versions later.
assert_equal(session.to_text, last_session.to_text)
else
assert(!ssl.session_reused?)
end
last_session = session
str = "x" * 100 + "\n"
ssl.puts(str)
assert_equal(str, ssl.gets)
ssl.close
end
end
end end
def test_server_session def test_resumption
connections = 0 non_resumable = nil
start_server { |port|
server_connect_with_session(port, nil, nil) { |ssl|
non_resumable = ssl.session
}
}
ctx_proc = proc { |ctx|
ctx.options &= ~OpenSSL::SSL::OP_NO_TICKET
# Disable server-side session cache which is enabled by default
ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_OFF
}
start_server(ctx_proc: ctx_proc) do |port|
sess1 = server_connect_with_session(port, nil, nil) { |ssl|
ssl.puts("abc"); assert_equal "abc\n", ssl.gets
assert_equal false, ssl.session_reused?
ssl.session
}
server_connect_with_session(port, nil, non_resumable) { |ssl|
ssl.puts("abc"); assert_equal "abc\n", ssl.gets
assert_equal false, ssl.session_reused?
}
server_connect_with_session(port, nil, sess1) { |ssl|
ssl.puts("abc"); assert_equal "abc\n", ssl.gets
assert_equal true, ssl.session_reused?
}
end
end
def test_server_session_cache
pend "TLS 1.2 is not supported" unless tls12_supported?
ctx_proc = Proc.new do |ctx|
ctx.ssl_version = :TLSv1_2
ctx.options |= OpenSSL::SSL::OP_NO_TICKET
end
connections = nil
saved_session = nil saved_session = nil
ctx_proc = Proc.new do |ctx, ssl|
# add test for session callbacks here
end
server_proc = Proc.new do |ctx, ssl| server_proc = Proc.new do |ctx, ssl|
session = ssl.session
stats = ctx.session_cache_stats stats = ctx.session_cache_stats
case connections case connections
when 0 when 0
assert_equal(stats[:cache_num], 1) assert_equal false, ssl.session_reused?
assert_equal(stats[:cache_hits], 0) assert_equal 1, stats[:cache_num]
assert_equal(stats[:cache_misses], 0) assert_equal 0, stats[:cache_hits]
assert(!ssl.session_reused?) assert_equal 0, stats[:cache_misses]
when 1 when 1
assert_equal(stats[:cache_num], 1) assert_equal true, ssl.session_reused?
assert_equal(stats[:cache_hits], 1) assert_equal 1, stats[:cache_num]
assert_equal(stats[:cache_misses], 0) assert_equal 1, stats[:cache_hits]
assert(ssl.session_reused?) assert_equal 0, stats[:cache_misses]
ctx.session_remove(session)
saved_session = session.to_der saved_session = ssl.session
assert_equal true, ctx.session_remove(ssl.session)
when 2 when 2
assert_equal(stats[:cache_num], 1) assert_equal false, ssl.session_reused?
assert_equal(stats[:cache_hits], 1) assert_equal 1, stats[:cache_num]
assert_equal(stats[:cache_misses], 1) assert_equal 1, stats[:cache_hits]
assert(!ssl.session_reused?) assert_equal 1, stats[:cache_misses]
ctx.session_add(OpenSSL::SSL::Session.new(saved_session))
assert_equal true, ctx.session_add(saved_session.dup)
when 3 when 3
assert_equal(stats[:cache_num], 2) assert_equal true, ssl.session_reused?
assert_equal(stats[:cache_hits], 2) assert_equal 2, stats[:cache_num]
assert_equal(stats[:cache_misses], 1) assert_equal 2, stats[:cache_hits]
assert(ssl.session_reused?) assert_equal 1, stats[:cache_misses]
ctx.flush_sessions(Time.now + 10000) ctx.flush_sessions(Time.now + 10000)
when 4 when 4
assert_equal(stats[:cache_num], 1) assert_equal false, ssl.session_reused?
assert_equal(stats[:cache_hits], 2) assert_equal 1, stats[:cache_num]
assert_equal(stats[:cache_misses], 2) assert_equal 2, stats[:cache_hits]
assert(!ssl.session_reused?) assert_equal 2, stats[:cache_misses]
ctx.session_add(OpenSSL::SSL::Session.new(saved_session))
assert_equal true, ctx.session_add(saved_session.dup)
end end
connections += 1
readwrite_loop(ctx, ssl) readwrite_loop(ctx, ssl)
end end
start_server(ctx_proc: ctx_proc, server_proc: server_proc) do |port|
first_session = nil first_session = nil
start_server(ctx_proc: ctx_proc, server_proc: server_proc) do |server, port|
10.times do |i| 10.times do |i|
sock = TCPSocket.new("127.0.0.1", port) connections = i
ctx = OpenSSL::SSL::SSLContext.new server_connect_with_session(port, nil, first_session) { |ssl|
# disable RFC4507 support ssl.puts("abc"); assert_equal "abc\n", ssl.gets
ctx.options = OpenSSL::SSL::OP_NO_TICKET first_session ||= ssl.session
ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
ssl.sync_close = true
ssl.session = first_session if first_session
ssl.connect
session = ssl.session case connections
if first_session when 0;
case i when 1; assert_equal true, ssl.session_reused?
when 1; assert(ssl.session_reused?) when 2; assert_equal false, ssl.session_reused?
when 2; assert(!ssl.session_reused?) when 3; assert_equal true, ssl.session_reused?
when 3; assert(ssl.session_reused?) when 4; assert_equal false, ssl.session_reused?
when 4; assert(!ssl.session_reused?) when 5..9; assert_equal true, ssl.session_reused?
when 5..10; assert(ssl.session_reused?)
end end
end }
first_session ||= session
str = "x" * 100 + "\n"
ssl.puts(str)
assert_equal(str, ssl.gets)
ssl.close
end end
end end
end end
def test_ctx_client_session_cb def test_ctx_client_session_cb
pend "TLS 1.2 is not supported" unless tls12_supported?
ctx_proc = proc { |ctx| ctx.ssl_version = :TLSv1_2 }
start_server(ctx_proc: ctx_proc) do |port|
called = {} called = {}
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT
ctx.session_new_cb = lambda { |ary| ctx.session_new_cb = lambda { |ary|
sock, sess = ary sock, sess = ary
called[:new] = [sock, sess] called[:new] = [sock, sess]
} }
ctx.session_remove_cb = lambda { |ary| ctx.session_remove_cb = lambda { |ary|
ctx, sess = ary ctx, sess = ary
called[:remove] = [ctx, sess] called[:remove] = [ctx, sess]
# any resulting value is OK (ignored) # any resulting value is OK (ignored)
} }
start_server do |server, port| server_connect_with_session(port, ctx, nil) { |ssl|
sock = TCPSocket.new("127.0.0.1", port)
begin
ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
ssl.sync_close = true
ssl.connect
assert_equal(1, ctx.session_cache_stats[:cache_num]) assert_equal(1, ctx.session_cache_stats[:cache_num])
assert_equal(1, ctx.session_cache_stats[:connect_good]) assert_equal(1, ctx.session_cache_stats[:connect_good])
assert_equal([ssl, ssl.session], called[:new]) assert_equal([ssl, ssl.session], called[:new])
assert(ctx.session_remove(ssl.session)) assert(ctx.session_remove(ssl.session))
assert(!ctx.session_remove(ssl.session)) assert(!ctx.session_remove(ssl.session))
assert_equal([ctx, ssl.session], called[:remove]) assert_equal([ctx, ssl.session], called[:remove])
ssl.close }
ensure
sock.close if !sock.closed?
end
end end
end end
def test_ctx_server_session_cb def test_ctx_server_session_cb
called = {} pend "TLS 1.2 is not supported" unless tls12_supported?
ctx_proc = Proc.new { |ctx, ssl| connections = nil
ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_SERVER called = {}
ctx.options = OpenSSL::SSL::OP_NO_TICKET sctx = nil
last_server_session = nil ctx_proc = Proc.new { |ctx|
sctx = ctx
ctx.ssl_version = :TLSv1_2
ctx.options |= OpenSSL::SSL::OP_NO_TICKET
# get_cb is called whenever a client proposed to resume a session but # get_cb is called whenever a client proposed to resume a session but
# the session could not be found in the internal session cache. # the session could not be found in the internal session cache.
last_server_session = nil
ctx.session_get_cb = lambda { |ary| ctx.session_get_cb = lambda { |ary|
sess, data = ary _sess, data = ary
if last_server_session called[:get] = data
called[:get2] = [sess, data]
last_server_session if connections == 2
last_server_session.dup
else else
called[:get1] = [sess, data]
last_server_session = sess
nil nil
end end
} }
ctx.session_new_cb = lambda { |ary| ctx.session_new_cb = lambda { |ary|
sock, sess = ary _sock, sess = ary
called[:new] = [sock, sess] called[:new] = sess
# SSL server doesn't cache sessions so get_cb is called next time. last_server_session = sess
ctx.session_remove(sess)
} }
ctx.session_remove_cb = lambda { |ary| ctx.session_remove_cb = lambda { |ary|
ctx, sess = ary _ctx, sess = ary
called[:remove] = [ctx, sess] called[:remove] = sess
} }
} }
start_server(ctx_proc: ctx_proc) do |port|
server_proc = Proc.new { |c, ssl| connections = 0
sess0 = server_connect_with_session(port, nil, nil) { |ssl|
ssl.puts("abc"); assert_equal "abc\n", ssl.gets
assert_equal false, ssl.session_reused?
ssl.session ssl.session
c.session_cache_stats
readwrite_loop(c, ssl)
} }
start_server(ctx_proc: ctx_proc, server_proc: server_proc) do |server, port| assert_nil called[:get]
last_client_session = nil assert_not_nil called[:new]
3.times do assert_equal sess0.id, called[:new].id
sock = TCPSocket.new("127.0.0.1", port) assert_nil called[:remove]
begin called.clear
ssl = OpenSSL::SSL::SSLSocket.new(sock, OpenSSL::SSL::SSLContext.new())
ssl.sync_close = true # Internal cache hit
ssl.session = last_client_session if last_client_session connections = 1
ssl.connect server_connect_with_session(port, nil, sess0.dup) { |ssl|
last_client_session = ssl.session ssl.puts("abc"); assert_equal "abc\n", ssl.gets
ssl.close assert_equal true, ssl.session_reused?
Timeout.timeout(5) do ssl.session
Thread.pass until called.key?(:new) }
assert(called.delete(:new)) assert_nil called[:get]
Thread.pass until called.key?(:remove) assert_nil called[:new]
assert(called.delete(:remove)) assert_nil called[:remove]
called.clear
sctx.flush_sessions(Time.now + 10000)
assert_not_nil called[:remove]
assert_equal sess0.id, called[:remove].id
called.clear
# External cache hit
connections = 2
sess2 = server_connect_with_session(port, nil, sess0.dup) { |ssl|
ssl.puts("abc"); assert_equal "abc\n", ssl.gets
if !ssl.session_reused? && openssl?(1, 1, 0) && !openssl?(1, 1, 0, 7)
# OpenSSL >= 1.1.0, < 1.1.0g
pend "External session cache is not working; " \
"see https://github.com/openssl/openssl/pull/4014"
end end
ensure assert_equal true, ssl.session_reused?
sock.close if !sock.closed? ssl.session
}
assert_equal sess0.id, sess2.id
assert_equal sess0.id, called[:get]
assert_nil called[:new]
assert_nil called[:remove]
called.clear
sctx.flush_sessions(Time.now + 10000)
assert_not_nil called[:remove]
assert_equal sess0.id, called[:remove].id
called.clear
# Cache miss
connections = 3
sess3 = server_connect_with_session(port, nil, sess0.dup) { |ssl|
ssl.puts("abc"); assert_equal "abc\n", ssl.gets
assert_equal false, ssl.session_reused?
ssl.session
}
assert_not_equal sess0.id, sess3.id
assert_equal sess0.id, called[:get]
assert_not_nil called[:new]
assert_equal sess3.id, called[:new].id
assert_nil called[:remove]
end end
end end
end
assert(called[:get1])
assert(called[:get2])
end
def test_dup def test_dup
sess_orig = OpenSSL::SSL::Session.new(DUMMY_SESSION) sess_orig = OpenSSL::SSL::Session.new(DUMMY_SESSION)
sess_dup = sess_orig.dup sess_dup = sess_orig.dup
assert_equal(sess_orig.to_der, sess_dup.to_der) assert_equal(sess_orig.to_der, sess_dup.to_der)
end end
private
def server_connect_with_session(port, ctx = nil, sess = nil)
sock = TCPSocket.new("127.0.0.1", port)
ctx ||= OpenSSL::SSL::SSLContext.new
ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
ssl.session = sess if sess
ssl.sync_close = true
ssl.connect
yield ssl if block_given?
ensure
ssl&.close
sock&.close
end
end end
end end

12
test/openssl/test_x509cert.rb
View file

@ -6,18 +6,14 @@ if defined?(OpenSSL::TestUtils)
class OpenSSL::TestX509Certificate < OpenSSL::TestCase class OpenSSL::TestX509Certificate < OpenSSL::TestCase
def setup def setup
super super
@rsa1024 = OpenSSL::TestUtils::TEST_KEY_RSA1024 @rsa1024 = Fixtures.pkey("rsa1024")
@rsa2048 = OpenSSL::TestUtils::TEST_KEY_RSA2048 @rsa2048 = Fixtures.pkey("rsa2048")
@dsa256 = OpenSSL::TestUtils::TEST_KEY_DSA256 @dsa256 = Fixtures.pkey("dsa256")
@dsa512 = OpenSSL::TestUtils::TEST_KEY_DSA512 @dsa512 = Fixtures.pkey("dsa512")
@ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA") @ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
@ee1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE1") @ee1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE1")
end end
def issue_cert(*args)
OpenSSL::TestUtils.issue_cert(*args)
end
def test_serial def test_serial
[1, 2**32, 2**100].each{|s| [1, 2**32, 2**100].each{|s|
cert = issue_cert(@ca, @rsa2048, s, [], nil, nil) cert = issue_cert(@ca, @rsa2048, s, [], nil, nil)

16
test/openssl/test_x509crl.rb
View file

@ -6,23 +6,15 @@ if defined?(OpenSSL::TestUtils)
class OpenSSL::TestX509CRL < OpenSSL::TestCase class OpenSSL::TestX509CRL < OpenSSL::TestCase
def setup def setup
super super
@rsa1024 = OpenSSL::TestUtils::TEST_KEY_RSA1024 @rsa1024 = Fixtures.pkey("rsa1024")
@rsa2048 = OpenSSL::TestUtils::TEST_KEY_RSA2048 @rsa2048 = Fixtures.pkey("rsa2048")
@dsa256 = OpenSSL::TestUtils::TEST_KEY_DSA256 @dsa256 = Fixtures.pkey("dsa256")
@dsa512 = OpenSSL::TestUtils::TEST_KEY_DSA512 @dsa512 = Fixtures.pkey("dsa512")
@ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA") @ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
@ee1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE1") @ee1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE1")
@ee2 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE2") @ee2 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE2")
end end
def issue_crl(*args)
OpenSSL::TestUtils.issue_crl(*args)
end
def issue_cert(*args)
OpenSSL::TestUtils.issue_cert(*args)
end
def test_basic def test_basic
now = Time.at(Time.now.to_i) now = Time.at(Time.now.to_i)

1
test/openssl/test_x509name.rb
View file

@ -306,7 +306,6 @@ class OpenSSL::TestX509Name < OpenSSL::TestCase
end end
def test_add_entry_street def test_add_entry_street
return if OpenSSL::OPENSSL_VERSION_NUMBER < 0x009080df # 0.9.8m
# openssl/crypto/objects/obj_mac.h 1.83 # openssl/crypto/objects/obj_mac.h 1.83
dn = [ dn = [
["DC", "org"], ["DC", "org"],

8
test/openssl/test_x509req.rb
View file

@ -6,10 +6,10 @@ if defined?(OpenSSL::TestUtils)
class OpenSSL::TestX509Request < OpenSSL::TestCase class OpenSSL::TestX509Request < OpenSSL::TestCase
def setup def setup
super super
@rsa1024 = OpenSSL::TestUtils::TEST_KEY_RSA1024 @rsa1024 = Fixtures.pkey("rsa1024")
@rsa2048 = OpenSSL::TestUtils::TEST_KEY_RSA2048 @rsa2048 = Fixtures.pkey("rsa2048")
@dsa256 = OpenSSL::TestUtils::TEST_KEY_DSA256 @dsa256 = Fixtures.pkey("dsa256")
@dsa512 = OpenSSL::TestUtils::TEST_KEY_DSA512 @dsa512 = Fixtures.pkey("dsa512")
@dn = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=GOTOU Yuuzou") @dn = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=GOTOU Yuuzou")
end end

26
test/openssl/test_x509store.rb
View file

@ -6,10 +6,10 @@ if defined?(OpenSSL::TestUtils)
class OpenSSL::TestX509Store < OpenSSL::TestCase class OpenSSL::TestX509Store < OpenSSL::TestCase
def setup def setup
super super
@rsa1024 = OpenSSL::TestUtils::TEST_KEY_RSA1024 @rsa1024 = Fixtures.pkey("rsa1024")
@rsa2048 = OpenSSL::TestUtils::TEST_KEY_RSA2048 @rsa2048 = Fixtures.pkey("rsa2048")
@dsa256 = OpenSSL::TestUtils::TEST_KEY_DSA256 @dsa256 = Fixtures.pkey("dsa256")
@dsa512 = OpenSSL::TestUtils::TEST_KEY_DSA512 @dsa512 = Fixtures.pkey("dsa512")
@ca1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA1") @ca1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA1")
@ca2 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA2") @ca2 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA2")
@ee1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE1") @ee1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE1")
@ -26,14 +26,6 @@ class OpenSSL::TestX509Store < OpenSSL::TestCase
ctx.verify ctx.verify
end end
def issue_cert(*args)
OpenSSL::TestUtils.issue_cert(*args)
end
def issue_crl(*args)
OpenSSL::TestUtils.issue_crl(*args)
end
def test_add_file def test_add_file
ca_exts = [ ca_exts = [
["basicConstraints", "CA:TRUE", true], ["basicConstraints", "CA:TRUE", true],
@ -217,7 +209,7 @@ class OpenSSL::TestX509Store < OpenSSL::TestCase
end end
def test_set_errors def test_set_errors
return if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10100000 return if openssl?(1, 1, 0) || libressl?
now = Time.now now = Time.now
ca1_cert = issue_cert(@ca1, @rsa2048, 1, [], nil, nil) ca1_cert = issue_cert(@ca1, @rsa2048, 1, [], nil, nil)
store = OpenSSL::X509::Store.new store = OpenSSL::X509::Store.new
@ -233,18 +225,10 @@ class OpenSSL::TestX509Store < OpenSSL::TestCase
crl2 = issue_crl(revoke_info, 2, now+1800, now+3600, [], crl2 = issue_crl(revoke_info, 2, now+1800, now+3600, [],
ca1_cert, @rsa2048, OpenSSL::Digest::SHA1.new) ca1_cert, @rsa2048, OpenSSL::Digest::SHA1.new)
store.add_crl(crl1) store.add_crl(crl1)
if /0\.9\.8.*-rhel/ =~ OpenSSL::OPENSSL_VERSION
# RedHat is distributing a patched version of OpenSSL that allows
# multiple CRL for a key (multi-crl.patch)
assert_nothing_raised do
store.add_crl(crl2) # add CRL issued by same CA twice.
end
else
assert_raise(OpenSSL::X509::StoreError){ assert_raise(OpenSSL::X509::StoreError){
store.add_crl(crl2) # add CRL issued by same CA twice. store.add_crl(crl2) # add CRL issued by same CA twice.
} }
end end
end
def test_dup def test_dup
store = OpenSSL::X509::Store.new store = OpenSSL::X509::Store.new

4
test/openssl/ut_eof.rb
View file

@ -1,6 +1,8 @@
# frozen_string_literal: false # frozen_string_literal: false
require 'test/unit' require 'test/unit'
if defined?(OpenSSL::TestUtils)
module OpenSSL::TestEOF module OpenSSL::TestEOF
def test_eof_0 def test_eof_0
open_file("") {|f| open_file("") {|f|
@ -127,3 +129,5 @@ module OpenSSL::TestEOF
end end
end end
end end
end

282
test/openssl/utils.rb
View file

@ -9,120 +9,52 @@ begin
rescue LoadError rescue LoadError
end end
# Compile OpenSSL with crypto-mdebug and run this test suite with OSSL_MDEBUG=1
# environment variable to enable memory leak check.
if ENV["OSSL_MDEBUG"] == "1"
if OpenSSL.respond_to?(:print_mem_leaks)
OpenSSL.mem_check_start
END {
GC.start
case OpenSSL.print_mem_leaks
when nil
warn "mdebug: check what is printed"
when true
raise "mdebug: memory leaks detected"
end
}
else
warn "OSSL_MDEBUG=1 is specified but OpenSSL is not built with crypto-mdebug"
end
end
require "test/unit" require "test/unit"
require 'tempfile' require "tempfile"
require "rbconfig"
require "socket" require "socket"
require "envutil" require "envutil"
if defined?(OpenSSL) && OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10000000
module OpenSSL::TestUtils module OpenSSL::TestUtils
TEST_KEY_RSA1024 = OpenSSL::PKey::RSA.new <<-_end_of_pem_ module Fixtures
-----BEGIN RSA PRIVATE KEY----- module_function
MIICXgIBAAKBgQDLwsSw1ECnPtT+PkOgHhcGA71nwC2/nL85VBGnRqDxOqjVh7Cx
aKPERYHsk4BPCkE3brtThPWc9kjHEQQ7uf9Y1rbCz0layNqHyywQEVLFmp1cpIt/
Q3geLv8ZD9pihowKJDyMDiN6ArYUmZczvW4976MU3+l54E6lF/JfFEU5hwIDAQAB
AoGBAKSl/MQarye1yOysqX6P8fDFQt68VvtXkNmlSiKOGuzyho0M+UVSFcs6k1L0
maDE25AMZUiGzuWHyaU55d7RXDgeskDMakD1v6ZejYtxJkSXbETOTLDwUWTn618T
gnb17tU1jktUtU67xK/08i/XodlgnQhs6VoHTuCh3Hu77O6RAkEA7+gxqBuZR572
74/akiW/SuXm0SXPEviyO1MuSRwtI87B02D0qgV8D1UHRm4AhMnJ8MCs1809kMQE
JiQUCrp9mQJBANlt2ngBO14us6NnhuAseFDTBzCHXwUUu1YKHpMMmxpnGqaldGgX
sOZB3lgJsT9VlGf3YGYdkLTNVbogQKlKpB8CQQDiSwkb4vyQfDe8/NpU5Not0fII
8jsDUCb+opWUTMmfbxWRR3FBNu8wnym/m19N4fFj8LqYzHX4KY0oVPu6qvJxAkEA
wa5snNekFcqONLIE4G5cosrIrb74sqL8GbGb+KuTAprzj5z1K8Bm0UW9lTjVDjDi
qRYgZfZSL+x1P/54+xTFSwJAY1FxA/N3QPCXCjPh5YqFxAMQs2VVYTfg+t0MEcJD
dPMQD5JX6g5HKnHFg2mZtoXQrWmJSn7p8GJK8yNTopEErA==
-----END RSA PRIVATE KEY-----
_end_of_pem_
TEST_KEY_RSA2048 = OpenSSL::PKey::RSA.new <<-_end_of_pem_ def pkey(name)
-----BEGIN RSA PRIVATE KEY----- OpenSSL::PKey.read(read_file("pkey", name))
MIIEpAIBAAKCAQEAuV9ht9J7k4NBs38jOXvvTKY9gW8nLICSno5EETR1cuF7i4pN end
s9I1QJGAFAX0BEO4KbzXmuOvfCpD3CU+Slp1enenfzq/t/e/1IRW0wkJUJUFQign
4CtrkJL+P07yx18UjyPlBXb81ApEmAB5mrJVSrWmqbjs07JbuS4QQGGXLc+Su96D
kYKmSNVjBiLxVVSpyZfAY3hD37d60uG+X8xdW5v68JkRFIhdGlb6JL8fllf/A/bl
NwdJOhVr9mESHhwGjwfSeTDPfd8ZLE027E5lyAVX9KZYcU00mOX+fdxOSnGqS/8J
DRh0EPHDL15RcJjV2J6vZjPb0rOYGDoMcH+94wIDAQABAoIBAAzsamqfYQAqwXTb
I0CJtGg6msUgU7HVkOM+9d3hM2L791oGHV6xBAdpXW2H8LgvZHJ8eOeSghR8+dgq
PIqAffo4x1Oma+FOg3A0fb0evyiACyrOk+EcBdbBeLo/LcvahBtqnDfiUMQTpy6V
seSoFCwuN91TSCeGIsDpRjbG1vxZgtx+uI+oH5+ytqJOmfCksRDCkMglGkzyfcl0
Xc5CUhIJ0my53xijEUQl19rtWdMnNnnkdbG8PT3LZlOta5Do86BElzUYka0C6dUc
VsBDQ0Nup0P6rEQgy7tephHoRlUGTYamsajGJaAo1F3IQVIrRSuagi7+YpSpCqsW
wORqorkCgYEA7RdX6MDVrbw7LePnhyuaqTiMK+055/R1TqhB1JvvxJ1CXk2rDL6G
0TLHQ7oGofd5LYiemg4ZVtWdJe43BPZlVgT6lvL/iGo8JnrncB9Da6L7nrq/+Rvj
XGjf1qODCK+LmreZWEsaLPURIoR/Ewwxb9J2zd0CaMjeTwafJo1CZvcCgYEAyCgb
aqoWvUecX8VvARfuA593Lsi50t4MEArnOXXcd1RnXoZWhbx5rgO8/ATKfXr0BK/n
h2GF9PfKzHFm/4V6e82OL7gu/kLy2u9bXN74vOvWFL5NOrOKPM7Kg+9I131kNYOw
Ivnr/VtHE5s0dY7JChYWE1F3vArrOw3T00a4CXUCgYEA0SqY+dS2LvIzW4cHCe9k
IQqsT0yYm5TFsUEr4sA3xcPfe4cV8sZb9k/QEGYb1+SWWZ+AHPV3UW5fl8kTbSNb
v4ng8i8rVVQ0ANbJO9e5CUrepein2MPL0AkOATR8M7t7dGGpvYV0cFk8ZrFx0oId
U0PgYDotF/iueBWlbsOM430CgYEAqYI95dFyPI5/AiSkY5queeb8+mQH62sdcCCr
vd/w/CZA/K5sbAo4SoTj8dLk4evU6HtIa0DOP63y071eaxvRpTNqLUOgmLh+D6gS
Cc7TfLuFrD+WDBatBd5jZ+SoHccVrLR/4L8jeodo5FPW05A+9gnKXEXsTxY4LOUC
9bS4e1kCgYAqVXZh63JsMwoaxCYmQ66eJojKa47VNrOeIZDZvd2BPVf30glBOT41
gBoDG3WMPZoQj9pb7uMcrnvs4APj2FIhMU8U15LcPAj59cD6S6rWnAxO8NFK7HQG
4Jxg3JNNf8ErQoCHb1B3oVdXJkmbJkARoDpBKmTCgKtP8ADYLmVPQw==
-----END RSA PRIVATE KEY-----
_end_of_pem_
TEST_KEY_DSA256 = OpenSSL::PKey::DSA.new <<-_end_of_pem_ def pkey_dh(name)
-----BEGIN DSA PRIVATE KEY----- # DH parameters can be read by OpenSSL::PKey.read atm
MIH3AgEAAkEAhk2libbY2a8y2Pt21+YPYGZeW6wzaW2yfj5oiClXro9XMR7XWLkE OpenSSL::PKey::DH.new(read_file("pkey", name))
9B7XxLNFCS2gmCCdMsMW1HulaHtLFQmB2wIVAM43JZrcgpu6ajZ01VkLc93gu/Ed end
AkAOhujZrrKV5CzBKutKLb0GVyVWmdC7InoNSMZEeGU72rT96IjM59YzoqmD0pGM
3I1o4cGqg1D1DfM1rQlnN1eSAkBq6xXfEDwJ1mLNxF6q8Zm/ugFYWR5xcX/3wFiT
b4+EjHP/DbNh9Vm5wcfnDBJ1zKvrMEf2xqngYdrV/3CiGJeKAhRvL57QvJZcQGvn
ISNX5cMzFHRW3Q==
-----END DSA PRIVATE KEY-----
_end_of_pem_
TEST_KEY_DSA512 = OpenSSL::PKey::DSA.new <<-_end_of_pem_ def read_file(category, name)
-----BEGIN DSA PRIVATE KEY----- @file_cache ||= {}
MIH4AgEAAkEA5lB4GvEwjrsMlGDqGsxrbqeFRh6o9OWt6FgTYiEEHaOYhkIxv0Ok @file_cache[[category, name]] ||=
RZPDNwOG997mDjBnvDJ1i56OmS3MbTnovwIVAJgub/aDrSDB4DZGH7UyarcaGy6D File.read(File.join(__dir__, "fixtures", category, name + ".pem"))
AkB9HdFw/3td8K4l1FZHv7TCZeJ3ZLb7dF3TWoGUP003RCqoji3/lHdKoVdTQNuR end
S/m6DlCwhjRjiQ/lBRgCLCcaAkEAjN891JBjzpMj4bWgsACmMggFf57DS0Ti+5++ end
Q1VB8qkJN7rA7/2HrCR3gTsWNb1YhAsnFsoeRscC+LxXoXi9OAIUBG98h4tilg6S
55jreJD3Se3slps=
-----END DSA PRIVATE KEY-----
_end_of_pem_
TEST_KEY_DSA1024 = OpenSSL::PKey::DSA.new <<-_end_of_pem_
-----BEGIN DSA PRIVATE KEY-----
MIIBugIBAAKBgQCH9aAoXvWWThIjkA6D+nI1F9ksF9iDq594rkiGNOT9sPDOdB+n
D+qeeeeloRlj19ymCSADPI0ZLRgkchkAEnY2RnqnhHOjVf/roGgRbW+iQDMbQ9wa
/pvc6/fAbsu1goE1hBYjm98/sZEeXavj8tR56IXnjF1b6Nx0+sgeUKFKEQIVAMiz
4BJUFeTtddyM4uadBM7HKLPRAoGAZdLBSYNGiij7vAjesF5mGUKTIgPd+JKuBEDx
OaBclsgfdoyoF/TMOkIty+PVlYD+//Vl2xnoUEIRaMXHwHfm0r2xUX++oeRaSScg
YizJdUxe5jvBuBszGPRc/mGpb9YvP0sB+FL1KmuxYmdODfCe51zl8uM/CVhouJ3w
DjmRGscCgYAuFlfC7p+e8huCKydfcv/beftqjewiOPpQ3u5uI6KPCtCJPpDhs3+4
IihH2cPsAlqwGF4tlibW1+/z/OZ1AZinPK3y7b2jSJASEaPeEltVzB92hcd1khk2
jTYcmSsV4VddplOPK9czytR/GbbibxsrhhgZUbd8LPbvIgaiadJ1PgIUBnJ/5vN2
CVArsEzlPUCbohPvZnE=
-----END DSA PRIVATE KEY-----
_end_of_pem_
if defined?(OpenSSL::PKey::EC)
TEST_KEY_EC_P256V1 = OpenSSL::PKey::EC.new <<-_end_of_pem_
-----BEGIN EC PRIVATE KEY-----
MHcCAQEEIID49FDqcf1O1eO8saTgG70UbXQw9Fqwseliit2aWhH1oAoGCCqGSM49
AwEHoUQDQgAEFglk2c+oVUIKQ64eZG9bhLNPWB7lSZ/ArK41eGy5wAzU/0G51Xtt
CeBUl+MahZtn9fO1JKdF4qJmS39dXnpENg==
-----END EC PRIVATE KEY-----
_end_of_pem_
end
TEST_KEY_DH1024 = OpenSSL::PKey::DH.new <<-_end_of_pem_
-----BEGIN DH PARAMETERS-----
MIGHAoGBAKnKQ8MNK6nYZzLrrcuTsLxuiJGXoOO5gT+tljOTbHBuiktdMTITzIY0
pFxIvjG05D7HoBZQfrR0c92NGWPkAiCkhQKB8JCbPVzwNLDy6DZ0pmofDKrEsYHG
AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
-----END DH PARAMETERS-----
_end_of_pem_
TEST_KEY_DH1024.set_key(OpenSSL::BN.new("556AF1598AE69899867CEBA9F29CE4862B884C2B43C9019EA0231908F6EFA785E3C462A6ECB16DF676866E997FFB72B487DC7967C58C3CA38CE974473BF19B2AA5DCBF102735572EBA6F353F6F0BBE7FF1DE1B07FE1381A355C275C33405004317F9491B5955F191F6615A63B30E55A027FB88A1A4B25608E09EEE68A7DF32D", 16),
OpenSSL::BN.new("48561834C67E65FFD2A9B47F41E5E78FDC95C387428FDB1E4B0188B64D1643C3A8D3455B945B7E8C4D166010C7C2CE23BFB9BEF43D0348FE7FA5284B0225E7FE1537546D114E3D8A4411B9B9351AB451E1A358F50ED61B1F00DA29336EEBBD649980AC86D76AF8BBB065298C2052672EEF3EF13AB47A15275FC2836F3AC74CEA", 16))
DSA_SIGNATURE_DIGEST = OpenSSL::OPENSSL_VERSION_NUMBER > 0x10000000 ? DSA_SIGNATURE_DIGEST = OpenSSL::OPENSSL_VERSION_NUMBER > 0x10000000 ?
OpenSSL::Digest::SHA1 : OpenSSL::Digest::SHA1 :
@ -191,16 +123,24 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
OpenSSL::Digest::SHA1.hexdigest(pkvalue).scan(/../).join(":").upcase OpenSSL::Digest::SHA1.hexdigest(pkvalue).scan(/../).join(":").upcase
end end
def silent def openssl?(major = nil, minor = nil, fix = nil, patch = 0)
begin return false if OpenSSL::OPENSSL_VERSION.include?("LibreSSL")
back, $VERBOSE = $VERBOSE, nil return true unless major
yield OpenSSL::OPENSSL_VERSION_NUMBER >=
ensure major * 0x10000000 + minor * 0x100000 + fix * 0x1000 + patch * 0x10
$VERBOSE = back
end
end end
class OpenSSL::TestCase < Test::Unit::TestCase def libressl?(major = nil, minor = nil, fix = nil)
version = OpenSSL::OPENSSL_VERSION.scan(/LibreSSL (\d+)\.(\d+)\.(\d+).*/)[0]
return false unless version
!major || (version.map(&:to_i) <=> [major, minor, fix]) >= 0
end
end
class OpenSSL::TestCase < Test::Unit::TestCase
include OpenSSL::TestUtils
extend OpenSSL::TestUtils
def setup def setup
if ENV["OSSL_GC_STRESS"] == "1" if ENV["OSSL_GC_STRESS"] == "1"
GC.stress = true GC.stress = true
@ -214,17 +154,17 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
# OpenSSL error stack must be empty # OpenSSL error stack must be empty
assert_equal([], OpenSSL.errors) assert_equal([], OpenSSL.errors)
end end
end end
class OpenSSL::SSLTestCase < OpenSSL::TestCase class OpenSSL::SSLTestCase < OpenSSL::TestCase
RUBY = EnvUtil.rubybin RUBY = EnvUtil.rubybin
ITERATIONS = ($0 == __FILE__) ? 100 : 10 ITERATIONS = ($0 == __FILE__) ? 100 : 10
def setup def setup
super super
@ca_key = OpenSSL::TestUtils::TEST_KEY_RSA2048 @ca_key = Fixtures.pkey("rsa2048")
@svr_key = OpenSSL::TestUtils::TEST_KEY_RSA1024 @svr_key = Fixtures.pkey("rsa1024")
@cli_key = OpenSSL::TestUtils::TEST_KEY_DSA1024 @cli_key = Fixtures.pkey("rsa2048")
@ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA") @ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
@svr = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=localhost") @svr = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=localhost")
@cli = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=localhost") @cli = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=localhost")
@ -241,50 +181,14 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
@server = nil @server = nil
end end
def issue_cert(*arg) def tls12_supported?
OpenSSL::TestUtils.issue_cert(*arg) OpenSSL::SSL::SSLContext::METHODS.include?(:TLSv1_2)
end
def issue_crl(*arg)
OpenSSL::TestUtils.issue_crl(*arg)
end end
def readwrite_loop(ctx, ssl) def readwrite_loop(ctx, ssl)
while line = ssl.gets while line = ssl.gets
ssl.write(line) ssl.write(line)
end end
rescue OpenSSL::SSL::SSLError
rescue IOError
ensure
ssl.close rescue nil
end
def server_loop(ctx, ssls, stop_pipe_r, ignore_listener_error, server_proc, threads)
loop do
ssl = nil
begin
readable, = IO.select([ssls, stop_pipe_r])
if readable.include? stop_pipe_r
return
end
ssl = ssls.accept
rescue OpenSSL::SSL::SSLError, Errno::ECONNRESET
if ignore_listener_error
retry
else
raise
end
end
th = Thread.start do
server_proc.call(ctx, ssl)
end
threads << th
end
rescue Errno::EBADF, IOError, Errno::EINVAL, Errno::ECONNABORTED, Errno::ENOTSOCK, Errno::ECONNRESET
if !ignore_listener_error
raise
end
end end
def start_server(verify_mode: OpenSSL::SSL::VERIFY_NONE, start_immediately: true, def start_server(verify_mode: OpenSSL::SSL::VERIFY_NONE, start_immediately: true,
@ -298,16 +202,11 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
ctx.cert_store = store ctx.cert_store = store
ctx.cert = @svr_cert ctx.cert = @svr_cert
ctx.key = @svr_key ctx.key = @svr_key
ctx.tmp_dh_callback = proc { OpenSSL::TestUtils::TEST_KEY_DH1024 } ctx.tmp_dh_callback = proc { Fixtures.pkey_dh("dh1024") }
begin
ctx.ecdh_curves = "P-256"
rescue NotImplementedError
end
ctx.verify_mode = verify_mode ctx.verify_mode = verify_mode
ctx_proc.call(ctx) if ctx_proc ctx_proc.call(ctx) if ctx_proc
Socket.do_not_reverse_lookup = true Socket.do_not_reverse_lookup = true
tcps = nil
tcps = TCPServer.new("127.0.0.1", 0) tcps = TCPServer.new("127.0.0.1", 0)
port = tcps.connect_address.ip_port port = tcps.connect_address.ip_port
@ -316,33 +215,65 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
threads = [] threads = []
begin begin
server = Thread.new do server_thread = Thread.new do
begin begin
server_loop(ctx, ssls, stop_pipe_r, ignore_listener_error, server_proc, threads) loop do
begin
readable, = IO.select([ssls, stop_pipe_r])
break if readable.include? stop_pipe_r
ssl = ssls.accept
rescue OpenSSL::SSL::SSLError, IOError, Errno::EBADF, Errno::EINVAL,
Errno::ECONNABORTED, Errno::ENOTSOCK, Errno::ECONNRESET
retry if ignore_listener_error
raise
end
th = Thread.new do
begin
server_proc.call(ctx, ssl)
ensure
ssl.close
end
true
end
threads << th
end
ensure ensure
tcps.close tcps.close
end end
end end
threads.unshift server
$stderr.printf("SSL server started: pid=%d port=%d\n", $$, port) if $DEBUG client_thread = Thread.new do
client = Thread.new do
begin begin
block.call(server, port.to_i) block.call(port)
ensure ensure
# Stop accepting new connection
stop_pipe_w.close stop_pipe_w.close
server_thread.join
end end
end end
threads.unshift client threads.unshift client_thread
ensure ensure
# Terminate existing connections. If a thread did 'pend', re-raise it.
pend = nil
threads.each { |th|
begin
th.join(10) or
th.raise(RuntimeError, "[start_server] thread did not exit in 10 secs")
rescue (defined?(MiniTest::Skip) ? MiniTest::Skip : Test::Unit::PendedError)
# MiniTest::Skip is for the Ruby tree
pend = $!
rescue Exception
end
}
raise pend if pend
assert_join_threads(threads) assert_join_threads(threads)
end end
} }
end end
end end
class OpenSSL::PKeyTestCase < OpenSSL::TestCase class OpenSSL::PKeyTestCase < OpenSSL::TestCase
def check_component(base, test, keys) def check_component(base, test, keys)
keys.each { |comp| keys.each { |comp|
assert_equal base.send(comp), test.send(comp) assert_equal base.send(comp), test.send(comp)
@ -374,7 +305,6 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
end end
end end
end end
end end
end if defined?(OpenSSL::OPENSSL_LIBRARY_VERSION) and end
/\AOpenSSL +0\./ !~ OpenSSL::OPENSSL_LIBRARY_VERSION

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.4.4" #define RUBY_VERSION "2.4.4"
#define RUBY_RELEASE_DATE "2018-03-18" #define RUBY_RELEASE_DATE "2018-03-20"
#define RUBY_PATCHLEVEL 263 #define RUBY_PATCHLEVEL 264
#define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3
#define RUBY_RELEASE_DAY 18 #define RUBY_RELEASE_DAY 20
#include "ruby/version.h" #include "ruby/version.h"