diff options
| author | Werner Koch <[email protected]> | 2016-04-29 09:05:24 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-04-29 09:05:24 +0000 |
| commit | 64bfeafa52a5ed3fa82bdc0ce7ef0edddeef188c (patch) | |
| tree | 820e0e686ef9672b4b05c1e644026840e5710b6a /g10/parse-packet.c | |
| parent | common: Improve log_assert. (diff) | |
| download | gnupg-64bfeafa52a5ed3fa82bdc0ce7ef0edddeef188c.tar.gz gnupg-64bfeafa52a5ed3fa82bdc0ce7ef0edddeef188c.zip | |
gpg: Remove all assert.h and s/assert/log_assert/.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/parse-packet.c')
| -rw-r--r-- | g10/parse-packet.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/g10/parse-packet.c b/g10/parse-packet.c index 3407848bc..c77e409e5 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -24,7 +24,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <assert.h> #include "gpg.h" #include "util.h" @@ -487,7 +486,7 @@ parse (IOBUF inp, PACKET * pkt, int onlykeypkts, off_t * retpos, off_t pos; *skip = 0; - assert (!pkt->pkt.generic); + log_assert (!pkt->pkt.generic); if (retpos || list_mode) { pos = iobuf_tell (inp); @@ -1114,7 +1113,7 @@ parse_symkeyenc (IOBUF inp, int pkttype, unsigned long pktlen, log_info (_("WARNING: potentially insecure symmetrically" " encrypted session key\n")); } - assert (!pktlen); + log_assert (!pktlen); if (list_mode) { @@ -2421,7 +2420,7 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen, * NOTE: if you change the ivlen above 16, don't forget to * enlarge temp. */ ski->ivlen = openpgp_cipher_blocklen (ski->algo); - assert (ski->ivlen <= sizeof (temp)); + log_assert (ski->ivlen <= sizeof (temp)); if (ski->s2k.mode == 1001) ski->ivlen = 0; @@ -2660,7 +2659,7 @@ parse_user_id (IOBUF inp, int pkttype, unsigned long pktlen, PACKET * packet) void make_attribute_uidname (PKT_user_id * uid, size_t max_namelen) { - assert (max_namelen > 70); + log_assert (max_namelen > 70); if (uid->numattribs <= 0) sprintf (uid->name, "[bad attribute packet of size %lu]", uid->attrib_len); |