git-market/curl-curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-11 12:01:42 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

getinfo: repair CURLINFO_TLS_SESSION

Browse Source 
This should return a SSL_CTX pointer but it was accidentally broken.

Follow-up to 2db8ae480f

Spotted by Codex Security
This commit is contained in:
Daniel Stenberg 2026-04-10 15:50:17 +02:00
parent a5542c23e7
commit 62ef55d64f
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/cfilters.c
View File

@ -676,14 +676,16 @@ bool Curl_conn_is_ssl(struct connectdata *conn, int sockindex)
bool Curl_conn_get_ssl_info(struct Curl_easy *data, bool Curl_conn_get_ssl_info(struct Curl_easy *data,
struct connectdata *conn, int sockindex, struct connectdata *conn, int sockindex,
int query,
struct curl_tlssessioninfo *info) struct curl_tlssessioninfo *info)
{ {
if(!CONN_SOCK_IDX_VALID(sockindex)) if(!CONN_SOCK_IDX_VALID(sockindex))
return FALSE; return FALSE;
if(Curl_conn_is_ssl(conn, sockindex)) { if(Curl_conn_is_ssl(conn, sockindex)) {
struct Curl_cfilter *cf = conn->cfilter[sockindex]; struct Curl_cfilter *cf = conn->cfilter[sockindex];
CURLcode result = cf ? cf->cft->query(cf, data, CF_QUERY_SSL_INFO, CURLcode result = cf ?
NULL, (void *)info) : CURLE_UNKNOWN_OPTION; cf->cft->query(cf, data, query, NULL, (void *)info) :
CURLE_UNKNOWN_OPTION;
return !result; return !result;
} }
return FALSE; return FALSE;

1
lib/cfilters.h
View File

@ -400,6 +400,7 @@ bool Curl_conn_is_ssl(struct connectdata *conn, int sockindex);
*/ */
bool Curl_conn_get_ssl_info(struct Curl_easy *data, bool Curl_conn_get_ssl_info(struct Curl_easy *data,
struct connectdata *conn, int sockindex, struct connectdata *conn, int sockindex,
int query,
struct curl_tlssessioninfo *info); struct curl_tlssessioninfo *info);
CURLcode Curl_conn_get_ip_info(struct Curl_easy *data, CURLcode Curl_conn_get_ip_info(struct Curl_easy *data,

6
lib/getinfo.c
View File

@ -586,14 +586,16 @@ static CURLcode getinfo_slist(struct Curl_easy *data, CURLINFO info,
break; break;
case CURLINFO_TLS_SESSION: case CURLINFO_TLS_SESSION:
case CURLINFO_TLS_SSL_PTR: { case CURLINFO_TLS_SSL_PTR: {
int query = (info == CURLINFO_TLS_SSL_PTR) ?
CF_QUERY_SSL_INFO : CF_QUERY_SSL_CTX_INFO;
struct curl_tlssessioninfo **tsip = (struct curl_tlssessioninfo **) struct curl_tlssessioninfo **tsip = (struct curl_tlssessioninfo **)
param_slistp; param_slistp;
struct curl_tlssessioninfo *tsi = &data->tsi; struct curl_tlssessioninfo *tsi = &data->tsi;
/* we are exposing a pointer to internal memory with unknown /* we are exposing a pointer to internal memory with unknown
* lifetime here. */ * lifetime here. */
*tsip = tsi; *tsip = tsi;
if(!Curl_conn_get_ssl_info(data, data->conn, FIRSTSOCKET, tsi)) { if(!Curl_conn_get_ssl_info(data, data->conn, FIRSTSOCKET, query, tsi)) {
tsi->backend = Curl_ssl_backend(); tsi->backend = Curl_ssl_backend();
tsi->internals = NULL; tsi->internals = NULL;
} }