jruby-openssl 0.6 → 0.7

data/test/fixture/keypair.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAoMKQs2G2GLpdHCp07ZR7fYAim3BcHhx1PM3cscrYLXaVCGqH
+PtZLJQDDseuvQur1VMGjHOneUJzsfdXJcRN8WfH9AD5KXJbTpzt134BpqrMhJcov
+G4e54oVNzvlQ1P2xwZt7QXYg2hyCIqH6r7wBtaW8g8e5dUGb3vuZW4OC2s/KSKue
+71LnqsolKuINt9OTs0R6+4oxyLRIBU/8gG/PD+bnjXB3JUm9/JYOxh4mN3goRhbZ
+61kTu6vHI9DcWI3I81rS4hzbvArnBsbmKkQOZRc8YkNqAQtyC+V/0xyv/w5jJXpT
+xlT4ZJaUfcO3KtGHvP9JkxT3F4whN5whwdcRxwIDAQABAoIBAQCR7o00iWqoH+UO
+AGyMjtFbJ8pCmEjG/MZgH/BLZPvAqXi4XxvOqvEj8gGzrWM3t9pkyjKruJEbVJhJ
+0pw+jZXAgK9OXT1bt38CvDNQZF2Hm3xntZX1w8u2GZR8Yk5CStnmCqJk1jsUQ/TO
+Q4QxqtVSc9UhO1jbXGeGj5azQDq1LaLDOePfH4XtM/GcoPKtu+Lghx+5JfOVMI+/
+cOcm65cK+APPObySe0x7r6Q45UhFW5q0UMFGaMFfkMauYyzhuliD8BS5XV9gDSGH
+Ozr8GDEroGuJr3oTKSMKZg+S8N/8SQ1g4RL9IEZZ6MIIJZrWkqhY7jwY5v1ywrSY
+OBE4pNxBAoGBANI30R3WthH/iWq1xyQVQCD1XwxYO66iWk2U0fxhhn/3lSkNTq/a
+cIs+2IY9vnXT7yJSY4xHejbmgJmdfNXnjwaKwDvyh/M8fesFNQLPWKufl0l4LPwH
+qWlxgcmff1VxtP4xrGSEBG51oo60heqWgRACL+xan98PNUiB113UE9M5AoGBAMPF
+VwXMo8RIA+wLPOSUjdWXPusZfzzKCm+NdTYDdoc7F6hVjxzNeU/44bJs5XVxM9JV
+EsGjWG9KprgAhzw1gy6UJg8OErF2zf0j/czg8FIB5Cm+ecNsH8pzfBfcRursvGAt
+HHVIUyyvODN/kus3dta6CqOj4kd6yKhdcu5wuQz/AoGAaRnbBW4Z7XmzPJTRkarG
+OzQyZzud6zvkpjEno2UnF8ey3al3k9hEuHmdS9CG7uYdAy3p83KxGc24shTZGyEA
+kya/4bjqW6P82Inr7RG5pWTPAL6CzycNflhvqVyDDzcgZI51QHP4uzk5ItwCsDy7
+HkPZrfPJRn6WB0BTaufjWZECgYEAvIxATu6Tv4QYeusr336Px+neCDHLULHKMTwN
+alMVghLQqyiUKAphTzuFrAGjUWQQo/+Zi/OVRcKhJVAk70EeseqvaQqFyHOC2s4i
+L4NpEaKOrAGuZh+p0qM9HgHiL3qHxx1Lbk2VBdFQEJFK383QX+hYPNinI27G+Rjf
+i3P3VeMCgYBhXO1Tgge4J7UPYRCT7WOsvpXdcZdwOx75fBAR9g7FrPSjiXgYPZlK
+TZ1/Gv0c1WGeW4sJ+XdnFexWENh+mdJGmWsMkyPnkRNaAbRqz5Isq+eZcVNSXNEz
+QBCT+THNIIPCjkZCdjwXNClVkGfePJ3i3ON43ioyrouex9D5kvU7uA==
+-----END RSA PRIVATE KEY-----

data/test/fixture/selfcert.pem

