Thanks to visit codestin.com
Credit goes to github.com

Skip to content

mbedTLS support #4173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Apr 22, 2018
Merged

mbedTLS support #4173

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ca3b223
mbedtls: initial support
tiennou Mar 29, 2018
1a1875f
mbedtls: proper certificate verification
tiennou Mar 29, 2018
6c6be3c
mbedtls: use libmbedcrypto for hashing
tiennou Mar 29, 2018
60e1ad9
mbedtls: add global initialization
tiennou Mar 29, 2018
2419ccc
mbedtls: default cipher list support
tiennou Mar 29, 2018
ec79b0f
mbedtls: fix libgit2 hanging due to incomplete writes
tiennou Mar 29, 2018
262dfcf
mbedtls: enable Travis CI tests
tiennou Mar 29, 2018
4165bb7
mbedtls: use our own certificate validation
tiennou Mar 29, 2018
1edde0b
mbedtls: use mbedTLS certificate verification
tiennou Mar 29, 2018
382ed1e
mbedtls: load default CA certificates
tiennou Mar 29, 2018
b3e0280
mbedtls: display error codes as hex for consistency with mbedTLS docs
tiennou Mar 29, 2018
e3d764a
tests: clarify comment
tiennou Mar 29, 2018
5455475
cmake: make our preferred backend ordering consistent
tiennou Mar 29, 2018
10aff3d
travis: just grab what we need from mbedtls
tiennou Mar 29, 2018
cb2da47
travis: pass -fPIC when configuring mbedtls
tiennou Mar 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
mbedtls: use mbedTLS certificate verification 
Taken from https://github.com/JuliaLang/julia/blob/8d47a314537779c8fb86642c54925613628a91b0/deps/patches/libgit2-mbedtls-verify.patch, with some modifications.
  • Loading branch information
@tiennou
tiennou committed Apr 11, 2018
commit 1edde0bcea160f5629d733b1aae26a1fa8215177
75 changes: 6 additions & 69 deletions src/streams/mbedtls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,82 +202,19 @@ static int ssl_teardown(mbedtls_ssl_context *ssl)
return ret;
}

static int check_host_name(const char *name, const char *host)
static int verify_server_cert(mbedtls_ssl_context *ssl)
{
if (!strcasecmp(name, host))
return 0;

if (gitno__match_host(name, host) < 0)
return -1;

return 0;
}

static int verify_server_cert(mbedtls_ssl_context *ssl, const char *host)
{
const mbedtls_x509_crt *cert;
const mbedtls_x509_sequence *alts;
int ret, matched = -1;
size_t sn_size = 512;
char subject_name[sn_size], alt_name[sn_size];

int ret = -1;

if ((ret = mbedtls_ssl_get_verify_result(ssl)) != 0) {
char vrfy_buf[512];
mbedtls_x509_crt_verify_info( vrfy_buf, sizeof( vrfy_buf ), " ! ", ret );
giterr_set(GITERR_SSL, "The SSL certificate is invalid: %s", vrfy_buf);
int len = mbedtls_x509_crt_verify_info(vrfy_buf, sizeof(vrfy_buf), "", ret);
if (len >= 1) vrfy_buf[len - 1] = '\0'; /* Remove trailing \n */
giterr_set(GITERR_SSL, "the SSL certificate is invalid: %x - %s", ret, vrfy_buf);
return GIT_ECERTIFICATE;
}

cert = mbedtls_ssl_get_peer_cert(ssl);
if (!cert) {
giterr_set(GITERR_SSL, "the server did not provide a certificate");
return -1;
}

/* Check the alternative names */
alts = &cert->subject_alt_names;
while (alts != NULL && matched != 1) {
// Buffer is too small
if( alts->buf.len >= sn_size )
goto on_error;

memcpy(alt_name, alts->buf.p, alts->buf.len);
alt_name[alts->buf.len] = '\0';

if (!memchr(alt_name, '\0', alts->buf.len)) {
if (check_host_name(alt_name, host) < 0)
matched = 0;
else
matched = 1;
}

alts = alts->next;
}
if (matched == 0)
goto cert_fail_name;

if (matched == 1)
return 0;

/* If no alternative names are available, check the common name */
ret = mbedtls_x509_dn_gets(subject_name, sn_size, &cert->subject);
if (ret == 0)
goto on_error;
if (memchr(subject_name, '\0', ret))
goto cert_fail_name;

if (check_host_name(subject_name, host) < 0)
goto cert_fail_name;

return 0;

on_error:
return ssl_set_error(ssl, 0);

cert_fail_name:
giterr_set(GITERR_SSL, "hostname does not match certificate");
return GIT_ECERTIFICATE;
}

typedef struct {
Expand Down Expand Up @@ -307,7 +244,7 @@ int mbedtls_connect(git_stream *stream)
if ((ret = mbedtls_ssl_handshake(st->ssl)) != 0)
return ssl_set_error(st->ssl, ret);

return verify_server_cert(st->ssl, st->host);
return verify_server_cert(st->ssl);
}

int mbedtls_certificate(git_cert **out, git_stream *stream)
Expand Down