--- AnyEvent/t/80_ssltest.t	2008/10/02 08:43:58	1.1
+++ AnyEvent/t/80_ssltest.t	2011/08/14 20:33:24	1.8
@@ -1,21 +1,21 @@
 #!/usr/bin/perl
 
-use Test::More qw(no_plan);
+BEGIN { eval "use Net::SSLeay 1.33 (); 1" or ((print "1..0 # SKIP no usable Net::SSLeay\n"), exit 0) }
 
+use Test::More tests => 415;
+
+no warnings;
 use strict qw(vars subs);
 
 use AnyEvent::Socket;
 use AnyEvent::Handle;
+use AnyEvent::TLS;
 
-{
-   my $ctx = AnyEvent::Handle::TLS_CTX;
-   Net::SSLeay::CTX_use_certificate_chain_file ($ctx, $0)
-      or die "unable to set certificate chain file";
-   Net::SSLeay::CTX_use_PrivateKey_file ($ctx, $0, Net::SSLeay::FILETYPE_PEM ())
-      or die "unable to set private key file";
-}
+my $ctx = new AnyEvent::TLS cert_file => $0;
 
 for my $mode (1..5) {
+   ok (1, "mode $mode");
+
    my $server_done = AnyEvent->condvar;
    my $client_done = AnyEvent->condvar;
 
@@ -30,6 +30,7 @@
 
       my $hd; $hd = new AnyEvent::Handle
          tls      => "accept",
+         tls_ctx  => $ctx,
          fh       => $fh,
          timeout  => 8,
          on_error => sub {
@@ -84,85 +85,93 @@
       $server_port->send ($_[2]);
    };
 
-   tcp_connect "localhost", $server_port->recv, sub {
-      my ($fh) = @_;
-
-      ok (1, "client_connect $mode");
-
-      my $hd; $hd = new AnyEvent::Handle
-         tls      => "connect",
-         fh       => $fh,
-         timeout  => 8,
-         on_error => sub {
-            ok (0, "client_error <$!>");
-            $client_done->send; undef $hd;
-         },
-         on_eof   => sub {
-            ok (1, "client_eof");
-            $client_done->send; undef $hd;
-         };
-
-      if ($mode == 1) {
-         $hd->push_write ("1\n");
+   my $hd; $hd = new AnyEvent::Handle
+      connect    => ["localhost", $server_port->recv],
+      tls        => "connect",
+      tls_ctx    => $ctx,
+      timeout    => 8,
+      on_connect => sub {
+         ok (1, "client_connect $mode");
+      },
+      on_error   => sub {
+         ok (0, "client_error <$!>");
+         $client_done->send; undef $hd;
+      },
+      on_eof     => sub {
+         ok (1, "client_eof");
+         $client_done->send; undef $hd;
+      };
+
+   if ($mode == 1) {
+      $hd->push_write ("1\n");
+      $hd->on_drain (sub {
+         ok (1, "client_drain");
+         $client_done->send; undef $hd;
+      });
+   } elsif ($mode == 2) {
+      $hd->push_read (line => sub {
+         ok ($_[1] eq "2", "line 2 <$_[1]>");
+      });
+   } elsif ($mode == 3) {
+      $hd->push_write ("3\n");
+      $hd->push_read (line => sub {
+         ok ($_[1] eq "4", "line 4 <$_[1]>");
+      });
+   } elsif ($mode == 4) {
+      $hd->push_read (line => sub {
+         ok ($_[1] eq "5", "line 5 <$_[1]>");
+         $hd->push_write ("6\n");
          $hd->on_drain (sub {
             ok (1, "client_drain");
             $client_done->send; undef $hd;
          });
-      } elsif ($mode == 2) {
-         $hd->push_read (line => sub {
-            ok ($_[1] eq "2", "line 2 <$_[1]>");
-         });
-      } elsif ($mode == 3) {
-         $hd->push_write ("3\n");
-         $hd->push_read (line => sub {
-            ok ($_[1] eq "4", "line 4 <$_[1]>");
-         });
-      } elsif ($mode == 4) {
-         $hd->push_read (line => sub {
-            ok ($_[1] eq "5", "line 5 <$_[1]>");
-            $hd->push_write ("6\n");
-            $hd->on_drain (sub {
-               ok (1, "client_drain");
-               $client_done->send; undef $hd;
+      });
+   } elsif ($mode == 5) {
+      # some randomly-sized blocks
+      srand 0;
+      my $cnt = 64;
+      my $block; $block = sub {
+         my $len = (16 << int rand 14) - 16 + int rand 32;
+         ok (1, "write $len");
+         $hd->push_write ("$len\n");
+         $hd->push_write (packstring => "N", "\x00" x $len);
+      };
+
+      for my $i (1..$cnt) {
+         $hd->push_read (line => sub {
+            my ($i, $cnt, $block) = ($i, $cnt, $block); # 5.8.9. bug workaround
+            my $len = $_[1];
+            ok (1, "client block $len/1");
+            $hd->unshift_read (packstring => "N", sub {
+               ok ($len == length $_[1], "client block $len/2");
+
+               if ($i != $cnt) {
+                  $block->();
+               } else {
+                  ok (1, "client_drain 5");
+                  $client_done->send; undef $hd;
+               }
             });
          });
-      } elsif ($mode == 5) {
-         # some randomly-sized blocks
-         srand 0;
-         my $cnt = 64;
-         my $block; $block = sub {
-            my $len = (16 << int rand 14) - 16 + int rand 32;
-            ok (1, "write $len");
-            $hd->push_write ("$len\n");
-            $hd->push_write (packstring => "N", "\x00" x $len);
-         };
-
-         for my $i (1..$cnt) {
-            $hd->push_read (line => sub {
-               my $len = $_[1];
-               ok (1, "client block $len/1");
-               $hd->unshift_read (packstring => "N", sub {
-                  ok ($len == length $_[1], "client block $len/2");
-
-                  if ($i != $cnt) {
-                     $block->();
-                  } else {
-                     ok (1, "client_drain");
-                     $client_done->send; undef $hd;
-                  }
-               });
-            });
-         }
-
-         $block->();
       }
-   };
+
+      $block->();
+   }
 
    $server_done->recv;
    $client_done->recv;
 }
 
 __END__
+-----BEGIN RSA PRIVATE KEY-----
+MIIBOwIBAAJBAL3Qbshr1ENmAzHxIRIvUaIG8+PCjc7xdXLBm+asBPMu0APQVQXJ
+RTL3DueRUB51hAgSPgzSnj+ryZVzdcDER+UCAwEAAQJAGRftDWHz9dUOpxORo63N
+xPXWWE3oIWuac0lVKvGi1eMoI4UCW/Y7qM4rXsUXqasUo3mxV24+QqJHDQid1qi6
+AQIhAN5BtiqfjFjb97uUbdE6aiqE+nSG0eXlkeHKNpBNtiUxAiEA2qHNZ5fcQTqT
+4qlnYhbI+g6bTwuR7QnzzGTlHUGxsPUCIQDLfvTw37Zb4cNYb1WBPW/ZUHoU2SAz
+01cXmdMNmumL8QIhAJMGTENl9FBJPDopAcUM3YqLWBYICdIF51WEZC8QhpYhAiBe
+KcoNT51hv3pKK8oZtPJGsKFjmGVVnZeNNzyQmt/YWw==
+-----END RSA PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
 MIIDJjCCAtCgAwIBAgIJAJ3NPnD6z5+2MA0GCSqGSIb3DQEBBQUAMIGWMQswCQYD
 VQQGEwJYTjETMBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5
@@ -182,15 +191,6 @@
 EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQA48HjY23liyBMmh3cNo9TC+/bu/G3E
 oT5npm3+Lh6VA/4kKMyMu2mP31BToTZfl7vUcBJCQBhPFYOiPd/HnwzW
 -----END CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBAL3Qbshr1ENmAzHxIRIvUaIG8+PCjc7xdXLBm+asBPMu0APQVQXJ
-RTL3DueRUB51hAgSPgzSnj+ryZVzdcDER+UCAwEAAQJAGRftDWHz9dUOpxORo63N
-xPXWWE3oIWuac0lVKvGi1eMoI4UCW/Y7qM4rXsUXqasUo3mxV24+QqJHDQid1qi6
-AQIhAN5BtiqfjFjb97uUbdE6aiqE+nSG0eXlkeHKNpBNtiUxAiEA2qHNZ5fcQTqT
-4qlnYhbI+g6bTwuR7QnzzGTlHUGxsPUCIQDLfvTw37Zb4cNYb1WBPW/ZUHoU2SAz
-01cXmdMNmumL8QIhAJMGTENl9FBJPDopAcUM3YqLWBYICdIF51WEZC8QhpYhAiBe
-KcoNT51hv3pKK8oZtPJGsKFjmGVVnZeNNzyQmt/YWw==
------END RSA PRIVATE KEY-----