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

diff --git a/ssl/t1_srvr.c b/ssl/t1_srvr.c
index 8b18572fb0..b75636abba 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 "ssl_locl.h"
+#include <openssl/buffer.h>
+#include <openssl/rand.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>
+#include <openssl/x509.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,19 +73,8 @@ int ver;
 		return(NULL);
 	}
 
-SSL_METHOD *TLSv1_server_method()
-	{
-	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;
-		}
-	return(&TLSv1_server_data);
-	}
+IMPLEMENT_tls1_meth_func(TLSv1_server_method,
+			ssl3_accept,
+			ssl_undefined_function,
+			tls1_get_server_method)