commit b8d68fc8e49b3eeac2ba3106e9694ef463a646e1 from: Omar Polo date: Sun Jun 11 11:31:22 2023 UTC fixes for -Wpointer-sign commit - d1739e3f03a014fa9baded61a49eeb49293c751f commit + b8d68fc8e49b3eeac2ba3106e9694ef463a646e1 blob - 5da49707d44638a90ffdc9e9c199c220da3e38f6 blob + 29fd94d35192dc546fd202dd7f2b253dfb643e82 --- crypto.c +++ crypto.c @@ -122,7 +122,8 @@ crypto_dispatch_server(int fd, struct privsep_proc *p, const void *from; unsigned char *to; size_t datalen; - int n, len, ret; + int n, ret; + unsigned int len; datalen = IMSG_DATA_SIZE(imsg); blob - 353c31d7603e7ca52cc134d18fc646286ac7e513 blob + 515f29c18bbd3cc8cb425842806655999e890366 --- gmid.h +++ gmid.h @@ -451,8 +451,8 @@ void gen_certificate(const char*, const char*, const X509_STORE *load_ca(int); int validate_against_ca(X509_STORE*, const uint8_t*, size_t); void ssl_error(const char *); -char *ssl_pubkey_hash(const char *, size_t); -EVP_PKEY *ssl_load_pkey(const char *, size_t); +char *ssl_pubkey_hash(const uint8_t *, size_t); +EVP_PKEY *ssl_load_pkey(const uint8_t *, size_t); struct vhost *new_vhost(void); struct location *new_location(void); struct proxy *new_proxy(void); blob - b29249f26ffb61c551fad6b2bdcae9e9c7b192d3 blob + 50482123c7f303153ba1fef4156541a7b18f782e --- server.c +++ server.c @@ -1190,7 +1190,8 @@ start_reply(struct client *c, int code, const char *me bufferevent_write(c->bev, "\r\n", 2); if (!vhost_disable_log(c->host, c->iri.path)) - log_request(c, EVBUFFER_DATA(evb), EVBUFFER_LENGTH(evb)); + log_request(c, (char *)EVBUFFER_DATA(evb), + EVBUFFER_LENGTH(evb)); if (code != 20) c->type = REQUEST_DONE; blob - c5f91a1bb89b4be42a239f0cb81b5d97e78e50e7 blob + 3b41671cf5f321874c01eb0a6b7d9c04a6cae13d --- utils.c +++ utils.c @@ -262,15 +262,15 @@ ssl_error(const char *where) } char * -ssl_pubkey_hash(const char *buf, size_t len) +ssl_pubkey_hash(const uint8_t *buf, size_t len) { static const char hex[] = "0123456789abcdef"; BIO *in; X509 *x509 = NULL; char *hash = NULL; size_t off; - char digest[EVP_MAX_MD_SIZE]; - int dlen, i; + unsigned char digest[EVP_MAX_MD_SIZE]; + unsigned int dlen, i; if ((in = BIO_new_mem_buf(buf, len)) == NULL) { log_warnx("%s: BIO_new_mem_buf failed", __func__); @@ -314,7 +314,7 @@ ssl_pubkey_hash(const char *buf, size_t len) } EVP_PKEY * -ssl_load_pkey(const char *buf, size_t len) +ssl_load_pkey(const uint8_t *buf, size_t len) { BIO *in; EVP_PKEY *pkey;