Fix ssl3_get_message handle message fragmentation correctly.

[openssl.git] / ssl / s23_meth.c

diff --git a/ssl/s23_meth.c b/ssl/s23_meth.c
index 1eed7a54bcfd98a5eb97ca0d1c8f145d308f5771..40684311db30e3421ba39fcf4f8e4a6d3986e989 100644 (file)
--- a/ssl/s23_meth.c
+++ b/ssl/s23_meth.c
@@ -57,14 +57,14 @@
  */
 
 #include <stdio.h>
-#include "objects.h"
+#include <openssl/objects.h>
 #include "ssl_locl.h"
 
-static SSL_METHOD *ssl23_get_method(ver)
-int ver;
+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)
@@ -73,19 +73,19 @@ int ver;
                return(NULL);
        }
 
-SSL_METHOD *SSLv23_method()
+SSL_METHOD *SSLv23_method(void)
        {
        static int init=1;
        static SSL_METHOD SSLv23_data;
 
        if (init)
                {
-               init=0;
                memcpy((char *)&SSLv23_data,(char *)sslv23_base_method(),
                        sizeof(SSL_METHOD));
                SSLv23_data.ssl_connect=ssl23_connect;
                SSLv23_data.ssl_accept=ssl23_accept;
                SSLv23_data.get_ssl_method=ssl23_get_method;
+               init=0;
                }
        return(&SSLv23_data);
        }