X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ssl%2Ft1_srvr.c;h=996b7ca8e2ef54a6bc65288d94e9f9aa8e9810e0;hb=470fa98f8aa5ca37e7e6720be7ca1abda8f906f0;hp=8b18572fb01544057d79f7d0ad715277b204db0b;hpb=9b3086fe382e7b0f53b8634d0e75f1a659ab2653;p=oweals%2Fopenssl.git

diff --git a/ssl/t1_srvr.c b/ssl/t1_srvr.c
index 8b18572fb0..996b7ca8e2 100644
--- a/ssl/t1_srvr.c
+++ b/ssl/t1_srvr.c
@@ -57,21 +57,15 @@
  */
 
 #include <stdio.h>
-#include "buffer.h"
-#include "rand.h"
-#include "objects.h"
-#include "evp.h"
-#include "x509.h"
+#include <openssl/buffer.h>
+#include <openssl/rand.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
 #include "ssl_locl.h"
 
-#ifndef NOPROTO
 static SSL_METHOD *tls1_get_server_method(int ver);
-#else
-static SSL_METHOD *tls1_get_server_method();
-#endif
-
-static SSL_METHOD *tls1_get_server_method(ver)
-int ver;
+static SSL_METHOD *tls1_get_server_method(int ver)
 	{
 	if (ver == TLS1_VERSION)
 		return(TLSv1_server_method());
@@ -79,18 +73,18 @@ int ver;
 		return(NULL);
 	}
 
-SSL_METHOD *TLSv1_server_method()
+SSL_METHOD *TLSv1_server_method(void)
 	{
 	static int init=1;
 	static SSL_METHOD TLSv1_server_data;
 
 	if (init)
 		{
-		init=0;
 		memcpy((char *)&TLSv1_server_data,(char *)tlsv1_base_method(),
 			sizeof(SSL_METHOD));
 		TLSv1_server_data.ssl_accept=ssl3_accept;
 		TLSv1_server_data.get_ssl_method=tls1_get_server_method;
+		init=0;
 		}
 	return(&TLSv1_server_data);
 	}