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

cygwin related fix - variable name B0 changed to B_0 as it caused collision when compiling libtomcrypt as a perl module (for some reason only on cygwin)

Browse Source
This commit is contained in:
Karel Miko 2015-04-17 08:56:42 +02:00
parent a8e91afb16
commit 6a257e15cd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/encauth/ccm/ccm_memory_ex.c
View File

@ -44,7 +44,7 @@ int ccm_memory_ex(int cipher,
unsigned char *ct, unsigned char *ct,
unsigned char *tag, unsigned long *taglen, unsigned char *tag, unsigned long *taglen,
int direction, int direction,
const unsigned char *B0, const unsigned char *B_0,
const unsigned char *CTR, const unsigned char *CTR,
int ctrwidth) int ctrwidth)
{ {
@ -144,7 +144,7 @@ int ccm_memory_ex(int cipher,
/* form B_0 == flags | Nonce N | l(m) */ /* form B_0 == flags | Nonce N | l(m) */
x = 0; x = 0;
if (B0 == NULL) { if (B_0 == NULL) {
PAD[x++] = (unsigned char)(((headerlen > 0) ? (1<<6) : 0) | PAD[x++] = (unsigned char)(((headerlen > 0) ? (1<<6) : 0) |
(((*taglen - 2)>>1)<<3) | (((*taglen - 2)>>1)<<3) |
(L-1)); (L-1));
@ -172,8 +172,8 @@ if (B0 == NULL) {
} }
} else { } else {
// B0 != NULL // B_0 != NULL
XMEMCPY(PAD, B0, 16); XMEMCPY(PAD, B_0, 16);
} }
/* encrypt PAD */ /* encrypt PAD */