diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2018-08-08 17:27:09 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2018-08-08 17:33:31 +0900 |
| commit | 158201f9b66607f380513708e3ab65f1e27694e6 (patch) | |
| tree | c3bdc4b52e3eb5f83a49a496d0ffca3eb6a3d13c /ext/openssl/ossl_asn1.c | |
| parent | 2d6719910020d00444329161a5ff8a01fbdad2e6 (diff) | |
| parent | a1e8aacaef3cc9f95ccbdba653a82e1a334cdeb4 (diff) | |
| download | ruby-openssl-158201f9b66607f380513708e3ab65f1e27694e6.tar.gz | |
Merge branch 'maint-2.0' into maint
The fix made in 6fcc6c0efc42 ("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
Diffstat (limited to 'ext/openssl/ossl_asn1.c')
| -rw-r--r-- | ext/openssl/ossl_asn1.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c index fb05e038..7b6c9738 100644 --- a/ext/openssl/ossl_asn1.c +++ b/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; |