summaryrefslogtreecommitdiff
path: root/src/ltc/ciphers
diff options
context:
space:
mode:
authorKarel Miko <karel.miko@gmail.com>2017-02-28 14:50:12 +0100
committerKarel Miko <karel.miko@gmail.com>2017-02-28 14:50:12 +0100
commitf04674ad7c57d7825dac3fda9eafa1c3a972d532 (patch)
tree6da6676bb1fcd89f4f002976809955a84f85ffaf /src/ltc/ciphers
parent8a11132d85922795324e413d23ba11b9570111e0 (diff)
ltc sync whitespaces
Diffstat (limited to 'src/ltc/ciphers')
-rw-r--r--src/ltc/ciphers/aes/aes.c22
-rw-r--r--src/ltc/ciphers/anubis.c10
-rw-r--r--src/ltc/ciphers/des.c12
-rw-r--r--src/ltc/ciphers/kseed.c52
-rw-r--r--src/ltc/ciphers/noekeon.c10
5 files changed, 53 insertions, 53 deletions
diff --git a/src/ltc/ciphers/aes/aes.c b/src/ltc/ciphers/aes/aes.c
index cc9d99f3..2bf7a005 100644
--- a/src/ltc/ciphers/aes/aes.c
+++ b/src/ltc/ciphers/aes/aes.c
@@ -675,11 +675,11 @@ int ECB_TEST(void)
}
};
- symmetric_key key;
- unsigned char tmp[2][16];
- int i, y;
+ symmetric_key key;
+ unsigned char tmp[2][16];
+ int i, y;
- for (i = 0; i < (int)(sizeof(tests)/sizeof(tests[0])); i++) {
+ for (i = 0; i < (int)(sizeof(tests)/sizeof(tests[0])); i++) {
zeromem(&key, sizeof(key));
if ((err = rijndael_setup(tests[i].key, tests[i].keylen, 0, &key)) != CRYPT_OK) {
return err;
@@ -707,13 +707,13 @@ int ECB_TEST(void)
return CRYPT_FAIL_TESTVECTOR;
}
- /* now see if we can encrypt all zero bytes 1000 times, decrypt and come back where we started */
- for (y = 0; y < 16; y++) tmp[0][y] = 0;
- for (y = 0; y < 1000; y++) rijndael_ecb_encrypt(tmp[0], tmp[0], &key);
- for (y = 0; y < 1000; y++) rijndael_ecb_decrypt(tmp[0], tmp[0], &key);
- for (y = 0; y < 16; y++) if (tmp[0][y] != 0) return CRYPT_FAIL_TESTVECTOR;
- }
- return CRYPT_OK;
+ /* now see if we can encrypt all zero bytes 1000 times, decrypt and come back where we started */
+ for (y = 0; y < 16; y++) tmp[0][y] = 0;
+ for (y = 0; y < 1000; y++) rijndael_ecb_encrypt(tmp[0], tmp[0], &key);
+ for (y = 0; y < 1000; y++) rijndael_ecb_decrypt(tmp[0], tmp[0], &key);
+ for (y = 0; y < 16; y++) if (tmp[0][y] != 0) return CRYPT_FAIL_TESTVECTOR;
+ }
+ return CRYPT_OK;
#endif
}
diff --git a/src/ltc/ciphers/anubis.c b/src/ltc/ciphers/anubis.c
index c3b3c2f5..f8194212 100644
--- a/src/ltc/ciphers/anubis.c
+++ b/src/ltc/ciphers/anubis.c
@@ -926,16 +926,16 @@ int anubis_setup(const unsigned char *key, int keylen, int num_rounds, symmetri
return CRYPT_INVALID_ROUNDS;
}
- /*
- * map cipher key to initial key state (mu):
- */
- for (i = 0, pos = 0; i < N; i++, pos += 4) {
+ /*
+ * map cipher key to initial key state (mu):
+ */
+ for (i = 0, pos = 0; i < N; i++, pos += 4) {
kappa[i] =
(((ulong32)key[pos ]) << 24) ^
(((ulong32)key[pos + 1]) << 16) ^
(((ulong32)key[pos + 2]) << 8) ^
(((ulong32)key[pos + 3]) );
- }
+ }
/*
* generate R + 1 round keys:
diff --git a/src/ltc/ciphers/des.c b/src/ltc/ciphers/des.c
index fbacf5c9..712c1ae8 100644
--- a/src/ltc/ciphers/des.c
+++ b/src/ltc/ciphers/des.c
@@ -1983,12 +1983,12 @@ int des_test(void)
return CRYPT_FAIL_TESTVECTOR;
}
- /* now see if we can encrypt all zero bytes 1000 times, decrypt and come back where we started */
- for (y = 0; y < 8; y++) tmp[y] = 0;
- for (y = 0; y < 1000; y++) des_ecb_encrypt(tmp, tmp, &des);
- for (y = 0; y < 1000; y++) des_ecb_decrypt(tmp, tmp, &des);
- for (y = 0; y < 8; y++) if (tmp[y] != 0) return CRYPT_FAIL_TESTVECTOR;
-}
+ /* now see if we can encrypt all zero bytes 1000 times, decrypt and come back where we started */
+ for (y = 0; y < 8; y++) tmp[y] = 0;
+ for (y = 0; y < 1000; y++) des_ecb_encrypt(tmp, tmp, &des);
+ for (y = 0; y < 1000; y++) des_ecb_decrypt(tmp, tmp, &des);
+ for (y = 0; y < 8; y++) if (tmp[y] != 0) return CRYPT_FAIL_TESTVECTOR;
+ }
return CRYPT_OK;
#endif
diff --git a/src/ltc/ciphers/kseed.c b/src/ltc/ciphers/kseed.c
index 003074ca..85b4f8a7 100644
--- a/src/ltc/ciphers/kseed.c
+++ b/src/ltc/ciphers/kseed.c
@@ -201,41 +201,41 @@ static const ulong32 KCi[16] = {
*/
int kseed_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey)
{
- int i;
- ulong32 tmp, k1, k2, k3, k4;
+ int i;
+ ulong32 tmp, k1, k2, k3, k4;
- if (keylen != 16) {
- return CRYPT_INVALID_KEYSIZE;
- }
+ if (keylen != 16) {
+ return CRYPT_INVALID_KEYSIZE;
+ }
- if (num_rounds != 16 && num_rounds != 0) {
- return CRYPT_INVALID_ROUNDS;
- }
+ if (num_rounds != 16 && num_rounds != 0) {
+ return CRYPT_INVALID_ROUNDS;
+ }
- /* load key */
- LOAD32H(k1, key);
- LOAD32H(k2, key+4);
- LOAD32H(k3, key+8);
- LOAD32H(k4, key+12);
+ /* load key */
+ LOAD32H(k1, key);
+ LOAD32H(k2, key+4);
+ LOAD32H(k3, key+8);
+ LOAD32H(k4, key+12);
- for (i = 0; i < 16; i++) {
- skey->kseed.K[2*i+0] = G(k1 + k3 - KCi[i]);
- skey->kseed.K[2*i+1] = G(k2 - k4 + KCi[i]);
- if (i&1) {
- tmp = k3;
- k3 = ((k3 << 8) | (k4 >> 24)) & 0xFFFFFFFF;
- k4 = ((k4 << 8) | (tmp >> 24)) & 0xFFFFFFFF;
- } else {
- tmp = k1;
- k1 = ((k1 >> 8) | (k2 << 24)) & 0xFFFFFFFF;
- k2 = ((k2 >> 8) | (tmp << 24)) & 0xFFFFFFFF;
+ for (i = 0; i < 16; i++) {
+ skey->kseed.K[2*i+0] = G(k1 + k3 - KCi[i]);
+ skey->kseed.K[2*i+1] = G(k2 - k4 + KCi[i]);
+ if (i&1) {
+ tmp = k3;
+ k3 = ((k3 << 8) | (k4 >> 24)) & 0xFFFFFFFF;
+ k4 = ((k4 << 8) | (tmp >> 24)) & 0xFFFFFFFF;
+ } else {
+ tmp = k1;
+ k1 = ((k1 >> 8) | (k2 << 24)) & 0xFFFFFFFF;
+ k2 = ((k2 >> 8) | (tmp << 24)) & 0xFFFFFFFF;
}
/* reverse keys for decrypt */
skey->kseed.dK[2*(15-i)+0] = skey->kseed.K[2*i+0];
skey->kseed.dK[2*(15-i)+1] = skey->kseed.K[2*i+1];
- }
+ }
- return CRYPT_OK;
+ return CRYPT_OK;
}
static void rounds(ulong32 *P, ulong32 *K)
diff --git a/src/ltc/ciphers/noekeon.c b/src/ltc/ciphers/noekeon.c
index f748d3e9..5b8d1c85 100644
--- a/src/ltc/ciphers/noekeon.c
+++ b/src/ltc/ciphers/noekeon.c
@@ -303,11 +303,11 @@ int noekeon_test(void)
return CRYPT_FAIL_TESTVECTOR;
}
- /* now see if we can encrypt all zero bytes 1000 times, decrypt and come back where we started */
- for (y = 0; y < 16; y++) tmp[0][y] = 0;
- for (y = 0; y < 1000; y++) noekeon_ecb_encrypt(tmp[0], tmp[0], &key);
- for (y = 0; y < 1000; y++) noekeon_ecb_decrypt(tmp[0], tmp[0], &key);
- for (y = 0; y < 16; y++) if (tmp[0][y] != 0) return CRYPT_FAIL_TESTVECTOR;
+ /* now see if we can encrypt all zero bytes 1000 times, decrypt and come back where we started */
+ for (y = 0; y < 16; y++) tmp[0][y] = 0;
+ for (y = 0; y < 1000; y++) noekeon_ecb_encrypt(tmp[0], tmp[0], &key);
+ for (y = 0; y < 1000; y++) noekeon_ecb_decrypt(tmp[0], tmp[0], &key);
+ for (y = 0; y < 16; y++) if (tmp[0][y] != 0) return CRYPT_FAIL_TESTVECTOR;
}
return CRYPT_OK;
#endif