@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIID0DCCArigAwIBAgIJAKKAqEyofo5/MA0GCSqGSIb3DQEBBQUAME4xCzAJBgNV
+BAYTAkpQMRowGAYDVQQKExF3d3cucnVieS1sYW5nLm9yZzEUMBIGA1UECxMLZGV2
+ZWxvcG1lbnQxDTALBgNVBAMTBHNlbGYwHhcNMTAwMTEyMDkyNDU4WhcNMzAwMTA3
+MDkyNDU4WjBOMQswCQYDVQQGEwJKUDEaMBgGA1UEChMRd3d3LnJ1YnktbGFuZy5v
+cmcxFDASBgNVBAsTC2RldmVsb3BtZW50MQ0wCwYDVQQDEwRzZWxmMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoMKQs2G2GLpdHCp07ZR7fYAim3BcHhx1
+PM3cscrYLXaVCGqHPtZLJQDDseuvQur1VMGjHOneUJzsfdXJcRN8WfH9AD5KXJbT
+pzt134BpqrMhJcovG4e54oVNzvlQ1P2xwZt7QXYg2hyCIqH6r7wBtaW8g8e5dUGb
+3vuZW4OC2s/KSKue71LnqsolKuINt9OTs0R6+4oxyLRIBU/8gG/PD+bnjXB3JUm9
+/JYOxh4mN3goRhbZ61kTu6vHI9DcWI3I81rS4hzbvArnBsbmKkQOZRc8YkNqAQty
+C+V/0xyv/w5jJXpTxlT4ZJaUfcO3KtGHvP9JkxT3F4whN5whwdcRxwIDAQABo4Gw
+MIGtMB0GA1UdDgQWBBQT5CcsdalzWhSsCgkMqtDVRUHVGjB+BgNVHSMEdzB1gBQT
+5CcsdalzWhSsCgkMqtDVRUHVGqFSpFAwTjELMAkGA1UEBhMCSlAxGjAYBgNVBAoT
+EXd3dy5ydWJ5LWxhbmcub3JnMRQwEgYDVQQLEwtkZXZlbG9wbWVudDENMAsGA1UE
+AxMEc2VsZoIJAKKAqEyofo5/MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBACSpZcF7xYei4cGVQM4As6tOneR2F5Yk4OVljsH1+5Zm4UO60l/Q8o9t0KPg
+xjv3H0Y3lqe9VJOmGqyl66JllTNCaIuBnIrmbDsj++NQ+1ietkq8vDu5SKKy7/OY
+MMyko6iKRbs/GmigRA4XZsqFXGsNlwyO0Oq1Cr83JYb5PGRB5k9/ThGWUi8wd6lk
+ODN34nC+mVT65AQM4t5HfZhYnXdrBcOje0If+HuKPPbwr+55xUEtkBmShbfXow4m
+6OE+5iZXUzdGo/+G/fLx4JNMPufSD7GmeDIazm9crhZojElxa5ylpMNqGN22UEyZ
+wYN6dtBOG81wMKfuRfKI6DW/lU0=
+-----END CERTIFICATE-----

data/test/{test_java_attribute.rb → java/test_java_attribute.rb}

@@ -4,10 +4,10 @@ module PKCS7Test
       val = ASN1::OctetString.new("foo".to_java_bytes)
       val2 = ASN1::OctetString.new("bar".to_java_bytes)
       attr = Attribute.create(123, 444, val)
-      assert_raises NoMethodError do 
+      assert_raise NoMethodError do 
         attr.type = 12
       end
-      assert_raises NoMethodError do 
+      assert_raise NoMethodError do 
         attr.value = val2
       end
 

data/test/{test_java_pkcs7.rb → java/test_java_pkcs7.rb}

@@ -136,7 +136,7 @@ module PKCS7Test
     end
     
     def test_set_type_throws_exception_on_wrong_argument
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         # 42 is a value that is not one of the valid NID's for type
         PKCS7.new.type = 42
       end
