X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ssl%2Fmethods.c;h=525f59e91231c7b4c2004d7b6d71e98e09698eba;hb=2d5536609ba92481daf42614a36bafb4e1d99293;hp=7d27f9d8ff27e1a82d108824cb1d286b1b0fb237;hpb=032924c4b4104654ff8659b4701e4ab25872a12e;p=oweals%2Fopenssl.git

diff --git a/ssl/methods.c b/ssl/methods.c
index 7d27f9d8ff..525f59e912 100644
--- a/ssl/methods.c
+++ b/ssl/methods.c
@@ -1,17 +1,18 @@
 /*
  * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
 
 #include <stdio.h>
+#include <openssl/macros.h>
 #include <openssl/objects.h>
-#include "ssl_locl.h"
+#include "ssl_local.h"
 
-/*
+/*-
  * TLS/SSLv3 methods
  */
 
@@ -19,201 +20,160 @@ IMPLEMENT_tls_meth_func(TLS_ANY_VERSION, 0, 0,
                         TLS_method,
                         ossl_statem_accept,
                         ossl_statem_connect, TLSv1_2_enc_data)
-
+IMPLEMENT_tls_meth_func(TLS1_3_VERSION, 0, SSL_OP_NO_TLSv1_3,
+                        tlsv1_3_method,
+                        ossl_statem_accept,
+                        ossl_statem_connect, TLSv1_3_enc_data)
 #ifndef OPENSSL_NO_TLS1_2_METHOD
 IMPLEMENT_tls_meth_func(TLS1_2_VERSION, 0, SSL_OP_NO_TLSv1_2,
                         tlsv1_2_method,
                         ossl_statem_accept,
                         ossl_statem_connect, TLSv1_2_enc_data)
 #endif
-
 #ifndef OPENSSL_NO_TLS1_1_METHOD
 IMPLEMENT_tls_meth_func(TLS1_1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_TLSv1_1,
                         tlsv1_1_method,
                         ossl_statem_accept,
                         ossl_statem_connect, TLSv1_1_enc_data)
 #endif
-
 #ifndef OPENSSL_NO_TLS1_METHOD
 IMPLEMENT_tls_meth_func(TLS1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_TLSv1,
                         tlsv1_method,
-                        ossl_statem_accept,
-                        ossl_statem_connect, TLSv1_enc_data)
+                        ossl_statem_accept, ossl_statem_connect, TLSv1_enc_data)
 #endif
-
 #ifndef OPENSSL_NO_SSL3_METHOD
 IMPLEMENT_ssl3_meth_func(sslv3_method, ossl_statem_accept, ossl_statem_connect)
 #endif
-
-
-/*
+/*-
  * TLS/SSLv3 server methods
  */
-
 IMPLEMENT_tls_meth_func(TLS_ANY_VERSION, 0, 0,
                         TLS_server_method,
                         ossl_statem_accept,
-                        ssl_undefined_function,
-                        TLSv1_2_enc_data)
-
+                        ssl_undefined_function, TLSv1_2_enc_data)
+IMPLEMENT_tls_meth_func(TLS1_3_VERSION, 0, SSL_OP_NO_TLSv1_3,
+                        tlsv1_3_server_method,
+                        ossl_statem_accept,
+                        ssl_undefined_function, TLSv1_3_enc_data)
 #ifndef OPENSSL_NO_TLS1_2_METHOD
 IMPLEMENT_tls_meth_func(TLS1_2_VERSION, 0, SSL_OP_NO_TLSv1_2,
                         tlsv1_2_server_method,
                         ossl_statem_accept,
-                        ssl_undefined_function,
-                        TLSv1_2_enc_data)
+                        ssl_undefined_function, TLSv1_2_enc_data)
 #endif
-
 #ifndef OPENSSL_NO_TLS1_1_METHOD
 IMPLEMENT_tls_meth_func(TLS1_1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_TLSv1_1,
                         tlsv1_1_server_method,
                         ossl_statem_accept,
-                        ssl_undefined_function,
-                        TLSv1_1_enc_data)
+                        ssl_undefined_function, TLSv1_1_enc_data)
 #endif
-
 #ifndef OPENSSL_NO_TLS1_METHOD
 IMPLEMENT_tls_meth_func(TLS1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_TLSv1,
                         tlsv1_server_method,
                         ossl_statem_accept,
-                        ssl_undefined_function,
-                        TLSv1_enc_data)
+                        ssl_undefined_function, TLSv1_enc_data)
 #endif
-
 #ifndef OPENSSL_NO_SSL3_METHOD
 IMPLEMENT_ssl3_meth_func(sslv3_server_method,
-                         ossl_statem_accept,
-                         ssl_undefined_function)
+                         ossl_statem_accept, ssl_undefined_function)
 #endif
-
-
-/*
+/*-
  * TLS/SSLv3 client methods
  */
-
 IMPLEMENT_tls_meth_func(TLS_ANY_VERSION, 0, 0,
                         TLS_client_method,
                         ssl_undefined_function,
-                        ossl_statem_connect,
-                        TLSv1_2_enc_data)
-
+                        ossl_statem_connect, TLSv1_2_enc_data)
+IMPLEMENT_tls_meth_func(TLS1_3_VERSION, 0, SSL_OP_NO_TLSv1_3,
+                        tlsv1_3_client_method,
+                        ssl_undefined_function,
+                        ossl_statem_connect, TLSv1_3_enc_data)
 #ifndef OPENSSL_NO_TLS1_2_METHOD
 IMPLEMENT_tls_meth_func(TLS1_2_VERSION, 0, SSL_OP_NO_TLSv1_2,
                         tlsv1_2_client_method,
                         ssl_undefined_function,
-                        ossl_statem_connect,
-                        TLSv1_2_enc_data)
+                        ossl_statem_connect, TLSv1_2_enc_data)
 #endif
