SSLv2 session reuse bugfix from main development branch.

diff --git a/CHANGES b/CHANGES
index 82a02295a4fb4ab979d0cf58e3927505289ed598..34a07b619fe7903947321d25b736162dd365904b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
 
  Changes between 0.9.6 and 0.9.6a  [xx XXX 2001]
 
+  *) Make it possible to reuse SSLv2 sessions.
+     [Richard Levitte]
+
   *) In copy_email() check for >= 0 as a return value for
      X509_NAME_get_index_by_NID() since 0 is a valid index.
      [Steve Henson reported by Massimiliano Pala <madwolf@opensca.org>]

diff --git a/ssl/s23_meth.c b/ssl/s23_meth.c
index b52ca1d58b3f2763c51bd1cb12ba1109487c7482..40684311db30e3421ba39fcf4f8e4a6d3986e989 100644 (file)
--- a/ssl/s23_meth.c
+++ b/ssl/s23_meth.c
@@ -64,7 +64,7 @@ static SSL_METHOD *ssl23_get_method(int ver);
 static SSL_METHOD *ssl23_get_method(int ver)
        {
        if (ver == SSL2_VERSION)
-               return(SSLv23_method());
+               return(SSLv2_method());
        else if (ver == SSL3_VERSION)
                return(SSLv3_method());
        else if (ver == TLS1_VERSION)