diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-07-21 00:41:38 +0100 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2018-07-20 17:21:51 -0700 |
| commit | defa97091097eaa75ca55db114fd56a749927409 (patch) | |
| tree | 9dc74a05d6666ef7197eff4e795871608991a107 /src/streams | |
| parent | d285de73f9a09bc841b329267d1f61b9c03a7b68 (diff) | |
| download | libgit2-defa97091097eaa75ca55db114fd56a749927409.tar.gz | |
mbedtls: check allocations
Diffstat (limited to 'src/streams')
| -rw-r--r-- | src/streams/mbedtls.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/streams/mbedtls.c b/src/streams/mbedtls.c index 7cecb2ade..5d885247b 100644 --- a/src/streams/mbedtls.c +++ b/src/streams/mbedtls.c @@ -89,6 +89,8 @@ int git_mbedtls_stream_global_init(void) mbedtls_x509_crt *cacert = NULL; git__ssl_conf = git__malloc(sizeof(mbedtls_ssl_config)); + GITERR_CHECK_ALLOC(git__ssl_conf); + mbedtls_ssl_config_init(git__ssl_conf); if (mbedtls_ssl_config_defaults(git__ssl_conf, MBEDTLS_SSL_IS_CLIENT, @@ -107,9 +109,13 @@ int git_mbedtls_stream_global_init(void) mbedtls_ssl_conf_authmode(git__ssl_conf, MBEDTLS_SSL_VERIFY_OPTIONAL); /* set the list of allowed ciphersuites */ - ciphers_list = calloc(GIT_SSL_DEFAULT_CIPHERS_COUNT, sizeof(int)); + ciphers_list = git__calloc(GIT_SSL_DEFAULT_CIPHERS_COUNT, sizeof(int)); + GITERR_CHECK_ALLOC(ciphers_list); + ciphers_known = 0; cipher_string = cipher_string_tmp = git__strdup(GIT_SSL_DEFAULT_CIPHERS); + GITERR_CHECK_ALLOC(cipher_string); + while ((cipher_name = git__strtok(&cipher_string_tmp, ":")) != NULL) { int cipherid = mbedtls_ssl_get_ciphersuite_id(cipher_name); if (cipherid == 0) continue; @@ -126,10 +132,15 @@ int git_mbedtls_stream_global_init(void) /* Seeding the random number generator */ mbedtls_entropy = git__malloc(sizeof(mbedtls_entropy_context)); + GITERR_CHECK_ALLOC(mbedtls_entropy); + mbedtls_entropy_init(mbedtls_entropy); ctr_drbg = git__malloc(sizeof(mbedtls_ctr_drbg_context)); + GITERR_CHECK_ALLOC(ctr_drbg); + mbedtls_ctr_drbg_init(ctr_drbg); + if (mbedtls_ctr_drbg_seed(ctr_drbg, mbedtls_entropy_func, mbedtls_entropy, NULL, 0) != 0) { @@ -410,6 +421,8 @@ int git_mbedtls__set_cert_location(const char *path, int is_dir) assert(path != NULL); cacert = git__malloc(sizeof(mbedtls_x509_crt)); + GITERR_CHECK_ALLOC(cacert); + mbedtls_x509_crt_init(cacert); if (is_dir) { ret = mbedtls_x509_crt_parse_path(cacert, path); |