@@ -239,25 +239,25 @@ module PKCS7Test
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_digest
       
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.cipher = nil
       end
       
       p7.type = ASN1Registry::NID_pkcs7_encrypted
 
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.cipher = nil
       end
 
       p7.type = ASN1Registry::NID_pkcs7_data
 
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.cipher = nil
       end
 
       p7.type = ASN1Registry::NID_pkcs7_signed
 
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.cipher = nil
       end
     end
@@ -266,7 +266,8 @@ module PKCS7Test
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_enveloped
 
-      cipher = javax.crypto.Cipher.getInstance("RSA")
+      c = javax.crypto.Cipher.getInstance("RSA")
+      cipher = CipherSpec.new(c, "RSA", 128)
       
       p7.cipher = cipher
       
@@ -278,7 +279,8 @@ module PKCS7Test
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_signedAndEnveloped
 
-      cipher = javax.crypto.Cipher.getInstance("RSA")
+      c = javax.crypto.Cipher.getInstance("RSA")
+      cipher = CipherSpec.new(c, "RSA", 128)
       
       p7.cipher = cipher
       
@@ -288,25 +290,25 @@ module PKCS7Test
     def test_add_recipient_info_to_something_that_cant_have_recipients
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_signed
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.add_recipient(X509Cert)
       end
 
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_data
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.add_recipient(X509Cert)
       end
       
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_encrypted
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.add_recipient(X509Cert)
       end
       
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_digest
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.add_recipient(X509Cert)
       end
     end
@@ -335,25 +337,25 @@ module PKCS7Test
     def test_add_signer_to_something_that_cant_have_signers
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_enveloped
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.add_signer(SignerInfoWithPkey.new(nil, nil, nil, nil, nil, nil, nil))
       end
 
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_data
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.add_signer(SignerInfoWithPkey.new(nil, nil, nil, nil, nil, nil, nil))
       end
       
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_encrypted
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.add_signer(SignerInfoWithPkey.new(nil, nil, nil, nil, nil, nil, nil))
       end
       
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_digest
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.add_signer(SignerInfoWithPkey.new(nil, nil, nil, nil, nil, nil, nil))
       end
     end
@@ -452,7 +454,7 @@ module PKCS7Test
     def test_set_content_on_data_throws_exception
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_data
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.setContent(PKCS7.new)
       end
     end
@@ -460,7 +462,7 @@ module PKCS7Test
     def test_set_content_on_enveloped_throws_exception
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_enveloped
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.setContent(PKCS7.new)
       end
     end
@@ -468,7 +470,7 @@ module PKCS7Test
     def test_set_content_on_signedAndEnveloped_throws_exception
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_signedAndEnveloped
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.setContent(PKCS7.new)
       end
     end
@@ -476,7 +478,7 @@ module PKCS7Test
     def test_set_content_on_encrypted_throws_exception
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_encrypted
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.setContent(PKCS7.new)
       end
     end
@@ -538,7 +540,7 @@ module PKCS7Test
     def test_content_new_on_data_raises_exception
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_data
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.content_new(ASN1Registry::NID_pkcs7_data)
       end
     end
@@ -546,7 +548,7 @@ module PKCS7Test
     def test_content_new_on_encrypted_raises_exception
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_encrypted
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.content_new(ASN1Registry::NID_pkcs7_data)
       end
     end
@@ -554,7 +556,7 @@ module PKCS7Test
     def test_content_new_on_enveloped_raises_exception
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_enveloped
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.content_new(ASN1Registry::NID_pkcs7_data)
       end
     end
@@ -562,7 +564,7 @@ module PKCS7Test
     def test_content_new_on_signedAndEnveloped_raises_exception
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_signedAndEnveloped
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.content_new(ASN1Registry::NID_pkcs7_data)
       end
     end
@@ -591,7 +593,7 @@ module PKCS7Test
     def test_add_certificate_on_data_throws_exception
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_data
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.add_certificate(X509Cert)
       end
     end
@@ -599,7 +601,7 @@ module PKCS7Test
     def test_add_certificate_on_enveloped_throws_exception
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_enveloped
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.add_certificate(X509Cert)
       end
     end
