Merge branch 'maint-2.0' into maint

The fix made in 6fcc6c0 ("test/test_ssl: fix test failure with
TLS 1.3", 2018-08-06) is applied to the new test cases.

* maint-2.0:
  reduce LibreSSL warnings
  openssl_missing.h: constified
  openssl: search winsock
  search winsock libraries explicitly
  no ID cache in Init functions
  test/test_ssl: fix test failure with TLS 1.3
  tool/ruby-openssl-docker: update to latest versions
  pkey: resume key generation after interrupt

Author: rhenium

.travis.yml

@@ -18,11 +18,14 @@ matrix:
   fast_finish: true
   include:
     - env: RUBY_VERSION=ruby-2.3 OPENSSL_VERSION=openssl-1.0.2
-    - env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=openssl-1.0.1
     - env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=openssl-1.0.2
-    - env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=openssl-1.1.0
-    - env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=libressl-2.5
-    - env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=libressl-2.6
+    - env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.0.1
+    - env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.0.2
+    - env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.1.0
+    - env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.1.1
+    - env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=libressl-2.5
+    - env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=libressl-2.6
+    - env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=libressl-2.7
     - language: ruby
       rvm: ruby-head
       before_install:
@@ -33,3 +36,4 @@ matrix:
   allow_failures:
     - language: ruby
       rvm: ruby-head
+    - env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.1.1

Dockerfile

@@ -1 +1 @@
-FROM zzak/ruby-openssl-docker:2.0
+FROM zzak/ruby-openssl-docker:testing

ext/openssl/extconf.rb

@@ -33,6 +33,9 @@
 Logging::message "=== Checking for system dependent stuff... ===\n"
 have_library("nsl", "t_open")
 have_library("socket", "socket")
+if $mswin || $mingw
+  have_library("ws2_32")
+end
 
 Logging::message "=== Checking for required stuff... ===\n"
 result = pkg_config("openssl") && have_header("openssl/ssl.h")
@@ -111,6 +114,10 @@ def find_openssl_library
   OpenSSL.check_func_or_macro("ENGINE_load_#{name}", "openssl/engine.h")
 }
 
+if ($mswin || $mingw) && have_macro("LIBRESSL_VERSION_NUMBER")
+  $defs.push("-DNOCRYPT")
+end
+
 # added in 1.0.2
 have_func("EC_curve_nist2nid")
 have_func("X509_REVOKED_dup")

ext/openssl/openssl_missing.h

@@ -149,7 +149,7 @@ void ossl_X509_REQ_get0_signature(const X509_REQ *, const ASN1_BIT_STRING **, co
 static inline _type *EVP_PKEY_get0_##_type(EVP_PKEY *pkey) { \
 	return pkey->pkey._name; }
 #define IMPL_KEY_ACCESSOR2(_type, _group, a1, a2, _fail_cond) \
-static inline void _type##_get0_##_group(_type *obj, const BIGNUM **a1, const BIGNUM **a2) { \
+static inline void _type##_get0_##_group(const _type *obj, const BIGNUM **a1, const BIGNUM **a2) { \
 	if (a1) *a1 = obj->a1; \
 	if (a2) *a2 = obj->a2; } \
 static inline int _type##_set0_##_group(_type *obj, BIGNUM *a1, BIGNUM *a2) { \
@@ -158,7 +158,7 @@ static inline int _type##_set0_##_group(_type *obj, BIGNUM *a1, BIGNUM *a2) { \
 	BN_clear_free(obj->a2); obj->a2 = a2; \
 	return 1; }
 #define IMPL_KEY_ACCESSOR3(_type, _group, a1, a2, a3, _fail_cond) \
-static inline void _type##_get0_##_group(_type *obj, const BIGNUM **a1, const BIGNUM **a2, const BIGNUM **a3) { \
+static inline void _type##_get0_##_group(const _type *obj, const BIGNUM **a1, const BIGNUM **a2, const BIGNUM **a3) { \
 	if (a1) *a1 = obj->a1; \
 	if (a2) *a2 = obj->a2; \
 	if (a3) *a3 = obj->a3; } \

ext/openssl/ossl.c

@@ -1099,6 +1099,7 @@ static void Init_ossl_locks(void)
 void
 Init_openssl(void)
 {
+#undef rb_intern
     /*
      * Init timezone info
      */

ext/openssl/ossl_asn1.c

@@ -1360,6 +1360,7 @@ OSSL_ASN1_IMPL_FACTORY_METHOD(EndOfContent)
 void
 Init_ossl_asn1(void)
 {
+#undef rb_intern
     VALUE ary;
     int i;
 

ext/openssl/ossl_pkcs12.c

@@ -232,6 +232,7 @@ ossl_pkcs12_to_der(VALUE self)
 void
 Init_ossl_pkcs12(void)
 {
+#undef rb_intern
 #if 0
     mOSSL = rb_define_module("OpenSSL");
     eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);

ext/openssl/ossl_pkcs7.c

@@ -1042,6 +1042,7 @@ ossl_pkcs7ri_get_enc_key(VALUE self)
 void
 Init_ossl_pkcs7(void)
 {
+#undef rb_intern
 #if 0
     mOSSL = rb_define_module("OpenSSL");
     eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);

ext/openssl/ossl_pkey.c

@@ -20,6 +20,21 @@ static ID id_private_q;
 /*
  * callback for generating keys
  */
+static VALUE
+call_check_ints0(VALUE arg)
+{
+    rb_thread_check_ints();
+    return Qnil;
+}
+
+static void *
+call_check_ints(void *arg)
+{
+    int state;
+    rb_protect(call_check_ints0, Qnil, &state);
+    return (void *)(VALUE)state;
+}
+
 int
 ossl_generate_cb_2(int p, int n, BN_GENCB *cb)
 {
@@ -38,19 +53,26 @@ ossl_generate_cb_2(int p, int n, BN_GENCB *cb)
 	*/
 	rb_protect(rb_yield, ary, &state);
 	if (state) {
-	    arg->stop = 1;
 	    arg->state = state;
+	    return 0;
+	}
+    }
+    if (arg->interrupted) {
+	arg->interrupted = 0;
+	state = (int)(VALUE)rb_thread_call_with_gvl(call_check_ints, NULL);
+	if (state) {
+	    arg->state = state;
+	    return 0;
 	}
     }
-    if (arg->stop) return 0;
     return 1;
 }
 
 void
 ossl_generate_cb_stop(void *ptr)
 {
     struct ossl_generate_cb_arg *arg = (struct ossl_generate_cb_arg *)ptr;
-    arg->stop = 1;
+    arg->interrupted = 1;
 }
 
 static void
@@ -389,6 +411,7 @@ ossl_pkey_verify(VALUE self, VALUE digest, VALUE sig, VALUE data)
 void
 Init_ossl_pkey(void)
 {
+#undef rb_intern
 #if 0
     mOSSL = rb_define_module("OpenSSL");
     eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);

ext/openssl/ossl_pkey.h

@@ -37,7 +37,7 @@ extern const rb_data_type_t ossl_evp_pkey_type;
 
 struct ossl_generate_cb_arg {
     int yield;
-    int stop;
+    int interrupted;
     int state;
 };
 int ossl_generate_cb_2(int p, int n, BN_GENCB *cb);