diff options
| author | Werner Koch <wk@gnupg.org> | 2016-04-29 11:05:24 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2016-04-29 11:05:24 +0200 |
| commit | 64bfeafa52a5ed3fa82bdc0ce7ef0edddeef188c (patch) | |
| tree | 820e0e686ef9672b4b05c1e644026840e5710b6a /g10/ecdh.c | |
| parent | common: Improve log_assert. (diff) | |
| download | gnupg2-64bfeafa52a5ed3fa82bdc0ce7ef0edddeef188c.tar.xz gnupg2-64bfeafa52a5ed3fa82bdc0ce7ef0edddeef188c.zip | |
gpg: Remove all assert.h and s/assert/log_assert/.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/ecdh.c')
| -rw-r--r-- | g10/ecdh.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/g10/ecdh.c b/g10/ecdh.c index a1b7ecfdc..af1d84439 100644 --- a/g10/ecdh.c +++ b/g10/ecdh.c @@ -22,7 +22,6 @@ #include <stdlib.h> #include <string.h> #include <errno.h> -#include <assert.h> #include "gpg.h" #include "util.h" @@ -75,7 +74,7 @@ pk_ecdh_default_params (unsigned int qbits) break; } } - assert (i < DIM (kek_params_table)); + log_assert (i < DIM (kek_params_table)); if (DBG_CRYPTO) log_printhex ("ECDH KEK params are", kek_params, sizeof(kek_params) ); @@ -134,7 +133,7 @@ pk_ecdh_encrypt_with_shared_point (int is_encrypt, gcry_mpi_t shared_mpi, } secret_x_size = (nbits+7)/8; - assert (nbytes >= secret_x_size); + log_assert (nbytes >= secret_x_size); if ((nbytes & 1)) /* Remove the "04" prefix of non-compressed format. */ memmove (secret_x, secret_x+1, secret_x_size); @@ -241,16 +240,16 @@ pk_ecdh_encrypt_with_shared_point (int is_encrypt, gcry_mpi_t shared_mpi, gcry_md_final (h); - assert( gcry_md_get_algo_dlen (kdf_hash_algo) >= 32 ); + log_assert( gcry_md_get_algo_dlen (kdf_hash_algo) >= 32 ); memcpy (secret_x, gcry_md_read (h, kdf_hash_algo), gcry_md_get_algo_dlen (kdf_hash_algo)); gcry_md_close (h); old_size = secret_x_size; - assert( old_size >= gcry_cipher_get_algo_keylen( kdf_encr_algo ) ); + log_assert( old_size >= gcry_cipher_get_algo_keylen( kdf_encr_algo ) ); secret_x_size = gcry_cipher_get_algo_keylen( kdf_encr_algo ); - assert( secret_x_size <= gcry_md_get_algo_dlen (kdf_hash_algo) ); + log_assert( secret_x_size <= gcry_md_get_algo_dlen (kdf_hash_algo) ); /* We could have allocated more, so clean the tail before returning. */ memset (secret_x+secret_x_size, 0, old_size - secret_x_size); |