diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2016-01-01 19:16:49 +0100 |
|---|---|---|
| committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2017-06-08 10:45:54 +0200 |
| commit | c9e7037f0a3ed9d3fb7dbe7796a0636348d5a359 (patch) | |
| tree | 4dc967c92a73ee234680227fa26ef4a46fab07af | |
| parent | 7e0ee928224d724f7b736197b1dc8bcfadd95757 (diff) | |
| download | libssh-c9e7037f0a3ed9d3fb7dbe7796a0636348d5a359.tar.gz libssh-c9e7037f0a3ed9d3fb7dbe7796a0636348d5a359.tar.xz libssh-c9e7037f0a3ed9d3fb7dbe7796a0636348d5a359.zip | |
bignum: make bignum_free safer
Conflicts:
src/pki_crypto.c
| -rw-r--r-- | include/libssh/libcrypto.h | 7 | ||||
| -rw-r--r-- | include/libssh/libgcrypt.h | 7 | ||||
| -rw-r--r-- | src/dh.c | 18 | ||||
| -rw-r--r-- | src/gcrypt_missing.c | 8 | ||||
| -rw-r--r-- | src/kex1.c | 4 | ||||
| -rw-r--r-- | src/known_hosts.c | 6 | ||||
| -rw-r--r-- | src/wrapper.c | 10 |
7 files changed, 32 insertions, 28 deletions
diff --git a/include/libssh/libcrypto.h b/include/libssh/libcrypto.h index 2f8099ee..428f0495 100644 --- a/include/libssh/libcrypto.h +++ b/include/libssh/libcrypto.h @@ -67,7 +67,12 @@ typedef BIGNUM* bignum; typedef BN_CTX* bignum_CTX; #define bignum_new() BN_new() -#define bignum_free(num) BN_clear_free(num) +#define bignum_safe_free(num) do { \ + if ((num) != NULL) { \ + BN_clear_free((num)); \ + (num)=NULL; \ + } \ + } while(0) #define bignum_set_word(bn,n) BN_set_word(bn,n) #define bignum_bin2bn(data,datalen,dest) do { \ (*dest)=BN_new(); \ diff --git a/include/libssh/libgcrypt.h b/include/libssh/libgcrypt.h index c89ef169..06923943 100644 --- a/include/libssh/libgcrypt.h +++ b/include/libssh/libgcrypt.h @@ -62,7 +62,12 @@ int ssh_gcry_dec2bn(bignum *bn, const char *data); char *ssh_gcry_bn2dec(bignum bn); #define bignum_new() gcry_mpi_new(0) -#define bignum_free(num) gcry_mpi_release(num) +#define bignum_safe_free(num) do { \ + if ((num) != NULL) { \ + gcry_mpi_release((num)); \ + (num)=NULL; \ + } \ + } while (0) #define bignum_ctx_new() NULL #define bignum_ctx_free(num) do {(num) = NULL;} while(0) #define bignum_ctx_invalid(ctx) 0 @@ -136,16 +136,13 @@ int ssh_dh_init(void) { bignum_bin2bn(p_group1_value, P_GROUP1_LEN, &p_group1); if (p_group1 == NULL) { - bignum_free(g); - g = NULL; + bignum_safe_free(g); return SSH_ERROR; } bignum_bin2bn(p_group14_value, P_GROUP14_LEN, &p_group14); if (p_group14 == NULL) { - bignum_free(g); - bignum_free(p_group1); - g = NULL; - p_group1 = NULL; + bignum_safe_free(g); + bignum_safe_free(p_group1); return SSH_ERROR; } @@ -161,12 +158,9 @@ int ssh_dh_init(void) { */ void ssh_dh_finalize(void) { if (dh_crypto_initialized) { - bignum_free(g); - g = NULL; - bignum_free(p_group1); - p_group1 = NULL; - bignum_free(p_group14); - p_group14 = NULL; + bignum_safe_free(g); + bignum_safe_free(p_group1); + bignum_safe_free(p_group14); dh_crypto_initialized=0; } } diff --git a/src/gcrypt_missing.c b/src/gcrypt_missing.c index e07843b8..fa095442 100644 --- a/src/gcrypt_missing.c +++ b/src/gcrypt_missing.c @@ -70,7 +70,7 @@ char *ssh_gcry_bn2dec(bignum bn) { num = bignum_new(); if (num == NULL) { SAFE_FREE(ret); - bignum_free(ten); + bignum_safe_free(ten); return NULL; } @@ -89,9 +89,9 @@ char *ssh_gcry_bn2dec(bignum bn) { ret[count2] = ret[count2 + count]; } ret[count2] = 0; - bignum_free(num); - bignum_free(bndup); - bignum_free(ten); + bignum_safe_free(num); + bignum_safe_free(bndup); + bignum_safe_free(ten); } return ret; @@ -127,8 +127,8 @@ static int modulus_smaller(ssh_public_key k1, ssh_public_key k2){ else res=0; #ifdef HAVE_LIBGCRYPT - bignum_free(n1); - bignum_free(n2); + bignum_safe_free(n1); + bignum_safe_free(n2); #endif return res; diff --git a/src/known_hosts.c b/src/known_hosts.c index 455ea8b7..6edefd85 100644 --- a/src/known_hosts.c +++ b/src/known_hosts.c @@ -224,17 +224,17 @@ static int check_public_key(ssh_session session, char **tokens) { tmpstring = malloc(4 + len); if (tmpstring == NULL) { ssh_buffer_free(pubkey_buffer); - bignum_free(tmpbn); + bignum_safe_free(tmpbn); return -1; } /* TODO: fix the hardcoding */ tmpstring->size = htonl(len); bignum_bn2bin(tmpbn, len, ssh_string_data(tmpstring)); - bignum_free(tmpbn); + bignum_safe_free(tmpbn); if (ssh_buffer_add_ssh_string(pubkey_buffer, tmpstring) < 0) { ssh_buffer_free(pubkey_buffer); ssh_string_free(tmpstring); - bignum_free(tmpbn); + bignum_safe_free(tmpbn); return -1; } ssh_string_free(tmpstring); diff --git a/src/wrapper.c b/src/wrapper.c index c2cd31c5..a5df9ab5 100644 --- a/src/wrapper.c +++ b/src/wrapper.c @@ -160,11 +160,11 @@ void crypto_free(struct ssh_crypto_struct *crypto){ cipher_free(crypto->in_cipher); cipher_free(crypto->out_cipher); - bignum_free(crypto->e); - bignum_free(crypto->f); - bignum_free(crypto->x); - bignum_free(crypto->y); - bignum_free(crypto->k); + bignum_safe_free(crypto->e); + bignum_safe_free(crypto->f); + bignum_safe_free(crypto->x); + bignum_safe_free(crypto->y); + bignum_safe_free(crypto->k); #ifdef HAVE_ECDH SAFE_FREE(crypto->ecdh_client_pubkey); SAFE_FREE(crypto->ecdh_server_pubkey); |