fix function name in error

[openssl.git] / ssl / t1_srvr.c

diff --git a/ssl/t1_srvr.c b/ssl/t1_srvr.c
index 56038792845ad03bbfdea8ea9530150953b23d37..42525e9e89ff08f8dd28ff65d1888f6b482352cb 100644 (file)
--- a/ssl/t1_srvr.c
+++ b/ssl/t1_srvr.c
@@ -57,20 +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(int ver)
+static const SSL_METHOD *tls1_get_server_method(int ver);
+static const SSL_METHOD *tls1_get_server_method(int ver)
        {
        if (ver == TLS1_VERSION)
                return(TLSv1_server_method());
@@ -78,19 +73,8 @@ static SSL_METHOD *tls1_get_server_method(int ver)
                return(NULL);
        }
 
-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;
-               }
-       return(&TLSv1_server_data);
-       }
+IMPLEMENT_tls1_meth_func(TLSv1_server_method,
+                       ssl3_accept,
+                       ssl_undefined_function,
+                       tls1_get_server_method)