@@ -607,7 +609,7 @@ module PKCS7Test
     def test_add_certificate_on_encrypted_throws_exception
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_encrypted
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.add_certificate(X509Cert)
       end
     end
@@ -615,7 +617,7 @@ module PKCS7Test
     def test_add_certificate_on_digest_throws_exception
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_digest
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.add_certificate(X509Cert)
       end
     end
@@ -639,7 +641,7 @@ module PKCS7Test
     def test_add_crl_on_data_throws_exception
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_data
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.add_crl(X509CRL)
       end
     end
@@ -647,7 +649,7 @@ module PKCS7Test
     def test_add_crl_on_enveloped_throws_exception
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_enveloped
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.add_crl(X509CRL)
       end
     end
@@ -655,7 +657,7 @@ module PKCS7Test
     def test_add_crl_on_encrypted_throws_exception
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_encrypted
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.add_crl(X509CRL)
       end
     end
@@ -663,7 +665,7 @@ module PKCS7Test
     def test_add_crl_on_digest_throws_exception
       p7 = PKCS7.new
       p7.type = ASN1Registry::NID_pkcs7_digest
-      assert_raises NativeException do 
+      assert_raise NativeException do 
         p7.add_crl(X509CRL)
       end
     end
@@ -690,7 +692,8 @@ module PKCS7Test
     
     def test_encrypt_integration_test
       certs = [X509Cert]
-      cipher = Cipher.get_instance("AES", BCP.new)
+      c = Cipher.get_instance("AES", BCP.new)
+      cipher = CipherSpec.new(c, "AES-128-CBC", 128)
       data = "aaaaa\nbbbbb\nccccc\n".to_java_bytes
       PKCS7::encrypt(certs, data, cipher, PKCS7::BINARY)
 #       puts

data/test/openssl/test_asn1.rb

@@ -10,7 +10,6 @@ class  OpenSSL::TestASN1 < Test::Unit::TestCase
     subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCA")
     key = OpenSSL::TestUtils::TEST_KEY_RSA1024
     now = Time.at(Time.now.to_i) # suppress usec
