openssl: adapt stubs to openssl 3.2.x

Function declarations have changed in openssl-3.2.x, adapt the stubs.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2024-05-22 11:05:34 +02:00 committed by mergify[bot]
parent 8f6c2ccc45
commit 53cea8efd1
2 changed files with 244 additions and 245 deletions

View File

@ -13,7 +13,7 @@
int int
tls_parse_ctos_renegotiate ( tls_parse_ctos_renegotiate (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt, PACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -25,7 +25,7 @@ tls_parse_ctos_renegotiate (
int int
tls_parse_ctos_server_name ( tls_parse_ctos_server_name (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt, PACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -37,7 +37,7 @@ tls_parse_ctos_server_name (
int int
tls_parse_ctos_maxfragmentlen ( tls_parse_ctos_maxfragmentlen (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt, PACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -50,7 +50,7 @@ tls_parse_ctos_maxfragmentlen (
#ifndef OPENSSL_NO_SRP #ifndef OPENSSL_NO_SRP
int int
tls_parse_ctos_srp ( tls_parse_ctos_srp (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt, PACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -64,7 +64,7 @@ tls_parse_ctos_srp (
int int
tls_parse_ctos_ec_pt_formats ( tls_parse_ctos_ec_pt_formats (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt, PACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -76,7 +76,7 @@ tls_parse_ctos_ec_pt_formats (
int int
tls_parse_ctos_session_ticket ( tls_parse_ctos_session_ticket (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt, PACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -88,7 +88,7 @@ tls_parse_ctos_session_ticket (
int int
tls_parse_ctos_sig_algs_cert ( tls_parse_ctos_sig_algs_cert (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt, PACKET *pkt,
ossl_unused unsigned int context, ossl_unused unsigned int context,
ossl_unused X509 *x, ossl_unused X509 *x,
@ -100,7 +100,7 @@ tls_parse_ctos_sig_algs_cert (
int int
tls_parse_ctos_sig_algs ( tls_parse_ctos_sig_algs (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt, PACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -113,7 +113,7 @@ tls_parse_ctos_sig_algs (
#ifndef OPENSSL_NO_OCSP #ifndef OPENSSL_NO_OCSP
int int
tls_parse_ctos_status_request ( tls_parse_ctos_status_request (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt, PACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -128,7 +128,7 @@ tls_parse_ctos_status_request (
#ifndef OPENSSL_NO_NEXTPROTONEG #ifndef OPENSSL_NO_NEXTPROTONEG
int int
tls_parse_ctos_npn ( tls_parse_ctos_npn (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt, PACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -146,7 +146,7 @@ tls_parse_ctos_npn (
*/ */
int int
tls_parse_ctos_alpn ( tls_parse_ctos_alpn (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt, PACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -159,7 +159,7 @@ tls_parse_ctos_alpn (
#ifndef OPENSSL_NO_SRTP #ifndef OPENSSL_NO_SRTP
int int
tls_parse_ctos_use_srtp ( tls_parse_ctos_use_srtp (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt, PACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -173,7 +173,7 @@ tls_parse_ctos_use_srtp (
int int
tls_parse_ctos_etm ( tls_parse_ctos_etm (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt, PACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -189,7 +189,7 @@ tls_parse_ctos_etm (
*/ */
int int
tls_parse_ctos_psk_kex_modes ( tls_parse_ctos_psk_kex_modes (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt, PACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -205,7 +205,7 @@ tls_parse_ctos_psk_kex_modes (
*/ */
int int
tls_parse_ctos_key_share ( tls_parse_ctos_key_share (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt, PACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -217,7 +217,7 @@ tls_parse_ctos_key_share (
int int
tls_parse_ctos_cookie ( tls_parse_ctos_cookie (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt, PACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -229,7 +229,7 @@ tls_parse_ctos_cookie (
int int
tls_parse_ctos_supported_groups ( tls_parse_ctos_supported_groups (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt, PACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -241,7 +241,7 @@ tls_parse_ctos_supported_groups (
int int
tls_parse_ctos_ems ( tls_parse_ctos_ems (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt, PACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -253,7 +253,7 @@ tls_parse_ctos_ems (
int int
tls_parse_ctos_early_data ( tls_parse_ctos_early_data (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt, PACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -265,7 +265,7 @@ tls_parse_ctos_early_data (
int int
tls_parse_ctos_psk ( tls_parse_ctos_psk (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt, PACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -277,7 +277,7 @@ tls_parse_ctos_psk (
int int
tls_parse_ctos_post_handshake_auth ( tls_parse_ctos_post_handshake_auth (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt, PACKET *pkt,
ossl_unused unsigned int context, ossl_unused unsigned int context,
ossl_unused X509 *x, ossl_unused X509 *x,
@ -292,7 +292,7 @@ tls_parse_ctos_post_handshake_auth (
*/ */
EXT_RETURN EXT_RETURN
tls_construct_stoc_renegotiate ( tls_construct_stoc_renegotiate (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt, WPACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -304,7 +304,7 @@ tls_construct_stoc_renegotiate (
EXT_RETURN EXT_RETURN
tls_construct_stoc_server_name ( tls_construct_stoc_server_name (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt, WPACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -317,7 +317,7 @@ tls_construct_stoc_server_name (
/* Add/include the server's max fragment len extension into ServerHello */ /* Add/include the server's max fragment len extension into ServerHello */
EXT_RETURN EXT_RETURN
tls_construct_stoc_maxfragmentlen ( tls_construct_stoc_maxfragmentlen (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt, WPACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -329,7 +329,7 @@ tls_construct_stoc_maxfragmentlen (
EXT_RETURN EXT_RETURN
tls_construct_stoc_ec_pt_formats ( tls_construct_stoc_ec_pt_formats (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt, WPACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -341,7 +341,7 @@ tls_construct_stoc_ec_pt_formats (
EXT_RETURN EXT_RETURN
tls_construct_stoc_supported_groups ( tls_construct_stoc_supported_groups (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt, WPACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -353,7 +353,7 @@ tls_construct_stoc_supported_groups (
EXT_RETURN EXT_RETURN
tls_construct_stoc_session_ticket ( tls_construct_stoc_session_ticket (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt, WPACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -366,7 +366,7 @@ tls_construct_stoc_session_ticket (
#ifndef OPENSSL_NO_OCSP #ifndef OPENSSL_NO_OCSP
EXT_RETURN EXT_RETURN
tls_construct_stoc_status_request ( tls_construct_stoc_status_request (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt, WPACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -381,7 +381,7 @@ tls_construct_stoc_status_request (
#ifndef OPENSSL_NO_NEXTPROTONEG #ifndef OPENSSL_NO_NEXTPROTONEG
EXT_RETURN EXT_RETURN
tls_construct_stoc_next_proto_neg ( tls_construct_stoc_next_proto_neg (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt, WPACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -395,7 +395,7 @@ tls_construct_stoc_next_proto_neg (
EXT_RETURN EXT_RETURN
tls_construct_stoc_alpn ( tls_construct_stoc_alpn (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt, WPACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -408,7 +408,7 @@ tls_construct_stoc_alpn (
#ifndef OPENSSL_NO_SRTP #ifndef OPENSSL_NO_SRTP
EXT_RETURN EXT_RETURN
tls_construct_stoc_use_srtp ( tls_construct_stoc_use_srtp (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt, WPACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -422,7 +422,7 @@ tls_construct_stoc_use_srtp (
EXT_RETURN EXT_RETURN
tls_construct_stoc_etm ( tls_construct_stoc_etm (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt, WPACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -434,7 +434,7 @@ tls_construct_stoc_etm (
EXT_RETURN EXT_RETURN
tls_construct_stoc_ems ( tls_construct_stoc_ems (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt, WPACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -446,7 +446,7 @@ tls_construct_stoc_ems (
EXT_RETURN EXT_RETURN
tls_construct_stoc_supported_versions ( tls_construct_stoc_supported_versions (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt, WPACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -458,7 +458,7 @@ tls_construct_stoc_supported_versions (
EXT_RETURN EXT_RETURN
tls_construct_stoc_key_share ( tls_construct_stoc_key_share (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt, WPACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -470,7 +470,7 @@ tls_construct_stoc_key_share (
EXT_RETURN EXT_RETURN
tls_construct_stoc_cookie ( tls_construct_stoc_cookie (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt, WPACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -482,7 +482,7 @@ tls_construct_stoc_cookie (
EXT_RETURN EXT_RETURN
tls_construct_stoc_cryptopro_bug ( tls_construct_stoc_cryptopro_bug (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt, WPACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -494,7 +494,7 @@ tls_construct_stoc_cryptopro_bug (
EXT_RETURN EXT_RETURN
tls_construct_stoc_early_data ( tls_construct_stoc_early_data (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt, WPACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,
@ -506,7 +506,7 @@ tls_construct_stoc_early_data (
EXT_RETURN EXT_RETURN
tls_construct_stoc_psk ( tls_construct_stoc_psk (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt, WPACKET *pkt,
unsigned int context, unsigned int context,
X509 *x, X509 *x,

View File

@ -15,7 +15,7 @@
int int
ossl_statem_server_read_transition ( ossl_statem_server_read_transition (
SSL *s, SSL_CONNECTION *s,
int mt int mt
) )
{ {
@ -31,7 +31,7 @@ ossl_statem_server_read_transition (
*/ */
int int
send_certificate_request ( send_certificate_request (
SSL *s SSL_CONNECTION *s
) )
{ {
return 0; return 0;
@ -43,7 +43,7 @@ send_certificate_request (
*/ */
WRITE_TRAN WRITE_TRAN
ossl_statem_server_write_transition ( ossl_statem_server_write_transition (
SSL *s SSL_CONNECTION *s
) )
{ {
return WRITE_TRAN_ERROR; return WRITE_TRAN_ERROR;
@ -51,7 +51,7 @@ ossl_statem_server_write_transition (
WORK_STATE WORK_STATE
ossl_statem_server_pre_work ( ossl_statem_server_pre_work (
SSL *s, SSL_CONNECTION *s,
WORK_STATE wst WORK_STATE wst
) )
{ {
@ -64,7 +64,7 @@ ossl_statem_server_pre_work (
*/ */
WORK_STATE WORK_STATE
ossl_statem_server_post_work ( ossl_statem_server_post_work (
SSL *s, SSL_CONNECTION *s,
WORK_STATE wst WORK_STATE wst
) )
{ {
@ -81,8 +81,7 @@ ossl_statem_server_post_work (
*/ */
int int
ossl_statem_server_construct_message ( ossl_statem_server_construct_message (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt,
confunc_f *confunc, confunc_f *confunc,
int *mt int *mt
) )
@ -96,7 +95,7 @@ ossl_statem_server_construct_message (
*/ */
size_t size_t
ossl_statem_server_max_message_size ( ossl_statem_server_max_message_size (
SSL *s SSL_CONNECTION *s
) )
{ {
return 0; return 0;
@ -107,7 +106,7 @@ ossl_statem_server_max_message_size (
*/ */
MSG_PROCESS_RETURN MSG_PROCESS_RETURN
ossl_statem_server_process_message ( ossl_statem_server_process_message (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt PACKET *pkt
) )
{ {
@ -120,7 +119,7 @@ ossl_statem_server_process_message (
*/ */
WORK_STATE WORK_STATE
ossl_statem_server_post_process_message ( ossl_statem_server_post_process_message (
SSL *s, SSL_CONNECTION *s,
WORK_STATE wst WORK_STATE wst
) )
{ {
@ -137,9 +136,9 @@ dtls_raw_hello_verify_request (
return 0; return 0;
} }
int CON_FUNC_RETURN
dtls_construct_hello_verify_request ( dtls_construct_hello_verify_request (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt WPACKET *pkt
) )
{ {
@ -148,7 +147,7 @@ dtls_construct_hello_verify_request (
MSG_PROCESS_RETURN MSG_PROCESS_RETURN
tls_process_client_hello ( tls_process_client_hello (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt PACKET *pkt
) )
{ {
@ -161,7 +160,7 @@ tls_process_client_hello (
*/ */
int int
tls_handle_alpn ( tls_handle_alpn (
SSL *s SSL_CONNECTION *s
) )
{ {
return 0; return 0;
@ -169,43 +168,43 @@ tls_handle_alpn (
WORK_STATE WORK_STATE
tls_post_process_client_hello ( tls_post_process_client_hello (
SSL *s, SSL_CONNECTION *s,
WORK_STATE wst WORK_STATE wst
) )
{ {
return WORK_ERROR; return WORK_ERROR;
} }
int CON_FUNC_RETURN
tls_construct_server_hello ( tls_construct_server_hello (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt WPACKET *pkt
) )
{ {
return 0; return 0;
} }
int CON_FUNC_RETURN
tls_construct_server_done ( tls_construct_server_done (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt WPACKET *pkt
) )
{ {
return 0; return 0;
} }
int CON_FUNC_RETURN
tls_construct_server_key_exchange ( tls_construct_server_key_exchange (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt WPACKET *pkt
) )
{ {
return 0; return 0;
} }
int CON_FUNC_RETURN
tls_construct_certificate_request ( tls_construct_certificate_request (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt WPACKET *pkt
) )
{ {
@ -214,7 +213,7 @@ tls_construct_certificate_request (
MSG_PROCESS_RETURN MSG_PROCESS_RETURN
tls_process_client_key_exchange ( tls_process_client_key_exchange (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt PACKET *pkt
) )
{ {
@ -223,7 +222,7 @@ tls_process_client_key_exchange (
WORK_STATE WORK_STATE
tls_post_process_client_key_exchange ( tls_post_process_client_key_exchange (
SSL *s, SSL_CONNECTION *s,
WORK_STATE wst WORK_STATE wst
) )
{ {
@ -232,25 +231,25 @@ tls_post_process_client_key_exchange (
MSG_PROCESS_RETURN MSG_PROCESS_RETURN
tls_process_client_certificate ( tls_process_client_certificate (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt PACKET *pkt
) )
{ {
return MSG_PROCESS_ERROR; return MSG_PROCESS_ERROR;
} }
int CON_FUNC_RETURN
tls_construct_server_certificate ( tls_construct_server_certificate (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt WPACKET *pkt
) )
{ {
return 0; return 0;
} }
int CON_FUNC_RETURN
tls_construct_new_session_ticket ( tls_construct_new_session_ticket (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt WPACKET *pkt
) )
{ {
@ -263,16 +262,16 @@ tls_construct_new_session_ticket (
*/ */
int int
tls_construct_cert_status_body ( tls_construct_cert_status_body (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt WPACKET *pkt
) )
{ {
return 0; return 0;
} }
int CON_FUNC_RETURN
tls_construct_cert_status ( tls_construct_cert_status (
SSL *s, SSL_CONNECTION *s,
WPACKET *pkt WPACKET *pkt
) )
{ {
@ -287,7 +286,7 @@ tls_construct_cert_status (
*/ */
MSG_PROCESS_RETURN MSG_PROCESS_RETURN
tls_process_next_proto ( tls_process_next_proto (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt PACKET *pkt
) )
{ {
@ -298,7 +297,7 @@ tls_process_next_proto (
MSG_PROCESS_RETURN MSG_PROCESS_RETURN
tls_process_end_of_early_data ( tls_process_end_of_early_data (
SSL *s, SSL_CONNECTION *s,
PACKET *pkt PACKET *pkt
) )
{ {