nahi	2010-09-10 17:54:50 +0900 (Fri, 10 Sep 2010)

  New Revision: 29217

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29217

  Log:
    * ext/openssl/lib/openssl/x509-internal.rb: removed unused local
              variable.
    
            * test/openssl/*: less warnings while test running with -w.

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/lib/openssl/x509-internal.rb
    trunk/test/openssl/test_pair.rb
    trunk/test/openssl/test_pkcs7.rb
    trunk/test/openssl/test_ssl.rb
    trunk/test/openssl/test_x509name.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29216)
+++ ChangeLog	(revision 29217)
@@ -1,3 +1,10 @@
+Fri Sep 10 17:49:34 2010  NAKAMURA, Hiroshi  <nahi@r...>
+
+	* ext/openssl/lib/openssl/x509-internal.rb: removed unused local
+	  variable.
+
+	* test/openssl/*: less warnings while test running with -w.
+
 Fri Sep 10 16:49:20 2010  Akinori MUSHA  <knu@i...>
 
 	* class.c (rb_scan_args): Add support for optional keyword
Index: ext/openssl/lib/openssl/x509-internal.rb
===================================================================
--- ext/openssl/lib/openssl/x509-internal.rb	(revision 29216)
+++ ext/openssl/lib/openssl/x509-internal.rb	(revision 29217)
@@ -109,7 +109,6 @@
           ary = []
           while true
             if md = TypeAndValue.match(str)
-              matched = md.to_s
               remain = md.post_match
               type = md[1]
               value, tag = expand_value(md[2], md[3], md[4]) rescue nil
Index: test/openssl/test_pkcs7.rb
===================================================================
--- test/openssl/test_pkcs7.rb	(revision 29216)
+++ test/openssl/test_pkcs7.rb	(revision 29217)
@@ -22,16 +22,16 @@
       ["subjectKeyIdentifier","hash",false],
       ["authorityKeyIdentifier","keyid:always",false],
     ]
-    @ca_cert = issue_cert(ca, @rsa2048, 1, Time.now, Time.now+3600, ca_exts,
+    @ca_cert = issue_cert(ca, @rsa2048, 1, now, now+3600, ca_exts,
                            nil, nil, OpenSSL::Digest::SHA1.new)
     ee_exts = [
       ["keyUsage","Non Repudiation, Digital Signature, Key Encipherment",true],
       ["authorityKeyIdentifier","keyid:always",false],
       ["extendedKeyUsage","clientAuth, emailProtection, codeSigning",false],
     ]
-    @ee1_cert = issue_cert(ee1, @rsa1024, 2, Time.now, Time.now+1800, ee_exts,
+    @ee1_cert = issue_cert(ee1, @rsa1024, 2, now, now+1800, ee_exts,
                            @ca_cert, @rsa2048, OpenSSL::Digest::SHA1.new)
-    @ee2_cert = issue_cert(ee2, @rsa1024, 3, Time.now, Time.now+1800, ee_exts,
+    @ee2_cert = issue_cert(ee2, @rsa1024, 3, now, now+1800, ee_exts,
                            @ca_cert, @rsa2048, OpenSSL::Digest::SHA1.new)
   end
 
@@ -109,7 +109,9 @@
     flag = OpenSSL::PKCS7::BINARY|OpenSSL::PKCS7::DETACHED
     tmp = OpenSSL::PKCS7.sign(@ee1_cert, @rsa1024, data, ca_certs, flag)
     p7 = OpenSSL::PKCS7.new(tmp.to_der)
-    a1 = OpenSSL::ASN1.decode(p7)
+    assert_nothing_raised do
+      OpenSSL::ASN1.decode(p7)
+    end
 
     certs = p7.certificates
     signers = p7.signers
Index: test/openssl/test_pair.rb
===================================================================
--- test/openssl/test_pair.rb	(revision 29216)
+++ test/openssl/test_pair.rb	(revision 29217)
@@ -195,7 +195,6 @@
     ctx = OpenSSL::SSL::SSLContext.new()
     ctx.ciphers = "ADH"
     serv = TCPServer.new(host, port)
-    ssls = OpenSSL::SSL::SSLServer.new(serv, ctx)
 
     port = serv.connect_address.ip_port
 
Index: test/openssl/test_ssl.rb
===================================================================
--- test/openssl/test_ssl.rb	(revision 29216)
+++ test/openssl/test_ssl.rb	(revision 29217)
@@ -286,13 +286,14 @@
       ssl.sync_close = true
       str = "x" * 1000 + "\n"
 
-      ITERATIONS.times{
-        ssl.puts(str)
-        assert_equal(str, ssl.gets)
-      }
+      OpenSSL::TestUtils.silent do
+        ITERATIONS.times{
+          ssl.puts(str)
+          assert_equal(str, ssl.gets)
+        }
+        starttls(ssl)
+      end
 
-      starttls(ssl)
-
       ITERATIONS.times{
         ssl.puts(str)
         assert_equal(str, ssl.gets)
Index: test/openssl/test_x509name.rb
===================================================================
--- test/openssl/test_x509name.rb	(revision 29216)
+++ test/openssl/test_x509name.rb	(revision 29217)
@@ -120,14 +120,14 @@
     assert_equal(OpenSSL::ASN1::UTF8STRING, ary[2][2])
 
     dn2 = "DC=org, DC=ruby-lang, CN=www.ruby-lang.org"
-    name = OpenSSL::X509::Name.parse(dn)
+    name = OpenSSL::X509::Name.parse(dn2)
     ary = name.to_a
     assert_equal(dn, name.to_s)
     assert_equal("org", ary[0][1])
     assert_equal("ruby-lang", ary[1][1])
     assert_equal("www.ruby-lang.org", ary[2][1])
 
-    name = OpenSSL::X509::Name.parse(dn, @obj_type_tmpl)
+    name = OpenSSL::X509::Name.parse(dn2, @obj_type_tmpl)
     ary = name.to_a
     assert_equal(OpenSSL::ASN1::IA5STRING, ary[0][2])
     assert_equal(OpenSSL::ASN1::IA5STRING, ary[1][2])

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/