1 files changed, 4 insertions, 23 deletions
diff --git a/ssl/d1_meth.c b/ssl/d1_meth.c
index dc4c8ede86..8a6cf31947 100644
--- a/ssl/d1_meth.c
+++ b/ssl/d1_meth.c
@@ -70,27 +70,8 @@ static SSL_METHOD *dtls1_get_method(int ver)
 		return(NULL);
 	}
 
-SSL_METHOD *DTLSv1_method(void)
-	{
-	static int init=1;
-	static SSL_METHOD DTLSv1_data;
-
-	if (init)
-		{
-		CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD);
-		
-		if (init)
-			{
-			memcpy((char *)&DTLSv1_data,(char *)dtlsv1_base_method(),
-				sizeof(SSL_METHOD));
-			DTLSv1_data.ssl_connect=dtls1_connect;
-			DTLSv1_data.ssl_accept=dtls1_accept;
-			DTLSv1_data.get_ssl_method=dtls1_get_method;
-			init=0;
-			}
+IMPLEMENT_dtls1_meth_func(DTLSv1_method,
+			dtls1_accept,
+			dtls1_connect,
+			dtls1_get_method)
 
-		CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD);
-		}
-	
-	return(&DTLSv1_data);
-	}