-#    now = Time.utc(2006,04,03,22,15,13)
     s = 0xdeadbeafdeadbeafdeadbeafdeadbeaf
     exts = [
       ["basicConstraints","CA:TRUE,pathlen:1",true],
@@ -21,6 +20,7 @@ class  OpenSSL::TestASN1 < Test::Unit::TestCase
     cert = OpenSSL::TestUtils.issue_cert(
       subj, key, s, now, now+3600, exts, nil, nil, dgst)
 
+
     asn1 = OpenSSL::ASN1.decode(cert)
     assert_equal(OpenSSL::ASN1::Sequence, asn1.class)
     assert_equal(3, asn1.value.size)
@@ -32,7 +32,6 @@ class  OpenSSL::TestASN1 < Test::Unit::TestCase
     version = tbs_cert.value[0]
     assert_equal(:CONTEXT_SPECIFIC, version.tag_class)
     assert_equal(0, version.tag)
-
     assert_equal(1, version.value.size)
     assert_equal(OpenSSL::ASN1::Integer, version.value[0].class)
     assert_equal(2, version.value[0].value)
@@ -192,7 +191,6 @@ class  OpenSSL::TestASN1 < Test::Unit::TestCase
     assert_equal(OpenSSL::ASN1::Null, pkey.value[0].value[1].class)
 
     assert_equal(OpenSSL::ASN1::BitString, sig_val.class)
-
     cululated_sig = key.sign(OpenSSL::Digest::SHA1.new, tbs_cert.to_der)
     assert_equal(cululated_sig, sig_val.value)
   end

data/test/openssl/test_cipher.rb

@@ -1,10 +1,3 @@
-if defined?(JRUBY_VERSION)
-  require "java"
-  base = File.join(File.dirname(__FILE__), '..', '..')
-  $CLASSPATH << File.join(base, 'pkg', 'classes')
-  $CLASSPATH << File.join(base, 'lib', 'bcprov-jdk14-139.jar')
-end
-
 begin
   require "openssl"
 rescue LoadError
@@ -88,7 +81,7 @@ class OpenSSL::TestCipher < Test::Unit::TestCase
 
   def test_empty_data
     @c1.encrypt
-    assert_raises(ArgumentError){ @c1.update("") }
+    assert_raise(ArgumentError){ @c1.update("") }
   end
 
   def test_disable_padding(padding=0)
@@ -159,7 +152,9 @@ class OpenSSL::TestCipher < Test::Unit::TestCase
       %w(ECB CBC CFB OFB).each{|mode|
         c1 = OpenSSL::Cipher::AES256.new(mode)
         c1.encrypt
-        c1.pkcs5_keyivgen("passwd")
+        assert_nothing_raised('This test fails w/o Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files') do
+          c1.pkcs5_keyivgen("passwd")
+        end
         ct = c1.update(pt) + c1.final
 
         c2 = OpenSSL::Cipher::AES256.new(mode)
@@ -176,6 +171,7 @@ class OpenSSL::TestCipher < Test::Unit::TestCase
     data = "1234567890~5J96LC303C1D22DD~20090930005944~http%3A%2F%2Flocalhost%3A8080%2Flogin%3B0%3B1~http%3A%2F%2Fmix-stage.oracle.com%2F~00"
     c1 = OpenSSL::Cipher::Cipher.new("DES-CBC")
     c1.padding = 0
+    c1.iv = "0" * 8
     c1.encrypt
     c1.key = key
     e = c1.update data
@@ -183,12 +179,13 @@ class OpenSSL::TestCipher < Test::Unit::TestCase
     
     c2 = OpenSSL::Cipher::Cipher.new("DES-CBC")
     c2.padding = 0
+    c2.iv = "0" * 8
     c2.decrypt
     c2.key = key
     d = c2.update e
     d << c2.final
 
-    assert_equal "]s\345F\251\250\223uO\315\220\255g\031\363c\006\205L\260G7\016`\265\377K5?\375\310\025\026\"\a\246N\270\234]\206\n\r\351\262\257\305\3632p_\205\257\026\226~-7\av#BZx\024\246'\f\216\005\201\r\372\201\316%W\250\210^\340{\371\245\374<~/YnV\277\311\230\250{\336\302W\353\032\321+\200pA\037\274\262\022*u\344\363\304\e\214J\353!\2352\267)s\360c\a", e
+    assert_equal "\342\320B.\300&X\310\344\253\025\215\017*\22015\344\024D\342\213\361\336\311\271\326\016\243\214\026\2545\002\237,\017s\202\316&Ew\323\221H\376\200\304\201\365\332Im\240\361\037\246\3536\001A2\341\324o0\350\364%=\325\330\240\324u\225\304h\277\272\361f\024\324\352\336\353N\002/]C\370!\003)\212oa\225\207\333\340\245\207\024\351\037\327[\212\001{\216\f\315\345\372\v\226\r\233?\002\vJK", e
     assert_equal data, d
   end
 end

data/test/openssl/test_ec.rb

@@ -0,0 +1,113 @@
+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_equal(key.dsa_verify_asn1(@data1, sig), true)
+        
+      assert_raise(OpenSSL::PKey::ECError) { key.dsa_sign_asn1(@data2) }
+    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

data/test/openssl/test_pair.rb

@@ -36,16 +36,14 @@ module SSLPair
 
   def ssl_pair
     ssls = server
-    tv = nil
     th = Thread.new {
       ns = ssls.accept
       ssls.close
-      tv = ns
+      ns
     }
     port = ssls.to_io.addr[1]
     c = client(port)
-    th.join
-    s = tv
+    s = th.value
     if block_given?
       begin
         yield c, s
@@ -65,10 +63,7 @@ class OpenSSL::TestEOF1 < Test::Unit::TestCase
 
   def open_file(content)
     s1, s2 = ssl_pair
-    Thread.new { 
-      s2 << content; 
-      s2.close 
-    }
+    Thread.new { s2 << content; s2.close }
     yield s1
   end
 end