Fix some bugs and document others

[openssl.git] / ssl / s3_meth.c

diff --git a/ssl/s3_meth.c b/ssl/s3_meth.c
index d9cd9c2210130020ddd7f3ebd71ab4ec71e208f7..81bcad89c52f7f0fa1c24c3c85d1e9de4201592e 100644 (file)
--- a/ssl/s3_meth.c
+++ b/ssl/s3_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 *ssl3_get_method(int ver);
-#else
-static SSL_METHOD *ssl3_get_method();
-#endif
-
 static SSL_METHOD *ssl3_get_method(int ver)
        {
        if (ver == SSL3_VERSION)
@@ -81,12 +76,12 @@ SSL_METHOD *SSLv3_method(void)
 
        if (init)
                {
-               init=0;
                memcpy((char *)&SSLv3_data,(char *)sslv3_base_method(),
                        sizeof(SSL_METHOD));
                SSLv3_data.ssl_connect=ssl3_connect;
                SSLv3_data.ssl_accept=ssl3_accept;
                SSLv3_data.get_ssl_method=ssl3_get_method;
+               init=0;
                }
        return(&SSLv3_data);
        }