proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-06 06:30:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ssl: make cert check ignore work for invalid certs, not just CNs

Browse Source 
Passing SSL_VERIFY_PEER makes OpenSSL shut down the connection if the
certificate is invalid, without giving us a chance to ignore that
error. Pass SSL_VERIFY_NONE and call SSL_get_verify_result if the user
wanted us to check.

When no CNs match, we used to jump to on_error which gave a bogus
error as that's for OpenSSL errors. Jump to cert_fail so we tell the
user that the error came from checking the certificate.
This commit is contained in:
Carlos Martín Nieto 2012-08-28 14:15:32 +02:00
parent 62eafd0620
commit 0d5dce268d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/netops.c
View File

@ -238,6 +238,10 @@ static int verify_server_cert(git_transport *t, const char *host)
void *addr;
int i = -1,j;
if (SSL_get_verify_result(t->ssl.ssl) != X509_V_OK) {
giterr_set(GITERR_SSL, "The SSL certificate is invalid");
return -1;
}
/* Try to parse the host as an IP address to see if it is */
if (inet_pton(AF_INET, host, &addr4)) {
@ -286,7 +290,7 @@ static int verify_server_cert(git_transport *t, const char *host)
GENERAL_NAMES_free(alts);
if (matched == 0)
goto on_error;
goto cert_fail;
if (matched == 1)
return 0;
@ -354,7 +358,7 @@ static int ssl_setup(git_transport *t, const char *host)
return ssl_set_error(&t->ssl, 0);
SSL_CTX_set_mode(t->ssl.ctx, SSL_MODE_AUTO_RETRY);
SSL_CTX_set_verify(t->ssl.ctx, SSL_VERIFY_PEER, NULL);
SSL_CTX_set_verify(t->ssl.ctx, SSL_VERIFY_NONE, NULL);
if (!SSL_CTX_set_default_verify_paths(t->ssl.ctx))
return ssl_set_error(&t->ssl, 0);