-
 #ifndef OPENSSL_NO_TLS1_1_METHOD
 IMPLEMENT_tls_meth_func(TLS1_1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_TLSv1_1,
                         tlsv1_1_client_method,
                         ssl_undefined_function,
-                        ossl_statem_connect,
-                        TLSv1_1_enc_data)
+                        ossl_statem_connect, TLSv1_1_enc_data)
 #endif
-
 #ifndef OPENSSL_NO_TLS1_METHOD
 IMPLEMENT_tls_meth_func(TLS1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_TLSv1,
                         tlsv1_client_method,
                         ssl_undefined_function,
-                        ossl_statem_connect,
-                        TLSv1_enc_data)
+                        ossl_statem_connect, TLSv1_enc_data)
 #endif
-
 #ifndef OPENSSL_NO_SSL3_METHOD
 IMPLEMENT_ssl3_meth_func(sslv3_client_method,
-                         ssl_undefined_function,
-                         ossl_statem_connect)
+                         ssl_undefined_function, ossl_statem_connect)
 #endif
-
-
-/*
+/*-
  * DTLS methods
  */
-
 #ifndef OPENSSL_NO_DTLS1_METHOD
 IMPLEMENT_dtls1_meth_func(DTLS1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_DTLSv1,
                           dtlsv1_method,
                           ossl_statem_accept,
-                          ossl_statem_connect,
-                          DTLSv1_enc_data)
+                          ossl_statem_connect, DTLSv1_enc_data)
 #endif
-
 #ifndef OPENSSL_NO_DTLS1_2_METHOD
 IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION, 0, SSL_OP_NO_DTLSv1_2,
                           dtlsv1_2_method,
                           ossl_statem_accept,
-                          ossl_statem_connect,
-                          DTLSv1_2_enc_data)
+                          ossl_statem_connect, DTLSv1_2_enc_data)
 #endif
-
 IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION, 0, 0,
                           DTLS_method,
                           ossl_statem_accept,
-                          ossl_statem_connect,
-                          DTLSv1_2_enc_data)
+                          ossl_statem_connect, DTLSv1_2_enc_data)
 
-/*
+/*-
  * DTLS server methods
  */
-
 #ifndef OPENSSL_NO_DTLS1_METHOD
 IMPLEMENT_dtls1_meth_func(DTLS1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_DTLSv1,
                           dtlsv1_server_method,
                           ossl_statem_accept,
-                          ssl_undefined_function,
-                          DTLSv1_enc_data)
+                          ssl_undefined_function, DTLSv1_enc_data)
 #endif
-
 #ifndef OPENSSL_NO_DTLS1_2_METHOD
 IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION, 0, SSL_OP_NO_DTLSv1_2,
                           dtlsv1_2_server_method,
                           ossl_statem_accept,
-                          ssl_undefined_function,
-                          DTLSv1_2_enc_data)
+                          ssl_undefined_function, DTLSv1_2_enc_data)
 #endif
-
 IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION, 0, 0,
                           DTLS_server_method,
                           ossl_statem_accept,
-                          ssl_undefined_function,
-                          DTLSv1_2_enc_data)
-
+                          ssl_undefined_function, DTLSv1_2_enc_data)
 
-/*
+/*-
  * DTLS client methods
  */
-
 #ifndef OPENSSL_NO_DTLS1_METHOD
 IMPLEMENT_dtls1_meth_func(DTLS1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_DTLSv1,
                           dtlsv1_client_method,
                           ssl_undefined_function,
-                          ossl_statem_connect,
-                          DTLSv1_enc_data)
+                          ossl_statem_connect, DTLSv1_enc_data)
 IMPLEMENT_dtls1_meth_func(DTLS1_BAD_VER, SSL_METHOD_NO_SUITEB, SSL_OP_NO_DTLSv1,
                           dtls_bad_ver_client_method,
                           ssl_undefined_function,
-                          ossl_statem_connect,
-                          DTLSv1_enc_data)
+                          ossl_statem_connect, DTLSv1_enc_data)
 #endif
-
 #ifndef OPENSSL_NO_DTLS1_2_METHOD
 IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION, 0, SSL_OP_NO_DTLSv1_2,
                           dtlsv1_2_client_method,
                           ssl_undefined_function,
-                          ossl_statem_connect,
-                          DTLSv1_2_enc_data)
+                          ossl_statem_connect, DTLSv1_2_enc_data)
 #endif
-
 IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION, 0, 0,
                           DTLS_client_method,
                           ssl_undefined_function,
-                          ossl_statem_connect,
-                          DTLSv1_2_enc_data)
-
-#if OPENSSL_API_COMPAT < 0x10100000L
-
+                          ossl_statem_connect, DTLSv1_2_enc_data)
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 # ifndef OPENSSL_NO_TLS1_2_METHOD
 const SSL_METHOD *TLSv1_2_method(void)
 {
@@ -317,4 +277,3 @@ const SSL_METHOD *DTLSv1_client_method(void)
 # endif
 
 #endif
-