Project

General

Profile

Bug #8384 ยป out.patch

vo.x (Vit Ondruch), 05/14/2013 06:45 PM

View differences:

ext/openssl/ossl_pkey_ec.c
method = EC_GFp_mont_method();
} else if (id == s_GFp_nist) {
method = EC_GFp_nist_method();
#if !defined(OPENSSL_NO_EC2M)
} else if (id == s_GF2m_simple) {
method = EC_GF2m_simple_method();
#endif
}
if (method) {
......
if (id == s_GFp) {
new_curve = EC_GROUP_new_curve_GFp;
#if !defined(OPENSSL_NO_EC2M)
} else if (id == s_GF2m) {
new_curve = EC_GROUP_new_curve_GF2m;
#endif
} else {
ossl_raise(rb_eArgError, "unknown symbol, must be :GFp or :GF2m");
}
test/openssl/test_pkey_ec.rb
@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')
@group3 = OpenSSL::PKey::EC::Group.new('prime256v1')
@groups = []
@keys = []
@key1 = OpenSSL::PKey::EC.new
@key1.group = @group1
@key1.generate_key
OpenSSL::PKey::EC.builtin_curves.each do |curve, comment|
group = OpenSSL::PKey::EC::Group.new(curve)
@key2 = OpenSSL::PKey::EC.new(@group2.curve_name)
@key2.generate_key
key = OpenSSL::PKey::EC.new(group)
key.generate_key
@key3 = OpenSSL::PKey::EC.new(@group3)
@key3.generate_key
@groups = [@group1, @group2, @group3]
@keys = [@key1, @key2, @key3]
@groups << group
@keys << key
end
end
def compare_keys(k1, k2)
assert_equal(k1.to_pem, k2.to_pem)
end
def test_builtin_curves
assert(!OpenSSL::PKey::EC.builtin_curves.empty?)
end
def test_curve_names
@groups.each_with_index do |group, idx|
key = @keys[idx]
    (1-1/1)