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

use XMEM{CMP, CPY, SET} macros instead of standard versions

Browse Source
This commit is contained in:
Steffen Jaeckel
2014-12-28 14:00:52 +01:00
parent b8bf2f13b8
commit 9782c09a3a
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/encauth/ccm/ccm_init.c
+1 -1
View File
@@ -33,7 +33,7 @@ int ccm_init(ccm_state *ccm, int cipher,
LTC_ARGCHK(key != NULL);
LTC_ARGCHK(taglen != 0);
memset(ccm, 0, sizeof(ccm_state));
XMEMSET(ccm, 0, sizeof(ccm_state));
/* check cipher input */
if ((err = cipher_is_valid(cipher)) != CRYPT_OK) {
src/encauth/ccm/ccm_memory_ex.c
+8 -8
View File
@@ -329,17 +329,17 @@ if (CTR == NULL) {
}
}
// grab the CTR
memcpy(ctrcopy, ctr, 16);
// grab the CTR
XMEMCPY(ctrcopy, ctr, 16);
/* setup CTR for the TAG (zero the count) */
if (CTR == NULL) {
for (y = 15; y > 15 - L; y--) {
ctr[y] = 0x00;
if (CTR == NULL) {
for (y = 15; y > 15 - L; y--) {
ctr[y] = 0x00;
}
} else {
XMEMCPY(ctr, CTR, 16);
}
} else {
XMEMCPY(ctr, CTR, 16);
}
if ((err = cipher_descriptor[cipher].ecb_encrypt(ctr, CTRPAD, skey)) != CRYPT_OK) {
goto error;