mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
1ae1696195
* ext/openssl/ossl_ssl_session.c
(ossl_ssl_session_{get,set}_time{,out}): fixed a bug introduced by
backporting. (see [ruby-dev:40573]) use long in according to
OpenSSL API. (SSL_SESSION_{get,set}_time{,out})
* ext/openssl/ossl_x509name.c: added X509::Name#hash_old as a wrapper
for X509_NAME_hash_old in OpenSSL 1.0.0.
* test/openssl/test_x509name.rb (test_hash): make test pass with
OpenSSL 1.0.0.
* test/openssl/test_x509*: make tests pass with OpenSSL 1.0.0b5.
* PKey::PKey#verify raises an exception when a given PKey does not
match with signature.
* PKey::DSA#sign accepts SHA1, SHA256 other than DSS1.
* backport the commit from trunk:
Sun Feb 28 11:49:35 2010 NARUSE, Yui <naruse@ruby-lang.org>
* openssl/ossl.c (OSSL_IMPL_SK2ARY): for OpenSSL 1.0.
patched by Jeroen van Meeuwen at [ruby-core:25210]
fixed by Nobuyoshi Nakada [ruby-core:25238],
Hongli Lai [ruby-core:27417],
and Motohiro KOSAKI [ruby-core:28063]
* ext/openssl/ossl_ssl.c (ossl_ssl_method_tab),
(ossl_ssl_cipher_to_ary): constified.
* ext/openssl/ossl_pkcs7.c (pkcs7_get_certs, pkcs7_get_crls):
split pkcs7_get_certs_or_crls.
* test/openssl/test_ec.rb: added test_dsa_sign_asn1_FIPS186_3. dgst is
truncated with ec_key.group.order.size after openssl 0.9.8m for
FIPS 186-3 compliance.
WARNING: ruby-openssl aims to wrap an OpenSSL so when you're using
openssl 0.9.8l or earlier version, EC.dsa_sign_asn1 raises
OpenSSL::PKey::ECError as before and EC.dsa_verify_asn1 just returns
false when you pass dgst longer than expected (no truncation
performed).
* ext/openssl/ossl_pkey_ec.c: rdoc typo fixed.
* ext/openssl/ossl_config.c: defined own IMPLEMENT_LHASH_DOALL_ARG_FN_098
macro according to IMPLEMENT_LHASH_DOALL_ARG_FN in OpenSSL 0.9.8m.
OpenSSL 1.0.0beta5 has a slightly different definiton so it could
be a temporal workaround for 0.9.8 and 1.0.0 dual support.
* ext/openssl/ossl_pkcs5.c (ossl_pkcs5_pbkdf2_hmac): follows function
definition in OpenSSL 1.0.0beta5. PKCS5_PBKDF2_HMAC is from 1.0.0
(0.9.8 only has PKCS5_PBKDF2_HMAC_SHA1)
* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_eq): do not use
SSL_SESSION_cmp and implement equality func by ousrself. See the
comment.
* ext/openssl/extconf.rb: check some functions added at OpenSSL 1.0.0.
* ext/openssl/ossl_engine.c (ossl_engine_s_load): use engines which
exists.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28367 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
111 lines
2.5 KiB
Ruby
111 lines
2.5 KiB
Ruby
begin
|
|
require "openssl"
|
|
require File.join(File.dirname(__FILE__), "utils.rb")
|
|
rescue LoadError
|
|
end
|
|
require "test/unit"
|
|
|
|
if defined?(OpenSSL::PKey::EC)
|
|
|
|
class OpenSSL::TestEC < Test::Unit::TestCase
|
|
def setup
|
|
@data1 = 'foo'
|
|
@data2 = 'bar' * 1000 # data too long for DSA sig
|
|
|
|
@group1 = OpenSSL::PKey::EC::Group.new('secp112r1')
|
|
@group2 = OpenSSL::PKey::EC::Group.new('sect163k1')
|
|
|
|
@key1 = OpenSSL::PKey::EC.new
|
|
@key1.group = @group1
|
|
@key1.generate_key
|
|
|
|
@key2 = OpenSSL::PKey::EC.new(@group2.curve_name)
|
|
@key2.generate_key
|
|
|
|
@groups = [@group1, @group2]
|
|
@keys = [@key1, @key2]
|
|
end
|
|
|
|
def compare_keys(k1, k2)
|
|
assert_equal(k1.to_pem, k2.to_pem)
|
|
end
|
|
|
|
def test_curve_names
|
|
@groups.each_with_index do |group, idx|
|
|
key = @keys[idx]
|
|
assert_equal(group.curve_name, key.group.curve_name)
|
|
end
|
|
end
|
|
|
|
def test_check_key
|
|
for key in @keys
|
|
assert_equal(key.check_key, true)
|
|
assert_equal(key.private_key?, true)
|
|
assert_equal(key.public_key?, true)
|
|
end
|
|
end
|
|
|
|
def test_encoding
|
|
for group in @groups
|
|
for meth in [:to_der, :to_pem]
|
|
txt = group.send(meth)
|
|
gr = OpenSSL::PKey::EC::Group.new(txt)
|
|
assert_equal(txt, gr.send(meth))
|
|
|
|
assert_equal(group.generator.to_bn, gr.generator.to_bn)
|
|
assert_equal(group.cofactor, gr.cofactor)
|
|
assert_equal(group.order, gr.order)
|
|
assert_equal(group.seed, gr.seed)
|
|
assert_equal(group.degree, gr.degree)
|
|
end
|
|
end
|
|
|
|
for key in @keys
|
|
group = key.group
|
|
|
|
for meth in [:to_der, :to_pem]
|
|
txt = key.send(meth)
|
|
assert_equal(txt, OpenSSL::PKey::EC.new(txt).send(meth))
|
|
end
|
|
|
|
bn = key.public_key.to_bn
|
|
assert_equal(bn, OpenSSL::PKey::EC::Point.new(group, bn).to_bn)
|
|
end
|
|
end
|
|
|
|
def test_set_keys
|
|
for key in @keys
|
|
k = OpenSSL::PKey::EC.new
|
|
k.group = key.group
|
|
k.private_key = key.private_key
|
|
k.public_key = key.public_key
|
|
|
|
compare_keys(key, k)
|
|
end
|
|
end
|
|
|
|
def test_dsa_sign_verify
|
|
for key in @keys
|
|
sig = key.dsa_sign_asn1(@data1)
|
|
assert(key.dsa_verify_asn1(@data1, sig))
|
|
end
|
|
end
|
|
|
|
def test_dh_compute_key
|
|
for key in @keys
|
|
k = OpenSSL::PKey::EC.new(key.group)
|
|
k.generate_key
|
|
|
|
puba = key.public_key
|
|
pubb = k.public_key
|
|
a = key.dh_compute_key(pubb)
|
|
b = k.dh_compute_key(puba)
|
|
assert_equal(a, b)
|
|
end
|
|
end
|
|
|
|
# test Group: asn1_flag, point_conversion
|
|
|
|
end
|
|
|
|
end
|