Move ssl3_do_write from s3_pkt.c to s3_both.c.

[openssl.git] / ssl / s23_meth.c

diff --git a/ssl/s23_meth.c b/ssl/s23_meth.c
index edcbdbb2bd14cb35af5d632a5f0ac666e5aa262e..b52ca1d58b3f2763c51bd1cb12ba1109487c7482 100644 (file)
--- a/ssl/s23_meth.c
+++ b/ssl/s23_meth.c
@@ -57,15 +57,10 @@
  */
 
 #include <stdio.h>
-#include "objects.h"
+#include <openssl/objects.h>
 #include "ssl_locl.h"
 
-#ifndef NOPROTO
 static SSL_METHOD *ssl23_get_method(int ver);
-#else
-static SSL_METHOD *ssl23_get_method();
-#endif
-
 static SSL_METHOD *ssl23_get_method(int ver)
        {
        if (ver == SSL2_VERSION)
@@ -85,12 +80,12 @@ SSL_METHOD *SSLv23_method(void)
 
        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);
        }