moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 17:31:46 -05:00
Code Issues Releases Wiki Activity

vtls: Use CURLcode for Curl_ssl_init_certinfo() return type

Browse Source 
The return type for this function was 0 on success and 1 on error. This
was then examined by the calling functions and, in most cases, used to
return CURLE_OUT_OF_MEMORY.

Instead use CURLcode for the return type and return the out of memory
error directly, propagating it up the call stack.
This commit is contained in:
Steve Holme 2014-12-26 11:53:34 +00:00
parent 1ac4db23f7
commit fe43a662a2
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/vtls/gskit.c
View File

@ -855,8 +855,10 @@ static CURLcode gskit_connect_step3(struct connectdata *conn, int sockindex)
However the server certificate may be available, thus we can return However the server certificate may be available, thus we can return
info about it. */ info about it. */
if(data->set.ssl.certinfo) { if(data->set.ssl.certinfo) {
if(Curl_ssl_init_certinfo(data, 1)) result = Curl_ssl_init_certinfo(data, 1);
return CURLE_OUT_OF_MEMORY; if(result)
return result;
if(cert) { if(cert) {
result = Curl_extract_certinfo(conn, 0, cert, certend); result = Curl_extract_certinfo(conn, 0, cert, certend);
if(result) if(result)

7
lib/vtls/openssl.c
View File

@ -2241,6 +2241,7 @@ static CURLcode get_cert_chain(struct connectdata *conn,
struct ssl_connect_data *connssl) struct ssl_connect_data *connssl)
{ {
CURLcode result;
STACK_OF(X509) *sk; STACK_OF(X509) *sk;
int i; int i;
char *bufp; char *bufp;
@ -2258,9 +2259,11 @@ static CURLcode get_cert_chain(struct connectdata *conn,
} }
numcerts = sk_X509_num(sk); numcerts = sk_X509_num(sk);
if(Curl_ssl_init_certinfo(data, numcerts)) {
result = Curl_ssl_init_certinfo(data, numcerts);
if(result) {
free(bufp); free(bufp);
return CURLE_OUT_OF_MEMORY; return result;
} }
infof(data, "--- Certificate chain\n"); infof(data, "--- Certificate chain\n");

15
lib/vtls/vtls.c
View File

@ -605,22 +605,21 @@ void Curl_ssl_free_certinfo(struct SessionHandle *data)
} }
} }
int Curl_ssl_init_certinfo(struct SessionHandle * data, CURLcode Curl_ssl_init_certinfo(struct SessionHandle *data, int num)
int num)
{ {
struct curl_certinfo * ci = &data->info.certs; struct curl_certinfo *ci = &data->info.certs;
struct curl_slist * * table; struct curl_slist **table;
/* Initialize the certificate information structures. Return 0 if OK, else 1. /* Initialize the certificate information structures */
*/
Curl_ssl_free_certinfo(data); Curl_ssl_free_certinfo(data);
ci->num_of_certs = num; ci->num_of_certs = num;
table = calloc((size_t) num, sizeof(struct curl_slist *)); table = calloc((size_t) num, sizeof(struct curl_slist *));
if(!table) if(!table)
return 1; return CURLE_OUT_OF_MEMORY;
ci->certinfo = table; ci->certinfo = table;
return 0;
return CURLE_OK;
} }
/* /*

2
lib/vtls/vtls.h
View File

@ -82,7 +82,7 @@ int Curl_ssl_check_cxn(struct connectdata *conn);
/* Certificate information list handling. */ /* Certificate information list handling. */
void Curl_ssl_free_certinfo(struct SessionHandle *data); void Curl_ssl_free_certinfo(struct SessionHandle *data);
int Curl_ssl_init_certinfo(struct SessionHandle * data, int num); CURLcode Curl_ssl_init_certinfo(struct SessionHandle * data, int num);
CURLcode Curl_ssl_push_certinfo_len(struct SessionHandle * data, int certnum, CURLcode Curl_ssl_push_certinfo_len(struct SessionHandle * data, int certnum,
const char * label, const char * value, const char * label, const char * value,
size_t valuelen); size_t valuelen);