openssl 2.0.0.beta.2 → 2.0.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of openssl might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/CONTRIBUTING.md +1 -1
- data/History.md +4 -1
- data/README.md +4 -8
- data/ext/openssl/extconf.rb +0 -6
- data/ext/openssl/ossl.c +27 -88
- data/ext/openssl/ossl.h +3 -39
- data/ext/openssl/ossl_asn1.c +69 -129
- data/ext/openssl/ossl_bio.c +0 -3
- data/ext/openssl/ossl_bn.c +9 -8
- data/ext/openssl/ossl_cipher.c +39 -40
- data/ext/openssl/ossl_digest.c +22 -15
- data/ext/openssl/ossl_engine.c +1 -18
- data/ext/openssl/ossl_ns_spki.c +1 -6
- data/ext/openssl/ossl_pkcs7.c +1 -1
- data/ext/openssl/ossl_pkey.c +75 -32
- data/ext/openssl/ossl_pkey.h +0 -1
- data/ext/openssl/ossl_pkey_dh.c +1 -1
- data/ext/openssl/ossl_pkey_dsa.c +2 -4
- data/ext/openssl/ossl_pkey_ec.c +39 -25
- data/ext/openssl/ossl_pkey_rsa.c +5 -7
- data/ext/openssl/ossl_ssl.c +105 -79
- data/ext/openssl/ossl_ssl_session.c +19 -36
- data/ext/openssl/ossl_x509.h +6 -3
- data/ext/openssl/ossl_x509cert.c +1 -1
- data/ext/openssl/ossl_x509crl.c +5 -24
- data/ext/openssl/ossl_x509name.c +3 -5
- data/ext/openssl/ossl_x509req.c +4 -18
- data/ext/openssl/ossl_x509store.c +83 -25
- data/ext/openssl/ruby_missing.h +0 -9
- data/lib/openssl/buffering.rb +9 -1
- data/lib/openssl/ssl.rb +8 -12
- metadata +17 -17
data/ext/openssl/ruby_missing.h
CHANGED
@@ -13,16 +13,7 @@
|
|
13
13
|
#define rb_define_copy_func(klass, func) \
|
14
14
|
rb_define_method((klass), "initialize_copy", (func), 1)
|
15
15
|
|
16
|
-
|
17
|
-
#ifndef GetReadFile
|
18
16
|
#define FPTR_TO_FD(fptr) ((fptr)->fd)
|
19
|
-
#else
|
20
|
-
#define FPTR_TO_FD(fptr) (fileno(GetReadFile(fptr)))
|
21
|
-
#endif
|
22
|
-
|
23
|
-
#ifndef HAVE_RB_IO_T
|
24
|
-
#define rb_io_t OpenFile
|
25
|
-
#endif
|
26
17
|
|
27
18
|
#ifndef RB_INTEGER_TYPE_P
|
28
19
|
/* for Ruby 2.3 compatibility */
|
data/lib/openssl/buffering.rb
CHANGED
@@ -163,6 +163,10 @@ module OpenSSL::Buffering
|
|
163
163
|
# Note that one reason that read_nonblock writes to the underlying IO is
|
164
164
|
# when the peer requests a new TLS/SSL handshake. See openssl the FAQ for
|
165
165
|
# more details. http://www.openssl.org/support/faq.html
|
166
|
+
#
|
167
|
+
# By specifying `exception: false`, the options hash allows you to indicate
|
168
|
+
# that read_nonblock should not raise an IO::Wait*able exception, but
|
169
|
+
# return the symbol :wait_writable or :wait_readable instead.
|
166
170
|
|
167
171
|
def read_nonblock(maxlen, buf=nil, exception: true)
|
168
172
|
if maxlen == 0
|
@@ -371,6 +375,10 @@ module OpenSSL::Buffering
|
|
371
375
|
# Note that one reason that write_nonblock reads from the underlying IO
|
372
376
|
# is when the peer requests a new TLS/SSL handshake. See the openssl FAQ
|
373
377
|
# for more details. http://www.openssl.org/support/faq.html
|
378
|
+
#
|
379
|
+
# By specifying `exception: false`, the options hash allows you to indicate
|
380
|
+
# that write_nonblock should not raise an IO::Wait*able exception, but
|
381
|
+
# return the symbol :wait_writable or :wait_readable instead.
|
374
382
|
|
375
383
|
def write_nonblock(s, exception: true)
|
376
384
|
flush
|
@@ -381,7 +389,7 @@ module OpenSSL::Buffering
|
|
381
389
|
# Writes +s+ to the stream. +s+ will be converted to a String using
|
382
390
|
# String#to_s.
|
383
391
|
|
384
|
-
def <<
|
392
|
+
def <<(s)
|
385
393
|
do_write(s)
|
386
394
|
self
|
387
395
|
end
|
data/lib/openssl/ssl.rb
CHANGED
@@ -16,8 +16,7 @@ require "io/nonblock"
|
|
16
16
|
module OpenSSL
|
17
17
|
module SSL
|
18
18
|
class SSLContext
|
19
|
-
# :nodoc:
|
20
|
-
DEFAULT_PARAMS = {
|
19
|
+
DEFAULT_PARAMS = { # :nodoc:
|
21
20
|
:ssl_version => "SSLv23",
|
22
21
|
:verify_mode => OpenSSL::SSL::VERIFY_PEER,
|
23
22
|
:verify_hostname => true,
|
@@ -68,8 +67,7 @@ module OpenSSL
|
|
68
67
|
)
|
69
68
|
end
|
70
69
|
|
71
|
-
# :nodoc:
|
72
|
-
DEFAULT_CERT_STORE = OpenSSL::X509::Store.new
|
70
|
+
DEFAULT_CERT_STORE = OpenSSL::X509::Store.new # :nodoc:
|
73
71
|
DEFAULT_CERT_STORE.set_default_paths
|
74
72
|
DEFAULT_CERT_STORE.flags = OpenSSL::X509::V_FLAG_CRL_CHECK_ALL
|
75
73
|
|
@@ -84,14 +82,12 @@ module OpenSSL
|
|
84
82
|
|
85
83
|
attr_accessor :tmp_dh_callback
|
86
84
|
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
attr_accessor :servername_cb
|
94
|
-
end
|
85
|
+
# A callback invoked at connect time to distinguish between multiple
|
86
|
+
# server names.
|
87
|
+
#
|
88
|
+
# The callback is invoked with an SSLSocket and a server name. The
|
89
|
+
# callback must return an SSLContext for the server name or nil.
|
90
|
+
attr_accessor :servername_cb if ExtConfig::HAVE_TLSEXT_HOST_NAME
|
95
91
|
|
96
92
|
# call-seq:
|
97
93
|
# SSLContext.new => ctx
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: openssl
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.0
|
4
|
+
version: 2.0.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Martin Bosslet
|
@@ -11,36 +11,36 @@ authors:
|
|
11
11
|
autorequire:
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
|
-
date: 2016-
|
14
|
+
date: 2016-11-30 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: rake
|
18
18
|
requirement: !ruby/object:Gem::Requirement
|
19
19
|
requirements:
|
20
|
-
- - "
|
20
|
+
- - ">="
|
21
21
|
- !ruby/object:Gem::Version
|
22
|
-
version: '
|
22
|
+
version: '0'
|
23
23
|
type: :development
|
24
24
|
prerelease: false
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
26
26
|
requirements:
|
27
|
-
- - "
|
27
|
+
- - ">="
|
28
28
|
- !ruby/object:Gem::Version
|
29
|
-
version: '
|
29
|
+
version: '0'
|
30
30
|
- !ruby/object:Gem::Dependency
|
31
31
|
name: rake-compiler
|
32
32
|
requirement: !ruby/object:Gem::Requirement
|
33
33
|
requirements:
|
34
|
-
- - "
|
34
|
+
- - ">="
|
35
35
|
- !ruby/object:Gem::Version
|
36
|
-
version: '0
|
36
|
+
version: '0'
|
37
37
|
type: :development
|
38
38
|
prerelease: false
|
39
39
|
version_requirements: !ruby/object:Gem::Requirement
|
40
40
|
requirements:
|
41
|
-
- - "
|
41
|
+
- - ">="
|
42
42
|
- !ruby/object:Gem::Version
|
43
|
-
version: '0
|
43
|
+
version: '0'
|
44
44
|
- !ruby/object:Gem::Dependency
|
45
45
|
name: test-unit
|
46
46
|
requirement: !ruby/object:Gem::Requirement
|
@@ -59,16 +59,16 @@ dependencies:
|
|
59
59
|
name: rdoc
|
60
60
|
requirement: !ruby/object:Gem::Requirement
|
61
61
|
requirements:
|
62
|
-
- - "
|
62
|
+
- - ">="
|
63
63
|
- !ruby/object:Gem::Version
|
64
|
-
version: '
|
64
|
+
version: '0'
|
65
65
|
type: :development
|
66
66
|
prerelease: false
|
67
67
|
version_requirements: !ruby/object:Gem::Requirement
|
68
68
|
requirements:
|
69
|
-
- - "
|
69
|
+
- - ">="
|
70
70
|
- !ruby/object:Gem::Version
|
71
|
-
version: '
|
71
|
+
version: '0'
|
72
72
|
description: It wraps the OpenSSL library.
|
73
73
|
email:
|
74
74
|
- ruby-core@ruby-lang.org
|
@@ -166,12 +166,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
166
166
|
version: 2.3.0
|
167
167
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
168
168
|
requirements:
|
169
|
-
- - "
|
169
|
+
- - ">="
|
170
170
|
- !ruby/object:Gem::Version
|
171
|
-
version:
|
171
|
+
version: '0'
|
172
172
|
requirements: []
|
173
173
|
rubyforge_project:
|
174
|
-
rubygems_version: 2.6.
|
174
|
+
rubygems_version: 2.6.8
|
175
175
|
signing_key:
|
176
176
|
specification_version: 4
|
177
177
|
summary: OpenSSL provides SSL, TLS and general purpose cryptography.
|