Changeset a35b458 in mainline for uspace/lib/crypto/aes.c

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• uspace/lib/crypto/aes.c (modified) (17 diffs)

uspace/lib/crypto/aes.c

@@ -213 +213 @@
         uint8_t i = byte >> 4;
         uint8_t j = byte & 0xF;
-        
+
         if (!inv)
                 return sbox[i][j];
-        
+
         return inv_sbox[i][j];
 }
@@ -229 +229 @@
 {
         uint8_t val;
-        
+
         for (size_t i = 0; i < ELEMS; i++) {
                 for (size_t j = 0; j < ELEMS; j++) {
@@ -246 +246 @@
 {
         uint8_t temp[ELEMS];
-        
+
         for (size_t i = 1; i < ELEMS; i++) {
                 memcpy(temp, state[i], i);
@@ -262 +262 @@
 {
         uint8_t temp[ELEMS];
-        
+
         for (size_t i = 1; i < ELEMS; i++) {
                 memcpy(temp, state[i], ELEMS - i);
@@ -282 +282 @@
         uint8_t result = 0;
         uint8_t f_bith;
-        
+
         for (size_t i = 0; i < 8; i++) {
                 if (y & 1)
                         result ^= x;
-                
+
                 f_bith = (x & 0x80);
                 x <<= 1;
-                
+
                 if (f_bith)
                         x ^= AES_IP;
-                
+
                 y >>= 1;
         }
-        
+
         return result;
 }
@@ -308 +308 @@
         uint8_t orig_state[ELEMS][ELEMS];
         memcpy(orig_state, state, BLOCK_LEN);
-        
+
         for (size_t j = 0; j < ELEMS; j++) {
                 state[0][j] =
@@ -342 +342 @@
         uint8_t orig_state[ELEMS][ELEMS];
         memcpy(orig_state, state, BLOCK_LEN);
-        
+
         for (size_t j = 0; j < ELEMS; j++) {
                 state[0][j] =
@@ -378 +378 @@
         uint8_t shift;
         uint32_t mask = 0xff;
-        
+
         for (size_t j = 0; j < ELEMS; j++) {
                 for (size_t i = 0; i < ELEMS; i++) {
@@ -399 +399 @@
         uint32_t temp = word;
         uint8_t *start = (uint8_t *) &temp;
-        
+
         for (size_t i = 0; i < 4; i++)
                 *(start + i) = sub_byte(*(start + i), false);
-        
+
         return temp;
 }
@@ -427 +427 @@
 {
         uint32_t temp;
-        
+
         for (size_t i = 0; i < CIPHER_ELEMS; i++) {
                 key_exp[i] =
@@ -435 +435 @@
                     (key[4 * i + 3]);
         }
-        
+
         for (size_t i = CIPHER_ELEMS; i < ELEMS * (ROUNDS + 1); i++) {
                 temp = key_exp[i - 1];
-                
+
                 if ((i % CIPHER_ELEMS) == 0) {
                         temp = sub_word(rot_word(temp)) ^
                             r_con_array[i / CIPHER_ELEMS - 1];
                 }
-                
+
                 key_exp[i] = key_exp[i - CIPHER_ELEMS] ^ temp;
         }
@@ -463 +463 @@
         if ((!key) || (!input))
                 return EINVAL;
-        
+
         if (!output)
                 return ENOMEM;
-        
+
         /* Create key expansion. */
         uint32_t key_exp[ELEMS * (ROUNDS + 1)];
         key_expansion(key, key_exp);
-        
+
         /* Copy input into state array. */
         uint8_t state[ELEMS][ELEMS];
@@ -477 +477 @@
                         state[i][j] = input[i + ELEMS * j];
         }
-        
+
         /* Processing loop. */
         add_round_key(state, key_exp);
-        
+
         for (size_t k = 1; k <= ROUNDS; k++) {
                 sub_bytes(state, false);
                 shift_rows(state);
-                
+
                 if (k < ROUNDS)
                         mix_columns(state);
-                
+
                 add_round_key(state, key_exp + k * ELEMS);
         }
-        
+
         /* Copy state array into output. */
         for (size_t i = 0; i < ELEMS; i++) {
@@ -496 +496 @@
                         output[i + j * ELEMS] = state[i][j];
         }
-        
+
         return EOK;
 }
@@ -515 +515 @@
         if ((!key) || (!input))
                 return EINVAL;
-        
+
         if (!output)
                 return ENOMEM;
-        
+
         /* Create key expansion. */
         uint32_t key_exp[ELEMS * (ROUNDS + 1)];
         key_expansion(key, key_exp);
-        
+
         /* Copy input into state array. */
         uint8_t state[ELEMS][ELEMS];
@@ -529 +529 @@
                         state[i][j] = input[i + ELEMS * j];
         }
-        
+
         /* Processing loop. */
         add_round_key(state, key_exp + ROUNDS * ELEMS);
-        
+
         for (int k = ROUNDS - 1; k >= 0; k--) {
                 inv_shift_rows(state);
                 sub_bytes(state, true);
                 add_round_key(state, key_exp + k * ELEMS);
-                
+
                 if (k > 0)
                         inv_mix_columns(state);
         }
-        
+
         /* Copy state array into output. */
         for (size_t i = 0; i < ELEMS; i++) {
@@ -547 +547 @@
                         output[i + j * ELEMS] = state[i][j];
         }
-        
+
         return EOK;
 }