romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 09:43:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

auto-pausing on verify callback retry

Browse source 
When an application install its own OpenSSL verify callback and
that callback invokes `SSL_set_retry_verify()`, the transfer is
automatically paused and does not progress the connect attempt
any further until unpaused via `curl_easy_pause().

Added test758 to verify.

Original PR by @Natris
Reporting on libcurl mailing list
This commit is contained in:
Stefan Eissing 2025-08-14 14:12:54 +02:00
parent c24d4be057
commit c5afc28952
No known key found for this signature in database
7 changed files with 557 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/multi.c
View file

@ -1026,9 +1026,13 @@ CURLMcode Curl_multi_pollset(struct Curl_easy *data,
case MSTATE_CONNECTING:
case MSTATE_TUNNELING:
result = mstate_connecting_pollset(data, ps);
if(!result)
result = Curl_conn_adjust_pollset(data, data->conn, ps);
if(!Curl_xfer_recv_is_paused(data)) {
result = mstate_connecting_pollset(data, ps);
if(!result)
result = Curl_conn_adjust_pollset(data, data->conn, ps);
}
else
expect_sockets = FALSE;
break;
case MSTATE_PROTOCONNECT:

3
lib/vtls/openssl.c
View file

@ -61,6 +61,7 @@
#include "../vauth/vauth.h"
#include "keylog.h"
#include "hostcheck.h"
#include "transfer.h"
#include "../multiif.h"
#include "../curlx/strparse.h"
#include "../strdup.h"
@ -4602,7 +4603,7 @@ static CURLcode ossl_connect_step2(struct Curl_cfilter *cf,
#ifdef SSL_ERROR_WANT_RETRY_VERIFY
if(SSL_ERROR_WANT_RETRY_VERIFY == detail) {
CURL_TRC_CF(data, cf, "SSL_connect() -> want retry_verify");
connssl->io_need = CURL_SSL_IO_NEED_RECV;
Curl_xfer_pause_recv(data, TRUE);
return CURLE_AGAIN;
}
#endif