mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
609103dbb5
Import Ruby/OpenSSL 2.1.0.beta1. The full commit log since v2.0.5 (imported by r59567) can be found at: https://github.com/ruby/openssl/compare/v2.0.5...v2.1.0.beta1 ---------------------------------------------------------------- Antonio Terceiro (1): test/test_ssl: explicitly accept TLS 1.1 in corresponding test Colby Swandale (1): document using secure protocol to fetch git master in Bundler Colton Jenkins (1): Add fips_mode_get to return fips_mode Kazuki Yamaguchi (85): Start preparing for 2.1.0 Remove support for OpenSSL 0.9.8 and 1.0.0 bn: refine tests bn: implement unary {plus,minus} operators for OpenSSL::BN bn: implement OpenSSL::BN#negative? Don't define main() when built with --enable-debug test: let OpenSSL::TestCase include OpenSSL::TestUtils test: prepare test PKey instances on demand Add OpenSSL.print_mem_leaks Enable OSSL_MDEBUG on CI builds ssl: move default DH parameters from OpenSSL::PKey::DH Make exceptions with the same format regardless of OpenSSL.debug ssl: show reason of 'certificate verify error' in exception message ssl: remove OpenSSL::ExtConfig::TLS_DH_anon_WITH_AES_256_GCM_SHA384 ssl: do not confuse different ex_data index registries ssl: assume SSL/SSL_CTX always have a valid reference to the Ruby object Fix RDoc markup ssl: suppress compiler warning ext/openssl/deprecation.rb: remove broken-apple-openssl extconf.rb: print informative message if OpenSSL can't be found Rakefile: compile the extension before test kdf: introduce OpenSSL::KDF module ossl.h: add NUM2UINT64T() macro kdf: add scrypt Expand rb_define_copy_func() macro Expand FPTR_TO_FD() macro Remove SafeGet*() macros cipher: rename GetCipherPtr() to ossl_evp_get_cipherbyname() digest: rename GetDigestPtr() to ossl_evp_get_digestbyname() Add ossl_str_new(), an exception-safe rb_str_new() bio: simplify ossl_membio2str() using ossl_str_new() Remove unused functions and macros Drop support for LibreSSL 2.3 ocsp: add OpenSSL::OCSP::Request#signed? asn1: infinite length -> indefinite length asn1: rearrange tests ssl: remove a needless NULL check in SSL::SSLContext#ciphers ssl: return nil in SSL::SSLSocket#cipher if session is not started asn1: remove an unnecessary function prototype asn1: require tag information when instantiating generic type asn1: initialize 'unused_bits' attribute of BitString with 0 asn1: check for illegal 'unused_bits' value of BitString asn1: disallow NULL to be passed to asn1time_to_time() asn1: avoid truncating OID in OpenSSL::ASN1::ObjectId#oid asn1: allow constructed encoding with definite length form asn1: prohibit indefinite length form for primitive encoding asn1: allow tag number to be >= 32 for universal tag class asn1: use ossl_asn1_tag() asn1: clean up OpenSSL::ASN1::Constructive#to_der asn1: harmonize OpenSSL::ASN1::*#to_der asn1: prevent EOC octets from being in the middle of the content asn1: do not treat EOC octets as part of content octets x509name: add 'loc' and 'set' kwargs to OpenSSL::X509::Name#add_entry ssl: do not call session_remove_cb during GC Backport "Merge branch 'topic/test-memory-leak'" to maint cipher: update the documentation for Cipher#auth_tag= Rakefile: let sync:to_ruby know about test/openssl/fixtures test: fix formatting test/utils: remove OpenSSL::TestUtils.silent test/utils: add SSLTestCase#tls12_supported? test/utils: have start_server yield only the port number test/utils: do not set ecdh_curves in start_server test/utils: let server_loop close socket test/utils: improve error handling in start_server test/utils: add OpenSSL::TestUtils.openssl? and .libressl? test/utils: do not use DSA certificates in SSL tests test/test_ssl: remove test_invalid_shutdown_by_gc test/test_ssl: move test_multibyte_read_write to test_pair test/test_ssl_session: rearrange tests test/test_pair, test/test_ssl: fix for TLS 1.3 ssl: remove useless call to rb_thread_wait_fd() ssl: fix NPN support ssl: mark OpenSSL::SSL::SSLContext::DEFAULT_{1024,2048} as private ssl: use 2048-bit group in the default tmp_dh_cb ssl: ensure that SSL option flags are non-negative ssl: update OpenSSL::SSL::OP_* flags ssl: prefer TLS_method() over SSLv23_method() ssl: add SSLContext#min_version= and #max_version= ssl: rework SSLContext#ssl_version= test/test_x509name: change script encoding to ASCII-8BIT x509name: refactor OpenSSL::X509::Name#to_s x509name: add OpenSSL::X509::Name#to_utf8 x509name: add OpenSSL::X509::Name#inspect x509name: update regexp in OpenSSL::X509::Name.parse Ruby/OpenSSL 2.1.0.beta1 Marcus Stollsteimer (1): Fix rdoc for core Integer class nobu (4): [DOC] {read,write}_nonblock with exception: false [DOC] keyword argument _exception_ [DOC] mark up literals Revert r57690 except for read_nonblock git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
141 lines
4.5 KiB
Ruby
141 lines
4.5 KiB
Ruby
# frozen_string_literal: false
|
|
require_relative 'utils'
|
|
|
|
if defined?(OpenSSL)
|
|
|
|
class OpenSSL::TestKDF < OpenSSL::TestCase
|
|
def test_pkcs5_pbkdf2_hmac_compatibility
|
|
expected = OpenSSL::KDF.pbkdf2_hmac("password", salt: "salt", iterations: 1, length: 20, hash: "sha1")
|
|
assert_equal(expected, OpenSSL::PKCS5.pbkdf2_hmac("password", "salt", 1, 20, "sha1"))
|
|
assert_equal(expected, OpenSSL::PKCS5.pbkdf2_hmac_sha1("password", "salt", 1, 20))
|
|
end
|
|
|
|
def test_pbkdf2_hmac_sha1_rfc6070_c_1_len_20
|
|
p ="password"
|
|
s = "salt"
|
|
c = 1
|
|
dk_len = 20
|
|
raw = %w{ 0c 60 c8 0f 96 1f 0e 71
|
|
f3 a9 b5 24 af 60 12 06
|
|
2f e0 37 a6 }
|
|
expected = [raw.join('')].pack('H*')
|
|
value = OpenSSL::KDF.pbkdf2_hmac(p, salt: s, iterations: c, length: dk_len, hash: "sha1")
|
|
assert_equal(expected, value)
|
|
end
|
|
|
|
def test_pbkdf2_hmac_sha1_rfc6070_c_2_len_20
|
|
p ="password"
|
|
s = "salt"
|
|
c = 2
|
|
dk_len = 20
|
|
raw = %w{ ea 6c 01 4d c7 2d 6f 8c
|
|
cd 1e d9 2a ce 1d 41 f0
|
|
d8 de 89 57 }
|
|
expected = [raw.join('')].pack('H*')
|
|
value = OpenSSL::KDF.pbkdf2_hmac(p, salt: s, iterations: c, length: dk_len, hash: "sha1")
|
|
assert_equal(expected, value)
|
|
end
|
|
|
|
def test_pbkdf2_hmac_sha1_rfc6070_c_4096_len_20
|
|
p ="password"
|
|
s = "salt"
|
|
c = 4096
|
|
dk_len = 20
|
|
raw = %w{ 4b 00 79 01 b7 65 48 9a
|
|
be ad 49 d9 26 f7 21 d0
|
|
65 a4 29 c1 }
|
|
expected = [raw.join('')].pack('H*')
|
|
value = OpenSSL::KDF.pbkdf2_hmac(p, salt: s, iterations: c, length: dk_len, hash: "sha1")
|
|
assert_equal(expected, value)
|
|
end
|
|
|
|
# takes too long!
|
|
# def test_pbkdf2_hmac_sha1_rfc6070_c_16777216_len_20
|
|
# p ="password"
|
|
# s = "salt"
|
|
# c = 16777216
|
|
# dk_len = 20
|
|
# raw = %w{ ee fe 3d 61 cd 4d a4 e4
|
|
# e9 94 5b 3d 6b a2 15 8c
|
|
# 26 34 e9 84 }
|
|
# expected = [raw.join('')].pack('H*')
|
|
# value = OpenSSL::KDF.pbkdf2_hmac(p, salt: s, iterations: c, length: dk_len, hash: "sha1")
|
|
# assert_equal(expected, value)
|
|
# end
|
|
|
|
def test_pbkdf2_hmac_sha1_rfc6070_c_4096_len_25
|
|
p ="passwordPASSWORDpassword"
|
|
s = "saltSALTsaltSALTsaltSALTsaltSALTsalt"
|
|
c = 4096
|
|
dk_len = 25
|
|
|
|
raw = %w{ 3d 2e ec 4f e4 1c 84 9b
|
|
80 c8 d8 36 62 c0 e4 4a
|
|
8b 29 1a 96 4c f2 f0 70
|
|
38 }
|
|
expected = [raw.join('')].pack('H*')
|
|
value = OpenSSL::KDF.pbkdf2_hmac(p, salt: s, iterations: c, length: dk_len, hash: "sha1")
|
|
assert_equal(expected, value)
|
|
end
|
|
|
|
def test_pbkdf2_hmac_sha1_rfc6070_c_4096_len_16
|
|
p ="pass\0word"
|
|
s = "sa\0lt"
|
|
c = 4096
|
|
dk_len = 16
|
|
raw = %w{ 56 fa 6a a7 55 48 09 9d
|
|
cc 37 d7 f0 34 25 e0 c3 }
|
|
expected = [raw.join('')].pack('H*')
|
|
value = OpenSSL::KDF.pbkdf2_hmac(p, salt: s, iterations: c, length: dk_len, hash: "sha1")
|
|
assert_equal(expected, value)
|
|
end
|
|
|
|
def test_pbkdf2_hmac_sha256_c_20000_len_32
|
|
#unfortunately no official test vectors available yet for SHA-2
|
|
p ="password"
|
|
s = OpenSSL::Random.random_bytes(16)
|
|
c = 20000
|
|
dk_len = 32
|
|
value1 = OpenSSL::KDF.pbkdf2_hmac(p, salt: s, iterations: c, length: dk_len, hash: "sha256")
|
|
value2 = OpenSSL::KDF.pbkdf2_hmac(p, salt: s, iterations: c, length: dk_len, hash: "sha256")
|
|
assert_equal(value1, value2)
|
|
end
|
|
|
|
def test_scrypt_rfc7914_first
|
|
pend "scrypt is not implemented" unless OpenSSL::KDF.respond_to?(:scrypt) # OpenSSL >= 1.1.0
|
|
pass = ""
|
|
salt = ""
|
|
n = 16
|
|
r = 1
|
|
p = 1
|
|
dklen = 64
|
|
expected = B(%w{ 77 d6 57 62 38 65 7b 20 3b 19 ca 42 c1 8a 04 97
|
|
f1 6b 48 44 e3 07 4a e8 df df fa 3f ed e2 14 42
|
|
fc d0 06 9d ed 09 48 f8 32 6a 75 3a 0f c8 1f 17
|
|
e8 d3 e0 fb 2e 0d 36 28 cf 35 e2 0c 38 d1 89 06 })
|
|
assert_equal(expected, OpenSSL::KDF.scrypt(pass, salt: salt, N: n, r: r, p: p, length: dklen))
|
|
end
|
|
|
|
def test_scrypt_rfc7914_second
|
|
pend "scrypt is not implemented" unless OpenSSL::KDF.respond_to?(:scrypt) # OpenSSL >= 1.1.0
|
|
pass = "password"
|
|
salt = "NaCl"
|
|
n = 1024
|
|
r = 8
|
|
p = 16
|
|
dklen = 64
|
|
expected = B(%w{ fd ba be 1c 9d 34 72 00 78 56 e7 19 0d 01 e9 fe
|
|
7c 6a d7 cb c8 23 78 30 e7 73 76 63 4b 37 31 62
|
|
2e af 30 d9 2e 22 a3 88 6f f1 09 27 9d 98 30 da
|
|
c7 27 af b9 4a 83 ee 6d 83 60 cb df a2 cc 06 40 })
|
|
assert_equal(expected, OpenSSL::KDF.scrypt(pass, salt: salt, N: n, r: r, p: p, length: dklen))
|
|
end
|
|
|
|
private
|
|
|
|
def B(ary)
|
|
[Array(ary).join].pack("H*")
|
|
end
|
|
end
|
|
|
|
end
|