mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-04-06 20:20:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

ssl.h.in: Fix deprecation exclusion for SRP-related declarations

Browse Source 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15176)
This commit is contained in:
Dr. David von Oheimb 2021-03-20 13:57:08 +01:00 committed by Dr. David von Oheimb
parent 4d49b68504
commit b33cf20263
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/openssl/ssl.h.in
View File

@ -654,8 +654,8 @@ void SSL_set_msg_callback(SSL *ssl,
SSL_ctrl((s),SSL_CTRL_GET_EXTMS_SUPPORT,0,NULL)
# ifndef OPENSSL_NO_SRP
/* see tls_srp.c */
# ifndef OPENSSL_NO_DEPRECATED_3_0
OSSL_DEPRECATEDIN_3_0 __owur int SSL_SRP_CTX_init(SSL *s);
OSSL_DEPRECATEDIN_3_0 __owur int SSL_CTX_SRP_CTX_init(SSL_CTX *ctx);
OSSL_DEPRECATEDIN_3_0 int SSL_SRP_CTX_free(SSL *ctx);
@ -663,7 +663,7 @@ OSSL_DEPRECATEDIN_3_0 int SSL_CTX_SRP_CTX_free(SSL_CTX *ctx);
OSSL_DEPRECATEDIN_3_0 __owur int SSL_srp_server_param_with_username(SSL *s,
int *ad);
OSSL_DEPRECATEDIN_3_0 __owur int SRP_Calc_A_param(SSL *s);
# endif
# endif
/* 100k max cert list */
@ -1824,6 +1824,7 @@ __owur X509_VERIFY_PARAM *SSL_CTX_get0_param(SSL_CTX *ctx);
__owur X509_VERIFY_PARAM *SSL_get0_param(SSL *ssl);
# ifndef OPENSSL_NO_SRP
# ifndef OPENSSL_NO_DEPRECATED_3_0
OSSL_DEPRECATEDIN_3_0 int SSL_CTX_set_srp_username(SSL_CTX *ctx, char *name);
OSSL_DEPRECATEDIN_3_0 int SSL_CTX_set_srp_password(SSL_CTX *ctx, char *password);
OSSL_DEPRECATEDIN_3_0 int SSL_CTX_set_srp_strength(SSL_CTX *ctx, int strength);
@ -1850,6 +1851,7 @@ OSSL_DEPRECATEDIN_3_0 __owur BIGNUM *SSL_get_srp_N(SSL *s);
OSSL_DEPRECATEDIN_3_0 __owur char *SSL_get_srp_username(SSL *s);
OSSL_DEPRECATEDIN_3_0 __owur char *SSL_get_srp_userinfo(SSL *s);
# endif
# endif
/*

38
util/libssl.num
View File

@ -2,9 +2,9 @@ SSL_get_selected_srtp_profile 1 3_0_0 EXIST::FUNCTION:SRTP
SSL_set_read_ahead 2 3_0_0 EXIST::FUNCTION:
SSL_set_accept_state 3 3_0_0 EXIST::FUNCTION:
SSL_CTX_set_cipher_list 4 3_0_0 EXIST::FUNCTION:
SSL_CTX_set_srp_client_pwd_callback 5 3_0_0 EXIST::FUNCTION:SRP
SSL_CTX_set_srp_client_pwd_callback 5 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SRP
SSL_copy_session_id 6 3_0_0 EXIST::FUNCTION:
SSL_CTX_set_srp_password 7 3_0_0 EXIST::FUNCTION:SRP
SSL_CTX_set_srp_password 7 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SRP
SSL_shutdown 8 3_0_0 EXIST::FUNCTION:
SSL_CTX_set_msg_callback 9 3_0_0 EXIST::FUNCTION:
SSL_SESSION_get0_ticket 11 3_0_0 EXIST::FUNCTION:
@ -32,16 +32,16 @@ SSL_use_PrivateKey_ASN1 32 3_0_0 EXIST::FUNCTION:
PEM_write_SSL_SESSION 33 3_0_0 EXIST::FUNCTION:STDIO
SSL_CTX_set_session_id_context 34 3_0_0 EXIST::FUNCTION:
SSL_CIPHER_get_cipher_nid 35 3_0_0 EXIST::FUNCTION:
SSL_get_srp_g 36 3_0_0 EXIST::FUNCTION:SRP
SSL_get_srp_g 36 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SRP
SSL_want 37 3_0_0 EXIST::FUNCTION:
SSL_get_cipher_list 38 3_0_0 EXIST::FUNCTION:
SSL_get_verify_result 39 3_0_0 EXIST::FUNCTION:
SSL_renegotiate 40 3_0_0 EXIST::FUNCTION:
SSL_get_privatekey 41 3_0_0 EXIST::FUNCTION:
SSL_peek 42 3_0_0 EXIST::FUNCTION:
SRP_Calc_A_param 43 3_0_0 EXIST::FUNCTION:SRP
SRP_Calc_A_param 43 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SRP
SSL_SESSION_get_ticket_lifetime_hint 44 3_0_0 EXIST::FUNCTION:
SSL_SRP_CTX_free 45 3_0_0 EXIST::FUNCTION:SRP
SSL_SRP_CTX_free 45 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SRP
SSL_CTX_set_client_CA_list 46 3_0_0 EXIST::FUNCTION:
SSL_CTX_set_next_proto_select_cb 47 3_0_0 EXIST::FUNCTION:NEXTPROTONEG
BIO_ssl_copy_session_id 48 3_0_0 EXIST::FUNCTION:
@ -66,9 +66,9 @@ DTLSv1_2_method 66 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_1_
SSL_get_fd 67 3_0_0 EXIST::FUNCTION:
SSL_get1_session 68 3_0_0 EXIST::FUNCTION:
SSL_use_RSAPrivateKey 69 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0
SSL_CTX_set_srp_cb_arg 70 3_0_0 EXIST::FUNCTION:SRP
SSL_CTX_set_srp_cb_arg 70 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SRP
SSL_CTX_add_session 71 3_0_0 EXIST::FUNCTION:
SSL_get_srp_N 72 3_0_0 EXIST::FUNCTION:SRP
SSL_get_srp_N 72 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SRP
SSL_has_matching_session_id 73 3_0_0 EXIST::FUNCTION:
PEM_read_SSL_SESSION 74 3_0_0 EXIST::FUNCTION:STDIO
SSL_get_shared_ciphers 75 3_0_0 EXIST::FUNCTION:
@ -93,7 +93,7 @@ SSL_CTX_check_private_key 93 3_0_0 EXIST::FUNCTION:
SSL_set_wfd 94 3_0_0 EXIST::FUNCTION:SOCK
SSL_get_client_CA_list 95 3_0_0 EXIST::FUNCTION:
SSL_CONF_CTX_set_flags 96 3_0_0 EXIST::FUNCTION:
SSL_CTX_set_srp_username_callback 97 3_0_0 EXIST::FUNCTION:SRP
SSL_CTX_set_srp_username_callback 97 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SRP
SSL_connect 98 3_0_0 EXIST::FUNCTION:
SSL_get_psk_identity 99 3_0_0 EXIST::FUNCTION:PSK
SSL_CTX_use_certificate_file 100 3_0_0 EXIST::FUNCTION:
@ -121,7 +121,7 @@ SSL_get_state 121 3_0_0 EXIST::FUNCTION:
SSL_CONF_CTX_finish 122 3_0_0 EXIST::FUNCTION:
SSL_CTX_add_server_custom_ext 123 3_0_0 EXIST::FUNCTION:
SSL_SESSION_get_ex_data 124 3_0_0 EXIST::FUNCTION:
SSL_get_srp_username 125 3_0_0 EXIST::FUNCTION:SRP
SSL_get_srp_username 125 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SRP
SSL_CTX_set_purpose 126 3_0_0 EXIST::FUNCTION:
SSL_clear 127 3_0_0 EXIST::FUNCTION:
SSL_CTX_set_cert_store 128 3_0_0 EXIST::FUNCTION:
@ -144,9 +144,9 @@ SSL_up_ref 144 3_0_0 EXIST::FUNCTION:
SSL_export_keying_material 145 3_0_0 EXIST::FUNCTION:
SSL_callback_ctrl 146 3_0_0 EXIST::FUNCTION:
SSL_set_security_callback 147 3_0_0 EXIST::FUNCTION:
SSL_SRP_CTX_init 148 3_0_0 EXIST::FUNCTION:SRP
SSL_SRP_CTX_init 148 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SRP
ERR_load_SSL_strings 149 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0
SSL_CTX_SRP_CTX_init 150 3_0_0 EXIST::FUNCTION:SRP
SSL_CTX_SRP_CTX_init 150 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SRP
SSL_SESSION_set_time 151 3_0_0 EXIST::FUNCTION:
i2d_SSL_SESSION 152 3_0_0 EXIST::FUNCTION:
SSL_SESSION_get_master_key 153 3_0_0 EXIST::FUNCTION:
@ -171,7 +171,7 @@ SSL_set1_host 171 3_0_0 EXIST::FUNCTION:
SSL_use_RSAPrivateKey_file 172 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0
SSL_CTX_get_info_callback 173 3_0_0 EXIST::FUNCTION:
SSL_get0_peername 174 3_0_0 EXIST::FUNCTION:
SSL_set_srp_server_param 175 3_0_0 EXIST::FUNCTION:SRP
SSL_set_srp_server_param 175 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SRP
TLS_server_method 176 3_0_0 EXIST::FUNCTION:
SSL_get_psk_identity_hint 177 3_0_0 EXIST::FUNCTION:PSK
SSL_set_session 178 3_0_0 EXIST::FUNCTION:
@ -251,10 +251,10 @@ SSL_set_debug 251 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_1
SSL_get_security_level 252 3_0_0 EXIST::FUNCTION:
SSL_CIPHER_description 253 3_0_0 EXIST::FUNCTION:
SSL_set_default_passwd_cb_userdata 254 3_0_0 EXIST::FUNCTION:
SSL_get_srp_userinfo 255 3_0_0 EXIST::FUNCTION:SRP
SSL_get_srp_userinfo 255 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SRP
SSL_extension_supported 256 3_0_0 EXIST::FUNCTION:
SSL_dane_tlsa_add 257 3_0_0 EXIST::FUNCTION:
SSL_srp_server_param_with_username 258 3_0_0 EXIST::FUNCTION:SRP
SSL_srp_server_param_with_username 258 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SRP
SSL_CIPHER_get_version 259 3_0_0 EXIST::FUNCTION:
SSL_get0_verified_chain 260 3_0_0 EXIST::FUNCTION:
SSL_CIPHER_find 261 3_0_0 EXIST::FUNCTION:
@ -282,7 +282,7 @@ SSL_pending 282 3_0_0 EXIST::FUNCTION:
SSL_set_bio 283 3_0_0 EXIST::FUNCTION:
BIO_new_ssl_connect 284 3_0_0 EXIST::FUNCTION:
SSL_waiting_for_async 285 3_0_0 EXIST::FUNCTION:
SSL_CTX_set_srp_strength 286 3_0_0 EXIST::FUNCTION:SRP
SSL_CTX_set_srp_strength 286 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SRP
SSL_CTX_get_quiet_shutdown 287 3_0_0 EXIST::FUNCTION:
SSL_CTX_use_certificate_chain_file 288 3_0_0 EXIST::FUNCTION:
SSL_CTX_dane_enable 289 3_0_0 EXIST::FUNCTION:
@ -297,7 +297,7 @@ SSL_accept 297 3_0_0 EXIST::FUNCTION:
SSL_use_psk_identity_hint 298 3_0_0 EXIST::FUNCTION:PSK
SSL_trace 299 3_0_0 EXIST::FUNCTION:SSL_TRACE
DTLS_method 300 3_0_0 EXIST::FUNCTION:
SSL_CTX_set_srp_verify_param_callback 301 3_0_0 EXIST::FUNCTION:SRP
SSL_CTX_set_srp_verify_param_callback 301 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SRP
SSL_CTX_set_timeout 302 3_0_0 EXIST::FUNCTION:
SSL_CTX_set_security_level 303 3_0_0 EXIST::FUNCTION:
TLS_client_method 304 3_0_0 EXIST::FUNCTION:
@ -307,14 +307,14 @@ SSL_check_private_key 307 3_0_0 EXIST::FUNCTION:
SSL_CTX_set_quiet_shutdown 308 3_0_0 EXIST::FUNCTION:
SSL_select_next_proto 309 3_0_0 EXIST::FUNCTION:
SSL_load_client_CA_file 310 3_0_0 EXIST::FUNCTION:
SSL_set_srp_server_param_pw 311 3_0_0 EXIST::FUNCTION:SRP
SSL_set_srp_server_param_pw 311 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SRP
SSL_renegotiate_pending 312 3_0_0 EXIST::FUNCTION:
SSL_CTX_new 313 3_0_0 EXIST::FUNCTION:
SSL_set_session_ticket_ext_cb 314 3_0_0 EXIST::FUNCTION:
SSL_CTX_get_timeout 315 3_0_0 EXIST::FUNCTION:
SSL_use_certificate_chain_file 316 3_0_0 EXIST::FUNCTION:
SSL_set_not_resumable_session_callback 317 3_0_0 EXIST::FUNCTION:
SSL_CTX_SRP_CTX_free 318 3_0_0 EXIST::FUNCTION:SRP
SSL_CTX_SRP_CTX_free 318 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SRP
SSL_get_current_expansion 319 3_0_0 EXIST::FUNCTION:
SSL_clear_options 320 3_0_0 EXIST::FUNCTION:
SSL_CTX_use_PrivateKey 321 3_0_0 EXIST::FUNCTION:
@ -337,7 +337,7 @@ SSL_CTX_sess_set_get_cb 337 3_0_0 EXIST::FUNCTION:
SSL_add_file_cert_subjects_to_stack 338 3_0_0 EXIST::FUNCTION:
SSL_get_default_passwd_cb_userdata 339 3_0_0 EXIST::FUNCTION:
SSL_get_security_callback 340 3_0_0 EXIST::FUNCTION:
SSL_CTX_set_srp_username 341 3_0_0 EXIST::FUNCTION:SRP
SSL_CTX_set_srp_username 341 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SRP
SSL_COMP_get_name 342 3_0_0 EXIST::FUNCTION:
SSL_CTX_set_default_passwd_cb_userdata 343 3_0_0 EXIST::FUNCTION:
SSL_set_verify 344 3_0_0 EXIST::FUNCTION: