Client side compression algorithm sanity checks: ensure old compression

[openssl.git] / ssl / t1_clnt.c

diff --git a/ssl/t1_clnt.c b/ssl/t1_clnt.c
index 0e068c38167532f687e03cceec0703609b8bb1de..b06bada6f22d32191577caf5cbe5f99cf3e29df0 100644 (file)
--- a/ssl/t1_clnt.c
+++ b/ssl/t1_clnt.c
@@ -57,39 +57,29 @@
  */
 
 #include <stdio.h>
+#include "ssl_locl.h"
 #include <openssl/buffer.h>
 #include <openssl/rand.h>
 #include <openssl/objects.h>
 #include <openssl/evp.h>
-#include "ssl_locl.h"
-
-#ifndef NOPROTO
-static SSL_METHOD *tls1_get_client_method(int ver);
-#else
-static SSL_METHOD *tls1_get_client_method();
-#endif
 
-static SSL_METHOD *tls1_get_client_method(int ver)
+static const SSL_METHOD *tls1_get_client_method(int ver);
+static const SSL_METHOD *tls1_get_client_method(int ver)
        {
+       if (ver == TLS1_1_VERSION)
+               return TLSv1_1_client_method();
        if (ver == TLS1_VERSION)
-               return(TLSv1_client_method());
-       else
-               return(NULL);
+               return TLSv1_client_method();
+       return NULL;
        }
 
-SSL_METHOD *TLSv1_client_method(void)
-       {
-       static int init=1;
-       static SSL_METHOD TLSv1_client_data;
+IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_client_method,
+                       ssl_undefined_function,
+                       ssl3_connect,
+                       tls1_get_client_method)
 
-       if (init)
-               {
-               memcpy((char *)&TLSv1_client_data,(char *)tlsv1_base_method(),
-                       sizeof(SSL_METHOD));
-               TLSv1_client_data.ssl_connect=ssl3_connect;
-               TLSv1_client_data.get_ssl_method=tls1_get_client_method;
-               init=0;
-               }
-       return(&TLSv1_client_data);
-       }
+IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_client_method,
+                       ssl_undefined_function,
+                       ssl3_connect,
+                       tls1_get_client_method)