-/* $OpenBSD: rijndael.c,v 1.1 2000/10/13 18:59:14 markus Exp $ */
+/* $OpenBSD: rijndael.c,v 1.7 2001/02/04 15:32:24 stevesk Exp $ */
/* This is an independent implementation of the encryption algorithm: */
/* */
/* Invert byte order in a 32 bit variable */
-#define bswap(x) (rotl(x, 8) & 0x00ff00ff | rotr(x, 8) & 0xff00ff00)
+#define bswap(x) ((rotl(x, 8) & 0x00ff00ff) | (rotr(x, 8) & 0xff00ff00))
-/* Extract byte from a 32 bit quantity (little endian notation) */
+/* Extract byte from a 32 bit quantity (little endian notation) */
#define byte(x,n) ((u1byte)((x) >> (8 * n)))
-#if BYTE_ORDER != LITTLE_ENDIAN
-#define BLOCK_SWAP
-#endif
-
-/* For inverting byte order in input/output 32 bit words if needed */
-
-#ifdef BLOCK_SWAP
+#ifdef WORDS_BIGENDIAN
#define BYTE_SWAP
-#define WORD_SWAP
#endif
#ifdef BYTE_SWAP
#define io_swap(x) (x)
#endif
-/* For inverting the byte order of input/output blocks if needed */
-
-#ifdef WORD_SWAP
-
-#define get_block(x) \
- ((u4byte*)(x))[0] = io_swap(in_blk[3]); \
- ((u4byte*)(x))[1] = io_swap(in_blk[2]); \
- ((u4byte*)(x))[2] = io_swap(in_blk[1]); \
- ((u4byte*)(x))[3] = io_swap(in_blk[0])
-
-#define put_block(x) \
- out_blk[3] = io_swap(((u4byte*)(x))[0]); \
- out_blk[2] = io_swap(((u4byte*)(x))[1]); \
- out_blk[1] = io_swap(((u4byte*)(x))[2]); \
- out_blk[0] = io_swap(((u4byte*)(x))[3])
-
-#define get_key(x,len) \
- ((u4byte*)(x))[4] = ((u4byte*)(x))[5] = \
- ((u4byte*)(x))[6] = ((u4byte*)(x))[7] = 0; \
- switch((((len) + 63) / 64)) { \
- case 2: \
- ((u4byte*)(x))[0] = io_swap(in_key[3]); \
- ((u4byte*)(x))[1] = io_swap(in_key[2]); \
- ((u4byte*)(x))[2] = io_swap(in_key[1]); \
- ((u4byte*)(x))[3] = io_swap(in_key[0]); \
- break; \
- case 3: \
- ((u4byte*)(x))[0] = io_swap(in_key[5]); \
- ((u4byte*)(x))[1] = io_swap(in_key[4]); \
- ((u4byte*)(x))[2] = io_swap(in_key[3]); \
- ((u4byte*)(x))[3] = io_swap(in_key[2]); \
- ((u4byte*)(x))[4] = io_swap(in_key[1]); \
- ((u4byte*)(x))[5] = io_swap(in_key[0]); \
- break; \
- case 4: \
- ((u4byte*)(x))[0] = io_swap(in_key[7]); \
- ((u4byte*)(x))[1] = io_swap(in_key[6]); \
- ((u4byte*)(x))[2] = io_swap(in_key[5]); \
- ((u4byte*)(x))[3] = io_swap(in_key[4]); \
- ((u4byte*)(x))[4] = io_swap(in_key[3]); \
- ((u4byte*)(x))[5] = io_swap(in_key[2]); \
- ((u4byte*)(x))[6] = io_swap(in_key[1]); \
- ((u4byte*)(x))[7] = io_swap(in_key[0]); \
- }
-
-#else
-
-#define get_block(x) \
- ((u4byte*)(x))[0] = io_swap(in_blk[0]); \
- ((u4byte*)(x))[1] = io_swap(in_blk[1]); \
- ((u4byte*)(x))[2] = io_swap(in_blk[2]); \
- ((u4byte*)(x))[3] = io_swap(in_blk[3])
-
-#define put_block(x) \
- out_blk[0] = io_swap(((u4byte*)(x))[0]); \
- out_blk[1] = io_swap(((u4byte*)(x))[1]); \
- out_blk[2] = io_swap(((u4byte*)(x))[2]); \
- out_blk[3] = io_swap(((u4byte*)(x))[3])
-
-#define get_key(x,len) \
- ((u4byte*)(x))[4] = ((u4byte*)(x))[5] = \
- ((u4byte*)(x))[6] = ((u4byte*)(x))[7] = 0; \
- switch((((len) + 63) / 64)) { \
- case 4: \
- ((u4byte*)(x))[6] = io_swap(in_key[6]); \
- ((u4byte*)(x))[7] = io_swap(in_key[7]); \
- case 3: \
- ((u4byte*)(x))[4] = io_swap(in_key[4]); \
- ((u4byte*)(x))[5] = io_swap(in_key[5]); \
- case 2: \
- ((u4byte*)(x))[0] = io_swap(in_key[0]); \
- ((u4byte*)(x))[1] = io_swap(in_key[1]); \
- ((u4byte*)(x))[2] = io_swap(in_key[2]); \
- ((u4byte*)(x))[3] = io_swap(in_key[3]); \
- }
-
-#endif
-
#define LARGE_TABLES
u1byte pow_tab[256];
#define f_rn(bo, bi, n, k) \
bo[n] = ft_tab[0][byte(bi[n],0)] ^ \
- ft_tab[1][byte(bi[(n + 1) & 3],1)] ^ \
- ft_tab[2][byte(bi[(n + 2) & 3],2)] ^ \
- ft_tab[3][byte(bi[(n + 3) & 3],3)] ^ *(k + n)
+ ft_tab[1][byte(bi[(n + 1) & 3],1)] ^ \
+ ft_tab[2][byte(bi[(n + 2) & 3],2)] ^ \
+ ft_tab[3][byte(bi[(n + 3) & 3],3)] ^ *(k + n)
#define i_rn(bo, bi, n, k) \
bo[n] = it_tab[0][byte(bi[n],0)] ^ \
- it_tab[1][byte(bi[(n + 3) & 3],1)] ^ \
- it_tab[2][byte(bi[(n + 2) & 3],2)] ^ \
- it_tab[3][byte(bi[(n + 1) & 3],3)] ^ *(k + n)
+ it_tab[1][byte(bi[(n + 3) & 3],1)] ^ \
+ it_tab[2][byte(bi[(n + 2) & 3],2)] ^ \
+ it_tab[3][byte(bi[(n + 1) & 3],3)] ^ *(k + n)
#ifdef LARGE_TABLES
#define f_rl(bo, bi, n, k) \
bo[n] = fl_tab[0][byte(bi[n],0)] ^ \
- fl_tab[1][byte(bi[(n + 1) & 3],1)] ^ \
- fl_tab[2][byte(bi[(n + 2) & 3],2)] ^ \
- fl_tab[3][byte(bi[(n + 3) & 3],3)] ^ *(k + n)
+ fl_tab[1][byte(bi[(n + 1) & 3],1)] ^ \
+ fl_tab[2][byte(bi[(n + 2) & 3],2)] ^ \
+ fl_tab[3][byte(bi[(n + 3) & 3],3)] ^ *(k + n)
#define i_rl(bo, bi, n, k) \
bo[n] = il_tab[0][byte(bi[n],0)] ^ \
- il_tab[1][byte(bi[(n + 3) & 3],1)] ^ \
- il_tab[2][byte(bi[(n + 2) & 3],2)] ^ \
- il_tab[3][byte(bi[(n + 1) & 3],3)] ^ *(k + n)
+ il_tab[1][byte(bi[(n + 3) & 3],1)] ^ \
+ il_tab[2][byte(bi[(n + 2) & 3],2)] ^ \
+ il_tab[3][byte(bi[(n + 1) & 3],3)] ^ *(k + n)
#else
#define f_rl(bo, bi, n, k) \
bo[n] = (u4byte)sbx_tab[byte(bi[n],0)] ^ \
- rotl(((u4byte)sbx_tab[byte(bi[(n + 1) & 3],1)]), 8) ^ \
- rotl(((u4byte)sbx_tab[byte(bi[(n + 2) & 3],2)]), 16) ^ \
- rotl(((u4byte)sbx_tab[byte(bi[(n + 3) & 3],3)]), 24) ^ *(k + n)
+ rotl(((u4byte)sbx_tab[byte(bi[(n + 1) & 3],1)]), 8) ^ \
+ rotl(((u4byte)sbx_tab[byte(bi[(n + 2) & 3],2)]), 16) ^ \
+ rotl(((u4byte)sbx_tab[byte(bi[(n + 3) & 3],3)]), 24) ^ *(k + n)
#define i_rl(bo, bi, n, k) \
bo[n] = (u4byte)isb_tab[byte(bi[n],0)] ^ \
- rotl(((u4byte)isb_tab[byte(bi[(n + 3) & 3],1)]), 8) ^ \
- rotl(((u4byte)isb_tab[byte(bi[(n + 2) & 3],2)]), 16) ^ \
- rotl(((u4byte)isb_tab[byte(bi[(n + 1) & 3],3)]), 24) ^ *(k + n)
+ rotl(((u4byte)isb_tab[byte(bi[(n + 3) & 3],1)]), 8) ^ \
+ rotl(((u4byte)isb_tab[byte(bi[(n + 2) & 3],2)]), 16) ^ \
+ rotl(((u4byte)isb_tab[byte(bi[(n + 1) & 3],3)]), 24) ^ *(k + n)
#endif
log_tab[1] = 0; p = 1;
for(i = 0; i < 10; ++i) {
- rco_tab[i] = p;
+ rco_tab[i] = p;
p = (p << 1) ^ (p & 0x80 ? 0x1b : 0);
}
/* least significant end of a byte. */
for(i = 0; i < 256; ++i) {
- p = (i ? pow_tab[255 - log_tab[i]] : 0); q = p;
- q = (q >> 7) | (q << 1); p ^= q;
- q = (q >> 7) | (q << 1); p ^= q;
- q = (q >> 7) | (q << 1); p ^= q;
- q = (q >> 7) | (q << 1); p ^= q ^ 0x63;
+ p = (i ? pow_tab[255 - log_tab[i]] : 0); q = p;
+ q = (q >> 7) | (q << 1); p ^= q;
+ q = (q >> 7) | (q << 1); p ^= q;
+ q = (q >> 7) | (q << 1); p ^= q;
+ q = (q >> 7) | (q << 1); p ^= q ^ 0x63;
sbx_tab[i] = (u1byte)p; isb_tab[p] = (u1byte)i;
}
for(i = 0; i < 256; ++i) {
- p = sbx_tab[i];
+ p = sbx_tab[i];
+
+#ifdef LARGE_TABLES
-#ifdef LARGE_TABLES
-
t = p; fl_tab[0][i] = t;
fl_tab[1][i] = rotl(t, 8);
fl_tab[2][i] = rotl(t, 16);
((u4byte)p << 8) |
((u4byte)p << 16) |
((u4byte)ff_mult(3, p) << 24);
-
+
ft_tab[0][i] = t;
ft_tab[1][i] = rotl(t, 8);
ft_tab[2][i] = rotl(t, 16);
ft_tab[3][i] = rotl(t, 24);
- p = isb_tab[i];
+ p = isb_tab[i];
-#ifdef LARGE_TABLES
-
- t = p; il_tab[0][i] = t;
- il_tab[1][i] = rotl(t, 8);
- il_tab[2][i] = rotl(t, 16);
+#ifdef LARGE_TABLES
+
+ t = p; il_tab[0][i] = t;
+ il_tab[1][i] = rotl(t, 8);
+ il_tab[2][i] = rotl(t, 16);
il_tab[3][i] = rotl(t, 24);
-#endif
+#endif
t = ((u4byte)ff_mult(14, p)) |
((u4byte)ff_mult( 9, p) << 8) |
((u4byte)ff_mult(13, p) << 16) |
((u4byte)ff_mult(11, p) << 24);
-
- it_tab[0][i] = t;
- it_tab[1][i] = rotl(t, 8);
- it_tab[2][i] = rotl(t, 16);
- it_tab[3][i] = rotl(t, 24);
+
+ it_tab[0][i] = t;
+ it_tab[1][i] = rotl(t, 8);
+ it_tab[2][i] = rotl(t, 16);
+ it_tab[3][i] = rotl(t, 24);
}
tab_gen = 1;
t = w ^ (x); \
(y) = u ^ v ^ w; \
(y) ^= rotr(u ^ t, 8) ^ \
- rotr(v ^ t, 16) ^ \
- rotr(t,24)
+ rotr(v ^ t, 16) ^ \
+ rotr(t,24)
/* initialise the key schedule from the user supplied key */
rijndael_ctx *
rijndael_set_key(rijndael_ctx *ctx, const u4byte *in_key, const u4byte key_len,
int encrypt)
-{
+{
u4byte i, t, u, v, w;
u4byte *e_key = ctx->e_key;
u4byte *d_key = ctx->d_key;
ctx->k_len = (key_len + 31) / 32;
- e_key[0] = in_key[0]; e_key[1] = in_key[1];
- e_key[2] = in_key[2]; e_key[3] = in_key[3];
-
+ e_key[0] = io_swap(in_key[0]); e_key[1] = io_swap(in_key[1]);
+ e_key[2] = io_swap(in_key[2]); e_key[3] = io_swap(in_key[3]);
+
switch(ctx->k_len) {
- case 4: t = e_key[3];
- for(i = 0; i < 10; ++i)
+ case 4: t = e_key[3];
+ for(i = 0; i < 10; ++i)
loop4(i);
- break;
+ break;
- case 6: e_key[4] = in_key[4]; t = e_key[5] = in_key[5];
- for(i = 0; i < 8; ++i)
+ case 6: e_key[4] = io_swap(in_key[4]); t = e_key[5] = io_swap(in_key[5]);
+ for(i = 0; i < 8; ++i)
loop6(i);
- break;
+ break;
- case 8: e_key[4] = in_key[4]; e_key[5] = in_key[5];
- e_key[6] = in_key[6]; t = e_key[7] = in_key[7];
- for(i = 0; i < 7; ++i)
+ case 8: e_key[4] = io_swap(in_key[4]); e_key[5] = io_swap(in_key[5]);
+ e_key[6] = io_swap(in_key[6]); t = e_key[7] = io_swap(in_key[7]);
+ for(i = 0; i < 7; ++i)
loop8(i);
- break;
+ break;
}
if (!encrypt) {
void
rijndael_encrypt(rijndael_ctx *ctx, const u4byte *in_blk, u4byte *out_blk)
-{
+{
u4byte k_len = ctx->k_len;
u4byte *e_key = ctx->e_key;
u4byte b0[4], b1[4], *kp;
- b0[0] = in_blk[0] ^ e_key[0]; b0[1] = in_blk[1] ^ e_key[1];
- b0[2] = in_blk[2] ^ e_key[2]; b0[3] = in_blk[3] ^ e_key[3];
+ b0[0] = io_swap(in_blk[0]) ^ e_key[0];
+ b0[1] = io_swap(in_blk[1]) ^ e_key[1];
+ b0[2] = io_swap(in_blk[2]) ^ e_key[2];
+ b0[3] = io_swap(in_blk[3]) ^ e_key[3];
kp = e_key + 4;
f_nround(b1, b0, kp); f_nround(b0, b1, kp);
f_nround(b1, b0, kp); f_lround(b0, b1, kp);
- out_blk[0] = b0[0]; out_blk[1] = b0[1];
- out_blk[2] = b0[2]; out_blk[3] = b0[3];
+ out_blk[0] = io_swap(b0[0]); out_blk[1] = io_swap(b0[1]);
+ out_blk[2] = io_swap(b0[2]); out_blk[3] = io_swap(b0[3]);
}
/* decrypt a block of text */
void
rijndael_decrypt(rijndael_ctx *ctx, const u4byte *in_blk, u4byte *out_blk)
-{
+{
u4byte b0[4], b1[4], *kp;
u4byte k_len = ctx->k_len;
u4byte *e_key = ctx->e_key;
u4byte *d_key = ctx->d_key;
- b0[0] = in_blk[0] ^ e_key[4 * k_len + 24]; b0[1] = in_blk[1] ^ e_key[4 * k_len + 25];
- b0[2] = in_blk[2] ^ e_key[4 * k_len + 26]; b0[3] = in_blk[3] ^ e_key[4 * k_len + 27];
+ b0[0] = io_swap(in_blk[0]) ^ e_key[4 * k_len + 24];
+ b0[1] = io_swap(in_blk[1]) ^ e_key[4 * k_len + 25];
+ b0[2] = io_swap(in_blk[2]) ^ e_key[4 * k_len + 26];
+ b0[3] = io_swap(in_blk[3]) ^ e_key[4 * k_len + 27];
kp = d_key + 4 * (k_len + 5);
i_nround(b1, b0, kp); i_nround(b0, b1, kp);
i_nround(b1, b0, kp); i_lround(b0, b1, kp);
- out_blk[0] = b0[0]; out_blk[1] = b0[1];
- out_blk[2] = b0[2]; out_blk[3] = b0[3];
+ out_blk[0] = io_swap(b0[0]); out_blk[1] = io_swap(b0[1]);
+ out_blk[2] = io_swap(b0[2]); out_blk[3] = io_swap(b0[3]);
}
andersk / openssh.git / blobdiff