Run make update

Reviewed-by: Rich Salz <rsalz@openssl.org>
MR: #2296

diff --git a/util/libssl.num b/util/libssl.num
index 49c9c35484b6def00603116564fc66fd24934160..6ec5b4224da14558b9ea55ce147cc42c172a95d9 100644 (file)
--- a/util/libssl.num
+++ b/util/libssl.num
@@ -50,7 +50,7 @@ SSL_CTX_set_security_callback           49    1_1_0   EXIST::FUNCTION:
 SSL_CONF_cmd_value_type                 50     1_1_0   EXIST::FUNCTION:
 SSL_CTX_remove_session                  51     1_1_0   EXIST::FUNCTION:
 SSL_SESSION_new                         52     1_1_0   EXIST::FUNCTION:
-TLSv1_2_server_method                   53     1_1_0   EXIST::FUNCTION:
+TLSv1_2_server_method                   53     1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_1_0,TLS1_2_METHOD
 BIO_new_buffer_ssl_connect              54     1_1_0   EXIST::FUNCTION:
 SSL_CTX_set0_security_ex_data           55     1_1_0   EXIST::FUNCTION:
 SSL_alert_desc_string                   56     1_1_0   EXIST::FUNCTION:
@@ -61,9 +61,9 @@ SSL_get_rfd                             60    1_1_0   EXIST::FUNCTION:
 DTLSv1_listen                           61     1_1_0   EXIST::FUNCTION:
 SSL_set_ssl_method                      62     1_1_0   EXIST::FUNCTION:
 SSL_get0_security_ex_data               63     1_1_0   EXIST::FUNCTION:
-SSLv3_client_method                     64     1_1_0   EXIST::FUNCTION:SSL3_METHOD
+SSLv3_client_method                     64     1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_1_0,SSL3_METHOD
 SSL_set_security_level                  65     1_1_0   EXIST::FUNCTION:
-DTLSv1_2_method                         66     1_1_0   EXIST::FUNCTION:
+DTLSv1_2_method                         66     1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_1_0,DTLS1_2_METHOD
 SSL_get_fd                              67     1_1_0   EXIST::FUNCTION:
 SSL_get1_session                        68     1_1_0   EXIST::FUNCTION:
 SSL_use_RSAPrivateKey                   69     1_1_0   EXIST::FUNCTION:RSA
@@ -81,12 +81,12 @@ SSL_get_client_ciphers                  80  1_1_0   EXIST::FUNCTION:
 SSL_get_srtp_profiles                   81     1_1_0   EXIST::FUNCTION:SRTP
 SSL_use_certificate_ASN1                82     1_1_0   EXIST::FUNCTION:
 SSL_get_peer_certificate                83     1_1_0   EXIST::FUNCTION:
-DTLSv1_2_server_method                  84     1_1_0   EXIST::FUNCTION:
+DTLSv1_2_server_method                  84     1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_1_0,DTLS1_2_METHOD
 SSL_set_cert_cb                         85     1_1_0   EXIST::FUNCTION:
 SSL_CTX_set_cookie_verify_cb            86     1_1_0   EXIST::FUNCTION:
 SSL_get_shared_sigalgs                  87     1_1_0   EXIST::FUNCTION:
 SSL_config                              88     1_1_0   EXIST::FUNCTION:
-TLSv1_1_client_method                   89     1_1_0   EXIST::FUNCTION:
+TLSv1_1_client_method                   89     1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_1_0,TLS1_1_METHOD
 SSL_CIPHER_standard_name                90     1_1_0   EXIST::FUNCTION:SSL_TRACE
 SSL_CTX_get_verify_mode                 91     1_1_0   EXIST::FUNCTION:
 SSL_get_all_async_fds                   92     1_1_0   EXIST::FUNCTION:
@@ -110,7 +110,7 @@ SSL_set_psk_client_callback             109 1_1_0   EXIST::FUNCTION:PSK
 SSL_get_client_random                   110    1_1_0   EXIST::FUNCTION:
 TLS_method                              111    1_1_0   EXIST::FUNCTION:
 SSL_CONF_CTX_clear_flags                112    1_1_0   EXIST::FUNCTION:
-TLSv1_client_method                     113    1_1_0   EXIST::FUNCTION:
+TLSv1_client_method                     113    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_1_0,TLS1_METHOD
 SSL_CIPHER_get_bits                     114    1_1_0   EXIST::FUNCTION:
 SSL_test_functions                      115    1_1_0   EXIST::FUNCTION:UNIT_TEST
 SSL_get_SSL_CTX                         116    1_1_0   EXIST::FUNCTION:
