fix more race conditions

[openssl.git] / ssl / s23_meth.c

diff --git a/ssl/s23_meth.c b/ssl/s23_meth.c
index dbe282bfd0ab73c689c52df9c951634bbae795b9..f207140835f8680741db3e4ad3de83f69b1b0712 100644 (file)
--- a/ssl/s23_meth.c
+++ b/ssl/s23_meth.c
@@ -1,5 +1,5 @@
 /* ssl/s23_meth.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -57,33 +57,42 @@
  */
 
 #include <stdio.h>
-#include "objects.h"
+#include <openssl/objects.h>
 #include "ssl_locl.h"
 
-static SSL_METHOD *ssl23_get_method(ver)
-int ver;
+static SSL_METHOD *ssl23_get_method(int ver);
+static SSL_METHOD *ssl23_get_method(int ver)
        {
-       if (ver == 2)
-               return(SSLv23_method());
-       else if (ver == 3)
+       if (ver == SSL2_VERSION)
+               return(SSLv2_method());
+       else if (ver == SSL3_VERSION)
                return(SSLv3_method());
+       else if (ver == TLS1_VERSION)
+               return(TLSv1_method());
        else
                return(NULL);
        }
 
-SSL_METHOD *SSLv23_method()
+SSL_METHOD *SSLv23_method(void)
        {
        static int init=1;
        static SSL_METHOD SSLv23_data;
 
        if (init)
                {
-               init=0;
-               memcpy((char *)&SSLv23_data,(char *)sslv23_base_method(),
-                       sizeof(SSL_METHOD));
-               SSLv23_data.ssl_connect=ssl23_connect;
-               SSLv23_data.ssl_accept=ssl23_accept;
-               SSLv23_data.get_ssl_method=ssl23_get_method;
+               CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD);
+               
+               if (init)
+                       {
+                       memcpy((char *)&SSLv23_data,(char *)sslv23_base_method(),
+                               sizeof(SSL_METHOD));
+                       SSLv23_data.ssl_connect=ssl23_connect;
+                       SSLv23_data.ssl_accept=ssl23_accept;
+                       SSLv23_data.get_ssl_method=ssl23_get_method;
+                       init=0;
+                       }
+               
+               CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD);
                }
        return(&SSLv23_data);
        }