~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
symm/{chacha,salsa20}-*.S: Indent the hoisted transposition instructions.
[catacomb]
/
symm
/
desx.c
diff --git
a/symm/desx.c
b/symm/desx.c
index
d65ffa7
..
e9a77ed
100644
(file)
--- a/
symm/desx.c
+++ b/
symm/desx.c
@@
-38,12
+38,11
@@
#include "des-base.h"
#include "des.h"
#include "desx.h"
#include "des-base.h"
#include "des.h"
#include "desx.h"
-#include "desx-tab.h"
#include "gcipher.h"
/*----- Tables ------------------------------------------------------------*/
#include "gcipher.h"
/*----- Tables ------------------------------------------------------------*/
-
static const octet s[256] = DESX_S
;
+
extern const octet desx_s[256]
;
/*----- Global variables --------------------------------------------------*/
/*----- Global variables --------------------------------------------------*/
@@
-71,7
+70,7
@@
static void mangle(octet *b, const octet *p)
unsigned i;
for (i = 0; i < 8; i++)
unsigned i;
for (i = 0; i < 8; i++)
- b[i] = *p++ ^ s[b[i] ^ b[(i + 1) & 7u]];
+ b[i] = *p++ ^
desx_
s[b[i] ^ b[(i + 1) & 7u]];
}
void desx_init(desx_ctx *k, const void *buf, size_t sz)
}
void desx_init(desx_ctx *k, const void *buf, size_t sz)