mmo-ref/dep-libtomcrypt
1
0
Fork 0
mirror of https://github.com/libtom/libtomcrypt synced 2026-08-25 20:26:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #789 from libtom/pr/zero-stat

Browse source 
verify functions always set stat=0 before any other return
This commit is contained in:
Steffen Jaeckel 2026-08-03 10:53:27 +02:00 • committed by GitHub
commit 014cc99c75
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 84 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/encauth/eax/eax_decrypt_verify_memory.c
View file

@ -40,15 +40,15 @@ int eax_decrypt_verify_memory(int cipher,
unsigned char *buf;
unsigned long buflen;
/* stat is cleared before anything else can return, it stays 0 unless the tag is good */
LTC_ARGCHK(stat != NULL);
*stat = 0;
LTC_ARGCHK(key != NULL);
LTC_ARGCHK(pt != NULL);
LTC_ARGCHK(ct != NULL);
LTC_ARGCHK(tag != NULL);
/* default to zero */
*stat = 0;
if ((err = cipher_is_valid(cipher)) != CRYPT_OK) {
return err;
}

3
src/encauth/ocb3/ocb3_decrypt_verify_memory.c
View file

@ -40,9 +40,8 @@ int ocb3_decrypt_verify_memory(int cipher,
unsigned char *buf;
unsigned long buflen;
/* stat is cleared before anything else can return, it stays 0 unless the tag is good */
LTC_ARGCHK(stat != NULL);
/* default to zero */
*stat = 0;
/* limit taglen */

11
src/pk/dsa/dsa_verify_hash.c
View file

@ -27,14 +27,14 @@ int dsa_verify_hash_raw( void *r, void *s,
void *w, *v, *u1, *u2;
int err;
/* stat is cleared before anything else can return, it stays 0 unless the signature is good */
LTC_ARGCHK(stat != NULL);
*stat = 0;
LTC_ARGCHK(r != NULL);
LTC_ARGCHK(s != NULL);
LTC_ARGCHK(stat != NULL);
LTC_ARGCHK(key != NULL);
/* default to invalid signature */
*stat = 0;
/* init our variables */
if ((err = ltc_mp_init_multi(&w, &v, &u1, &u2, LTC_NULL)) != CRYPT_OK) {
return err;
@ -95,8 +95,9 @@ int dsa_verify_hash(const unsigned char *sig, unsigned long siglen,
ltc_asn1_list sig_seq[2];
unsigned long reallen = 0;
/* stat is cleared before anything else can return, it stays 0 unless the signature is good */
LTC_ARGCHK(stat != NULL);
*stat = 0; /* must be set before the first return */
*stat = 0;
if ((err = ltc_mp_init_multi(&r, &s, LTC_NULL)) != CRYPT_OK) {
return err;

9
src/pk/dsa/dsa_verify_key.c
View file

@ -43,9 +43,10 @@ int dsa_int_validate_pqg(const dsa_key *key, int *stat)
void *tmp1, *tmp2;
int err;
LTC_ARGCHK(key != NULL);
/* stat is cleared before anything else can return, it stays 0 unless the params are valid */
LTC_ARGCHK(stat != NULL);
*stat = 0;
LTC_ARGCHK(key != NULL);
/* check q-order */
if ( key->qord >= LTC_MDSA_MAX_GROUP || key->qord <= 15 ||
@ -96,9 +97,10 @@ int dsa_int_validate_primes(const dsa_key *key, int *stat)
{
int err, res;
/* stat is cleared before anything else can return, it stays 0 unless the primes are valid */
LTC_ARGCHK(stat != NULL);
*stat = 0;
LTC_ARGCHK(key != NULL);
LTC_ARGCHK(stat != NULL);
/* key->q prime? */
if ((err = ltc_mp_prime_is_prime(key->q, LTC_MILLER_RABIN_REPS, &res)) != CRYPT_OK) {
@ -132,9 +134,10 @@ int dsa_int_validate_xy(const dsa_key *key, int *stat)
void *tmp;
int err;
/* stat is cleared before anything else can return, it stays 0 unless the key is valid */
LTC_ARGCHK(stat != NULL);
*stat = 0;
LTC_ARGCHK(key != NULL);
LTC_ARGCHK(stat != NULL);
/* 1 < y < p-1 */
if ((err = ltc_mp_init(&tmp)) != CRYPT_OK) {

2
src/pk/ecc/ecc_verify_hash.c
View file

@ -46,8 +46,10 @@ int ecc_verify_hash_v2(const unsigned char *sig,
int *stat,
const ecc_key *key)
{
/* stat is cleared before anything else can return, it stays 0 unless the signature is good */
LTC_ARGCHK(stat != NULL);
*stat = 0;
LTC_ARGCHK(opts != NULL);
if (opts->type < 0 || opts->type >= LTC_ARRAY_SIZE(s_ecc_verify_hash))
return CRYPT_PK_INVALID_TYPE;
if (s_ecc_verify_hash[opts->type] == NULL)

4
src/pk/ecc/ecc_verify_hash_eth27.c
View file

@ -27,6 +27,10 @@ int ecc_verify_hash_eth27(const unsigned char *sig, unsigned long siglen,
void *r, *s;
int err;
/* stat is cleared before anything else can return, it stays 0 unless the signature is good */
LTC_ARGCHK(stat != NULL);
*stat = 0;
LTC_ARGCHK(sig != NULL);
LTC_ARGCHK(key != NULL);

8
src/pk/ecc/ecc_verify_hash_internal.c
View file

@ -17,15 +17,15 @@ int ecc_verify_hash_internal(void *r, void *s,
unsigned long pbits, pbytes, i, shift_right;
unsigned char ch, buf[MAXBLOCKSIZE];
/* stat is cleared before anything else can return, it stays 0 unless the signature is good */
LTC_ARGCHK(stat != NULL);
*stat = 0;
LTC_ARGCHK(r != NULL);
LTC_ARGCHK(s != NULL);
LTC_ARGCHK(hash != NULL);
LTC_ARGCHK(stat != NULL);
LTC_ARGCHK(key != NULL);
/* default to invalid signature */
*stat = 0;
/* allocate ints */
if ((err = ltc_mp_init_multi(&v, &w, &u1, &u2, &e, &a_plus3, LTC_NULL)) != CRYPT_OK) {
return err;

4
src/pk/ecc/ecc_verify_hash_rfc5656.c
View file

@ -31,6 +31,10 @@ int ecc_verify_hash_rfc5656(const unsigned char *sig, unsigned long siglen,
unsigned long name2len = sizeof(name2);
unsigned long slen = siglen;
/* stat is cleared before anything else can return, it stays 0 unless the signature is good */
LTC_ARGCHK(stat != NULL);
*stat = 0;
LTC_ARGCHK(sig != NULL);
LTC_ARGCHK(key != NULL);

4
src/pk/ecc/ecc_verify_hash_rfc7518.c
View file

@ -18,6 +18,10 @@ int ecc_verify_hash_rfc7518_internal(const unsigned char *sig, unsigned long si
int err;
unsigned long i;
/* stat is cleared before anything else can return, it stays 0 unless the signature is good */
LTC_ARGCHK(stat != NULL);
*stat = 0;
LTC_ARGCHK(sig != NULL);
LTC_ARGCHK(key != NULL);

4
src/pk/ecc/ecc_verify_hash_x962.c
View file

@ -17,6 +17,10 @@ int ecc_verify_hash_x962(const unsigned char *sig, unsigned long siglen,
void *r, *s;
int err;
/* stat is cleared before anything else can return, it stays 0 unless the signature is good */
LTC_ARGCHK(stat != NULL);
*stat = 0;
LTC_ARGCHK(sig != NULL);
if ((err = ltc_mp_init_multi(&r, &s, NULL)) != CRYPT_OK) return err;

15
src/pk/ed25519/ed25519_verify.c
View file

@ -19,13 +19,14 @@ static int s_ed25519_verify(const unsigned char *msg, unsigned long msglen,
unsigned long long mlen;
int err;
/* stat is cleared before anything else can return, it stays 0 unless the signature is good */
LTC_ARGCHK(stat != NULL);
*stat = 0;
LTC_ARGCHK(msg != NULL);
LTC_ARGCHK(sig != NULL);
LTC_ARGCHK(stat != NULL);
LTC_ARGCHK(public_key != NULL);
*stat = 0;
if (find_hash("sha512") == -1) return CRYPT_INVALID_HASH;
if (siglen != 64uL) return CRYPT_INVALID_ARG;
if (public_key->pka != LTC_PKA_ED25519) return CRYPT_PK_INVALID_TYPE;
@ -74,6 +75,10 @@ int ed25519ctx_verify(const unsigned char *msg, unsigned long msglen,
unsigned char ctx_prefix[292];
unsigned long ctx_prefix_size = sizeof(ctx_prefix);
/* stat is cleared before anything else can return, it stays 0 unless the signature is good */
LTC_ARGCHK(stat != NULL);
*stat = 0;
LTC_ARGCHK(ctx != NULL);
if (ec25519_crypto_ctx(ctx_prefix, &ctx_prefix_size, 0, ctx, ctxlen) != CRYPT_OK)
@ -105,6 +110,10 @@ int ed25519ph_verify(const unsigned char *msg, unsigned long msglen,
unsigned char ctx_prefix[292];
unsigned long ctx_prefix_size = sizeof(ctx_prefix);
/* stat is cleared before anything else can return, it stays 0 unless the signature is good */
LTC_ARGCHK(stat != NULL);
*stat = 0;
if ((err = ec25519_crypto_ctx(ctx_prefix, &ctx_prefix_size, 1, ctx, ctxlen)) != CRYPT_OK)
return err;

19
src/pk/ed448/ed448_verify.c
View file

@ -19,13 +19,14 @@ static int s_ed448_verify(const unsigned char *msg, unsigned long msglen,
unsigned long long mlen;
int err;
/* stat is cleared before anything else can return, it stays 0 unless the signature is good */
LTC_ARGCHK(stat != NULL);
*stat = 0;
LTC_ARGCHK(msg != NULL);
LTC_ARGCHK(sig != NULL);
LTC_ARGCHK(stat != NULL);
LTC_ARGCHK(public_key != NULL);
*stat = 0;
if (siglen != 114uL) return CRYPT_INVALID_ARG;
if (public_key->pka != LTC_PKA_ED448) return CRYPT_PK_INVALID_TYPE;
@ -74,6 +75,10 @@ int ed448ctx_verify(const unsigned char *msg, unsigned long msglen,
unsigned char ctx_prefix[266];
unsigned long ctx_prefix_size = sizeof(ctx_prefix);
/* stat is cleared before anything else can return, it stays 0 unless the signature is good */
LTC_ARGCHK(stat != NULL);
*stat = 0;
LTC_ARGCHK(ctx != NULL);
if ((err = ec448_crypto_ctx(ctx_prefix, &ctx_prefix_size, 0, ctx, ctxlen)) != CRYPT_OK)
@ -105,6 +110,10 @@ int ed448ph_verify(const unsigned char *msg, unsigned long msglen,
unsigned char ctx_prefix[266];
unsigned long ctx_prefix_size = sizeof(ctx_prefix);
/* stat is cleared before anything else can return, it stays 0 unless the signature is good */
LTC_ARGCHK(stat != NULL);
*stat = 0;
if ((err = ec448_crypto_ctx(ctx_prefix, &ctx_prefix_size, 1, ctx, ctxlen)) != CRYPT_OK)
return err;
@ -133,6 +142,10 @@ int ed448_verify(const unsigned char *msg, unsigned long msglen,
unsigned char ctx_prefix[266];
unsigned long ctx_prefix_size = sizeof(ctx_prefix);
/* stat is cleared before anything else can return, it stays 0 unless the signature is good */
LTC_ARGCHK(stat != NULL);
*stat = 0;
/* Pure Ed448 still uses DOM4 with flag=0 and empty context */
if ((err = ec448_crypto_ctx(ctx_prefix, &ctx_prefix_size, 0, NULL, 0)) != CRYPT_OK)
return err;

8
src/pk/pkcs1/pkcs_1_oaep_decode.c
View file

@ -30,18 +30,18 @@ int ltc_pkcs_1_oaep_decode(const unsigned char *msg, unsigned long msglen,
int err, ret;
ltc_rsa_op_checked op_checked = ltc_pkcs1_op_checked_init(params);
/* res is cleared before anything else can return, it stays 0 unless the padding is valid */
LTC_ARGCHK(res != NULL);
*res = 0;
LTC_ARGCHK(msg != NULL);
LTC_ARGCHK(out != NULL);
LTC_ARGCHK(outlen != NULL);
LTC_ARGCHK(res != NULL);
if ((err = rsa_key_valid_op(LTC_PKCS1_DECRYPT, &op_checked)) != CRYPT_OK) {
return err;
}
/* default to invalid packet */
*res = 0;
hLen = hash_descriptor[op_checked.hash_alg].hashsize;
modulus_len = (modulus_bitlen >> 3) + (modulus_bitlen & 7 ? 1 : 0);

8
src/pk/pkcs1/pkcs_1_pss_decode.c
View file

@ -31,13 +31,13 @@ int ltc_pkcs_1_pss_decode_mgf1(const unsigned char *msghash, unsigned long msgh
hash_state md;
ltc_rsa_op_checked op_checked = ltc_pkcs1_op_checked_init(params);
/* res is cleared before anything else can return, it stays 0 unless the signature is good */
LTC_ARGCHK(res != NULL);
*res = 0;
LTC_ARGCHK(msghash != NULL);
LTC_ARGCHK(sig != NULL);
LTC_ARGCHK(params != NULL);
LTC_ARGCHK(res != NULL);
/* default to invalid */
*res = 0;
if ((err = rsa_key_valid_op(LTC_PKCS1_VERIFY, &op_checked)) != CRYPT_OK) {
return err;

3
src/pk/pkcs1/pkcs_1_v1_5_decode.c
View file

@ -32,7 +32,8 @@ int ltc_pkcs_1_v1_5_decode(const unsigned char *msg,
unsigned long modulus_len, ps_len, i;
int result;
/* default to invalid packet */
/* is_valid is cleared before anything else can return, it stays 0 unless the padding is valid */
LTC_ARGCHK(is_valid != NULL);
*is_valid = 0;
modulus_len = (modulus_bitlen >> 3) + (modulus_bitlen & 7 ? 1 : 0);

8
src/pk/rsa/rsa_decrypt_key.c
View file

@ -30,13 +30,13 @@ int rsa_decrypt_key_v2(const unsigned char *in, unsigned long inlen
unsigned long modulus_bitlen, modulus_bytelen, x;
ltc_rsa_op_checked op_checked = ltc_rsa_op_checked_init(key, params);
/* stat is cleared before anything else can return, it stays 0 unless the padding is valid */
LTC_ARGCHK(stat != NULL);
*stat = 0;
LTC_ARGCHK(in != NULL);
LTC_ARGCHK(out != NULL);
LTC_ARGCHK(outlen != NULL);
LTC_ARGCHK(stat != NULL);
/* default to invalid */
*stat = 0;
/* valid padding? */
if ((err = rsa_key_valid_op(LTC_RSA_DECRYPT, &op_checked)) != CRYPT_OK) {

8
src/pk/rsa/rsa_verify_hash.c
View file

@ -30,14 +30,14 @@ int rsa_verify_hash_v2(const unsigned char *sig, unsigned long siglen,
unsigned char *tmpbuf;
ltc_rsa_op_checked op_checked = ltc_rsa_op_checked_init(key, params);
/* stat is cleared before anything else can return, it stays 0 unless the signature is good */
LTC_ARGCHK(stat != NULL);
*stat = 0;
LTC_ARGCHK(hash != NULL);
LTC_ARGCHK(sig != NULL);
LTC_ARGCHK(stat != NULL);
LTC_ARGCHK(key != NULL);
/* default to invalid */
*stat = 0;
if ((err = rsa_key_valid_op(LTC_RSA_VERIFY, &op_checked)) != CRYPT_OK) {
return err;
}