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

Merge pull request #60 from pascal-brand-st-dev/memneq

Browse Source 
Use XMEM_NEQ instead of mem_neq
This commit is contained in:
Steffen Jaeckel 2015-02-27 10:11:14 +01:00
commit 925f1ec0e6
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
#define XMEMCMP memcmp
#endif
#ifndef XMEM_NEQ
#define XMEM_NEQ mem_neq
#endif
#ifndef XSTRCMP
#ifdef strcmp
#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 */
if (mem_neq(seed, DB, hLen) != 0) {
if (XMEM_NEQ(seed, DB, hLen) != 0) {
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 */
if (mem_neq(mask, hash, hLen) == 0) {
if (XMEM_NEQ(mask, hash, hLen) == 0) {
*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 */
if ((reallen == outlen) &&
(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) &&
(mem_neq(siginfo[1].data, hash, hashlen) == 0)) {
(XMEM_NEQ(siginfo[1].data, hash, hashlen) == 0)) {
*stat = 1;
}