@@ -126,7 +126,7 @@ SSL_get_srp_username                    125 1_1_0   EXIST::FUNCTION:SRP
 SSL_CTX_set_purpose                     126    1_1_0   EXIST::FUNCTION:
 SSL_clear                               127    1_1_0   EXIST::FUNCTION:
 SSL_CTX_set_cert_store                  128    1_1_0   EXIST::FUNCTION:
-TLSv1_2_method                          129    1_1_0   EXIST::FUNCTION:
+TLSv1_2_method                          129    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_1_0,TLS1_2_METHOD
 SSL_session_reused                      130    1_1_0   EXIST::FUNCTION:
 SSL_free                                131    1_1_0   EXIST::FUNCTION:
 BIO_ssl_shutdown                        132    1_1_0   EXIST::FUNCTION:
@@ -155,7 +155,7 @@ SSL_COMP_get_compression_methods        154 1_1_0   EXIST::FUNCTION:
 SSL_CTX_set_alpn_select_cb              155    1_1_0   EXIST::FUNCTION:
 SSL_CTX_set_tmp_dh_callback             156    1_1_0   EXIST::FUNCTION:DH
 SSL_CTX_get_default_passwd_cb           157    1_1_0   EXIST::FUNCTION:
-TLSv1_server_method                     158    1_1_0   EXIST::FUNCTION:
+TLSv1_server_method                     158    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_1_0,TLS1_METHOD
 DTLS_server_method                      159    1_1_0   EXIST::FUNCTION:
 SSL_set_rbio                            160    1_1_0   EXIST::FUNCTION:
 SSL_CTX_set_options                     161    1_1_0   EXIST::FUNCTION:
@@ -165,7 +165,7 @@ SSL_CTX_get_ssl_method                  164 1_1_0   EXIST::FUNCTION:
 SSL_get_server_random                   165    1_1_0   EXIST::FUNCTION:
 SSL_set_shutdown                        166    1_1_0   EXIST::FUNCTION:
 SSL_CTX_add_client_CA                   167    1_1_0   EXIST::FUNCTION:
-TLSv1_1_server_method                   168    1_1_0   EXIST::FUNCTION:
+TLSv1_1_server_method                   168    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_1_0,TLS1_1_METHOD
 PEM_write_bio_SSL_SESSION               169    1_1_0   EXIST::FUNCTION:
 SSL_write                               170    1_1_0   EXIST::FUNCTION:
 SSL_set1_host                           171    1_1_0   EXIST::FUNCTION:
@@ -183,13 +183,13 @@ SSL_dup_CA_list                         182       1_1_0   EXIST::FUNCTION:
 SSL_get_verify_callback                 183    1_1_0   EXIST::FUNCTION:
 SSL_CTX_set_default_passwd_cb           184    1_1_0   EXIST::FUNCTION:
 SSL_get_servername_type                 185    1_1_0   EXIST::FUNCTION:
-TLSv1_2_client_method                   186    1_1_0   EXIST::FUNCTION:
+TLSv1_2_client_method                   186    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_1_0,TLS1_2_METHOD
 SSL_add_client_CA                       187    1_1_0   EXIST::FUNCTION:
 SSL_CTX_get0_security_ex_data           188    1_1_0   EXIST::FUNCTION:
 SSL_get_ex_data                         189    1_1_0   EXIST::FUNCTION:
 SSL_CTX_flush_sessions                  190    1_1_0   EXIST::FUNCTION:
 SSL_use_PrivateKey                      191    1_1_0   EXIST::FUNCTION:
-DTLSv1_client_method                    192    1_1_0   EXIST::FUNCTION:
+DTLSv1_client_method                    192    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_1_0,DTLS1_METHOD
 SSL_CTX_dane_mtype_set                  193    1_1_0   EXIST::FUNCTION:
 SSL_get_wfd                             194    1_1_0   EXIST::FUNCTION:
 SSL_get_ssl_method                      195    1_1_0   EXIST::FUNCTION:
@@ -206,7 +206,7 @@ SSL_do_handshake                        205 1_1_0   EXIST::FUNCTION:
 SSL_CTX_get_ex_data                     206    1_1_0   EXIST::FUNCTION:
 SSL_is_init_finished                    207    1_1_0   EXIST::FUNCTION:
 SSL_CTX_set_default_verify_file         208    1_1_0   EXIST::FUNCTION:
-SSLv3_method                            209    1_1_0   EXIST::FUNCTION:SSL3_METHOD
+SSLv3_method                            209    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_1_0,SSL3_METHOD
 SSL_CTX_set_cookie_generate_cb          210    1_1_0   EXIST::FUNCTION:
 SSL_certs_clear                         211    1_1_0   EXIST::FUNCTION:
 SSL_set_connect_state                   212    1_1_0   EXIST::FUNCTION:
