Skip to content

Commit b3e0280

Browse files
committed
mbedtls: display error codes as hex for consistency with mbedTLS docs
Remaining parts of https://github.com/JuliaLang/julia/blob/8d47a314537779c8fb86642c54925613628a91b0/deps/patches/libgit2-mbedtls-fixup.patch
1 parent 382ed1e commit b3e0280

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/streams/mbedtls.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,12 @@ static int ssl_set_error(mbedtls_ssl_context *ssl, int error)
181181
break;
182182

183183
case MBEDTLS_ERR_X509_CERT_VERIFY_FAILED:
184-
giterr_set(GITERR_SSL, "SSL error: %x[%x] - %s", error, ssl->session_negotiate->verify_result, errbuf);
184+
giterr_set(GITERR_SSL, "SSL error: %#04x [%x] - %s", error, ssl->session_negotiate->verify_result, errbuf);
185185
ret = GIT_ECERTIFICATE;
186186
break;
187187

188188
default:
189-
giterr_set(GITERR_SSL, "SSL error: %x - %s", error, errbuf);
189+
giterr_set(GITERR_SSL, "SSL error: %#04x - %s", error, errbuf);
190190
}
191191

192192
return ret;
@@ -212,7 +212,7 @@ static int verify_server_cert(mbedtls_ssl_context *ssl)
212212
char vrfy_buf[512];
213213
int len = mbedtls_x509_crt_verify_info(vrfy_buf, sizeof(vrfy_buf), "", ret);
214214
if (len >= 1) vrfy_buf[len - 1] = '\0'; /* Remove trailing \n */
215-
giterr_set(GITERR_SSL, "the SSL certificate is invalid: %x - %s", ret, vrfy_buf);
215+
giterr_set(GITERR_SSL, "the SSL certificate is invalid: %#04x - %s", ret, vrfy_buf);
216216
return GIT_ECERTIFICATE;
217217
}
218218

@@ -410,7 +410,7 @@ int git_mbedtls__set_cert_location(const char *path, int is_dir)
410410
mbedtls_x509_crt_free(cacert);
411411
git__free(cacert);
412412
mbedtls_strerror( ret, errbuf, 512 );
413-
giterr_set(GITERR_SSL, "failed to load CA certificates : %s (%d)", errbuf, ret);
413+
giterr_set(GITERR_SSL, "failed to load CA certificates: %#04x - %s", ret, errbuf);
414414
return -1;
415415
}
416416

0 commit comments

Comments
 (0)