diff options
| author | Karel Miko <karel.miko@gmail.com> | 2018-10-26 19:55:14 +0200 |
|---|---|---|
| committer | Karel Miko <karel.miko@gmail.com> | 2018-10-26 19:55:14 +0200 |
| commit | 1a455d625f7aef04487a0b8282764e9e7ce7d7c3 (patch) | |
| tree | 9cd07cfa6637d8188bb6e493c5c4811243b9522d /src | |
| parent | 0f9e9aa923257af7ab978fc449e900db6ec4f5de (diff) | |
libtomcrypt fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/ltc/misc/copy_or_zeromem.c | 3 | ||||
| -rw-r--r-- | src/ltc/misc/padding/padding_depad.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ltc/misc/copy_or_zeromem.c b/src/ltc/misc/copy_or_zeromem.c index 447b2684..4e662cd7 100644 --- a/src/ltc/misc/copy_or_zeromem.c +++ b/src/ltc/misc/copy_or_zeromem.c @@ -29,7 +29,8 @@ void copy_or_zeromem(const unsigned char* src, unsigned char* dest, unsigned lon #endif unsigned char mask = 0xff; /* initialize mask at all ones */ - if (src == NULL || dest == NULL) return; + LTC_ARGCHKVD(src != NULL); + LTC_ARGCHKVD(dest != NULL); if (coz != 0) coz = 1; y = 0; diff --git a/src/ltc/misc/padding/padding_depad.c b/src/ltc/misc/padding/padding_depad.c index e02077fd..33353f96 100644 --- a/src/ltc/misc/padding/padding_depad.c +++ b/src/ltc/misc/padding/padding_depad.c @@ -36,7 +36,7 @@ int padding_depad(const unsigned char *data, unsigned long *length, unsigned lon if (type < LTC_PAD_ONE_AND_ZERO) { pad = data[padded_length - 1]; - if (pad > padded_length) return CRYPT_INVALID_ARG; + if (pad > padded_length || pad == 0) return CRYPT_INVALID_ARG; unpadded_length = padded_length - pad; } else { |