TeaSpeak/tomcrypt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use XMEM_NEQ instead of mem_neq

Browse Source 
mem_neq is no more used directly. XMEM_NEQ is used instead,
in the same way XMEMCMP, XMEMCPY,... are.

Signed-off-by: Pascal Brand <pascal.brand@st.com>
This commit is contained in:
Pascal Brand 2015-02-26 12:38:21 +01:00
parent dfa938a4f6
commit f20b5daf39
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/headers/tomcrypt_custom.h
View File

@ -45,6 +45,9 @@
#endif #endif
#define XMEMCMP memcmp #define XMEMCMP memcmp
#endif #endif
#ifndef XMEM_NEQ
#define XMEM_NEQ mem_neq
#endif
#ifndef XSTRCMP #ifndef XSTRCMP
#ifdef strcmp #ifdef strcmp
#define LTC_NO_PROTOTYPES #define LTC_NO_PROTOTYPES

2
src/pk/pkcs1/pkcs_1_oaep_decode.c
View File

@ -138,7 +138,7 @@ int pkcs_1_oaep_decode(const unsigned char *msg, unsigned long msglen,
} }
/* compare the lhash'es */ /* compare the lhash'es */
if (mem_neq(seed, DB, hLen) != 0) { if (XMEM_NEQ(seed, DB, hLen) != 0) {
ret = CRYPT_INVALID_PACKET; ret = CRYPT_INVALID_PACKET;
} }

2
src/pk/pkcs1/pkcs_1_pss_decode.c
View File

@ -151,7 +151,7 @@ int pkcs_1_pss_decode(const unsigned char *msghash, unsigned long msghashlen,
} }
/* mask == hash means valid signature */ /* mask == hash means valid signature */
if (mem_neq(mask, hash, hLen) == 0) { if (XMEM_NEQ(mask, hash, hLen) == 0) {
*res = 1; *res = 1;
} }

4
src/pk/rsa/rsa_verify_hash.c
View File

@ -153,9 +153,9 @@ int rsa_verify_hash_ex(const unsigned char *sig, unsigned long siglen,
/* test OID */ /* test OID */
if ((reallen == outlen) && if ((reallen == outlen) &&
(digestinfo[0].size == hash_descriptor[hash_idx].OIDlen) && (digestinfo[0].size == hash_descriptor[hash_idx].OIDlen) &&
(mem_neq(digestinfo[0].data, hash_descriptor[hash_idx].OID, sizeof(unsigned long) * hash_descriptor[hash_idx].OIDlen) == 0) && (XMEM_NEQ(digestinfo[0].data, hash_descriptor[hash_idx].OID, sizeof(unsigned long) * hash_descriptor[hash_idx].OIDlen) == 0) &&
(siginfo[1].size == hashlen) && (siginfo[1].size == hashlen) &&
(mem_neq(siginfo[1].data, hash, hashlen) == 0)) { (XMEM_NEQ(siginfo[1].data, hash, hashlen) == 0)) {
*stat = 1; *stat = 1;
} }