lib/libhttp
1
0
Fork 0
mirror of https://github.com/lammertb/libhttp.git synced 2025-12-22 04:02:04 +03:00
Code Activity

Fix signed/unsigned warning (and format code)

Browse Source
This commit is contained in:
bel
2016-07-25 21:03:43 +02:00
parent d8d9dd5fff
commit e3d93fb4a1
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/civetweb.c
View File

@@ -11357,6 +11357,7 @@ ssl_get_client_cert_info(struct mg_connection *conn)
char str_finger[1024]; char str_finger[1024];
unsigned char buf[256]; unsigned char buf[256];
int len; int len;
unsigned int ulen;
/* Handle to algorithm used for fingerprint */ /* Handle to algorithm used for fingerprint */
const EVP_MD *digest = EVP_get_digestbyname("sha1"); const EVP_MD *digest = EVP_get_digestbyname("sha1");
@@ -11374,7 +11375,7 @@ ssl_get_client_cert_info(struct mg_connection *conn)
/* Translate serial number to a hex string */ /* Translate serial number to a hex string */
len = i2c_ASN1_INTEGER(serial, NULL); len = i2c_ASN1_INTEGER(serial, NULL);
if (len < sizeof(buf)) { if ((len > 0) && ((unsigned)len < (unsigned)sizeof(buf))) {
unsigned char *pbuf = buf; unsigned char *pbuf = buf;
int len2 = i2c_ASN1_INTEGER(serial, &pbuf); int len2 = i2c_ASN1_INTEGER(serial, &pbuf);
if (!hexdump2string( if (!hexdump2string(
@@ -11386,9 +11387,9 @@ ssl_get_client_cert_info(struct mg_connection *conn)
} }
/* Calculate SHA1 fingerprint and store as a hex string */ /* Calculate SHA1 fingerprint and store as a hex string */
len = 0; ulen = 0;
ASN1_digest((int (*)())i2d_X509, digest, (char *)cert, buf, &len); ASN1_digest((int (*)())i2d_X509, digest, (char *)cert, buf, &ulen);
if (!hexdump2string(buf, len, str_finger, (int)sizeof(str_finger))) { if (!hexdump2string(buf, ulen, str_finger, (int)sizeof(str_finger))) {
*str_finger = 0; *str_finger = 0;
} }
@@ -13018,10 +13019,14 @@ worker_thread_run(struct worker_thread_args *thread_args)
/* Free client certificate info */ /* Free client certificate info */
if (conn->request_info.client_cert) { if (conn->request_info.client_cert) {
mg_free((void*)(conn->request_info.client_cert->subject)); mg_free(
mg_free((void*)(conn->request_info.client_cert->issuer)); (void *)(conn->request_info.client_cert->subject));
mg_free((void*)(conn->request_info.client_cert->serial)); mg_free(
mg_free((void*)(conn->request_info.client_cert->finger)); (void *)(conn->request_info.client_cert->issuer));
mg_free(
(void *)(conn->request_info.client_cert->serial));
mg_free(
(void *)(conn->request_info.client_cert->finger));
conn->request_info.client_cert->subject = 0; conn->request_info.client_cert->subject = 0;
conn->request_info.client_cert->issuer = 0; conn->request_info.client_cert->issuer = 0;
conn->request_info.client_cert->serial = 0; conn->request_info.client_cert->serial = 0;