@@ -233,10 +233,10 @@ SSL_CTX_set_client_cert_engine          232       1_1_0   EXIST::FUNCTION:ENGINE
 SSL_CTX_get0_param                      233    1_1_0   EXIST::FUNCTION:
 SSL_CTX_set1_param                      234    1_1_0   EXIST::FUNCTION:
 SSL_get_certificate                     235    1_1_0   EXIST::FUNCTION:
-DTLSv1_server_method                    236    1_1_0   EXIST::FUNCTION:
+DTLSv1_server_method                    236    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_1_0,DTLS1_METHOD
 SSL_set_fd                              237    1_1_0   EXIST::FUNCTION:SOCK
 SSL_use_certificate                     238    1_1_0   EXIST::FUNCTION:
-DTLSv1_method                           239    1_1_0   EXIST::FUNCTION:
+DTLSv1_method                           239    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_1_0,DTLS1_METHOD
 SSL_set_wbio                            240    1_1_0   EXIST::FUNCTION:
 SSL_read                                241    1_1_0   EXIST::FUNCTION:
 SSL_CTX_get_options                     242    1_1_0   EXIST::FUNCTION:
@@ -325,12 +325,12 @@ SSL_CTX_use_RSAPrivateKey_ASN1          324       1_1_0   EXIST::FUNCTION:RSA
 SSL_CTX_use_PrivateKey_ASN1             325    1_1_0   EXIST::FUNCTION:
 SSL_CTX_get0_privatekey                 326    1_1_0   EXIST::FUNCTION:
 BIO_f_ssl                               327    1_1_0   EXIST::FUNCTION:
-SSLv3_server_method                     328    1_1_0   EXIST::FUNCTION:SSL3_METHOD
+SSLv3_server_method                     328    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_1_0,SSL3_METHOD
 SSL_SESSION_free                        329    1_1_0   EXIST::FUNCTION:
 SSL_get_shutdown                        330    1_1_0   EXIST::FUNCTION:
 SSL_get_peer_finished                   331    1_1_0   EXIST::FUNCTION:
 SSL_set_tlsext_use_srtp                 332    1_1_0   EXIST::FUNCTION:SRTP
-TLSv1_method                            333    1_1_0   EXIST::FUNCTION:
+TLSv1_method                            333    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_1_0,TLS1_METHOD
 SSL_set_psk_server_callback             334    1_1_0   EXIST::FUNCTION:PSK
 SSL_CTX_set_alpn_protos                 335    1_1_0   EXIST::FUNCTION:
 SSL_CTX_set_default_verify_paths        336    1_1_0   EXIST::FUNCTION:
@@ -353,7 +353,7 @@ SSL_alert_desc_string_long              352 1_1_0   EXIST::FUNCTION:
 SSL_get_default_timeout                 353    1_1_0   EXIST::FUNCTION:
 SSL_set_session_id_context              354    1_1_0   EXIST::FUNCTION:
 SSL_new                                 355    1_1_0   EXIST::FUNCTION:
-TLSv1_1_method                          356    1_1_0   EXIST::FUNCTION:
+TLSv1_1_method                          356    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_1_0,TLS1_1_METHOD
 SSL_CTX_get_cert_store                  357    1_1_0   EXIST::FUNCTION:
 SSL_CTX_load_verify_locations           358    1_1_0   EXIST::FUNCTION:
 SSL_SESSION_print_fp                    359    1_1_0   EXIST::FUNCTION:STDIO
@@ -372,7 +372,7 @@ SSL_SESSION_get_id                      371 1_1_0   EXIST::FUNCTION:
 SSL_SESSION_set1_id_context             372    1_1_0   EXIST::FUNCTION:
 SSL_is_server                           373    1_1_0   EXIST::FUNCTION:
 SSL_alert_type_string                   374    1_1_0   EXIST::FUNCTION:
-DTLSv1_2_client_method                  375    1_1_0   EXIST::FUNCTION:
+DTLSv1_2_client_method                  375    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_1_0,DTLS1_2_METHOD
 SSL_CTX_set_ctlog_list_file             376    1_1_0   EXIST::FUNCTION:CT
 SSL_set_ct_validation_callback          377    1_1_0   EXIST::FUNCTION:CT
 SSL_CTX_set_default_ctlog_list_file     378    1_1_0   EXIST::FUNCTION:CT

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 85781711ef676af76f0679d1a78c51e40701f3c9..a847b0b07738fcfebfd4a47967b636a47dba3dd1 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -100,8 +100,8 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                         "CMS",
                         # CryptoAPI Engine
                         "CAPIENG",
-                        # SSL v3 method
-                        "SSL3_METHOD",
+                        # SSL methods
+                        "SSL3_METHOD", "TLS1_METHOD", "TLS1_1_METHOD", "TLS1_2_METHOD", "DTLS1_METHOD", "DTLS1_2_METHOD",
                         # NEXTPROTONEG
                         "NEXTPROTONEG",
                         # Deprecated functions