Squashed 'src/crypto/ctaes/' changes from cd3c3ac..003a4ac
003a4ac Merge #5: fix typo 5254f14 [trivial] Fix typo e7c0aab Merge #4: Fix some comments d07cead Fix some comments git-subtree-dir: src/crypto/ctaes git-subtree-split: 003a4acfc273932ab8c2e276cde3b4f3541012dd
This commit is contained in:
parent
a545127fbc
commit
8501bedd75
2 changed files with 5 additions and 5 deletions
8
ctaes.c
8
ctaes.c
|
@ -134,7 +134,7 @@ static void SubBytes(AES_state *s, int inv) {
|
||||||
D = U7;
|
D = U7;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Non-linear transformation (identical to the code in SubBytes) */
|
/* Non-linear transformation (shared between the forward and backward case) */
|
||||||
M1 = T13 & T6;
|
M1 = T13 & T6;
|
||||||
M6 = T3 & T16;
|
M6 = T3 & T16;
|
||||||
M11 = T1 & T15;
|
M11 = T1 & T15;
|
||||||
|
@ -469,9 +469,9 @@ static void AES_encrypt(const AES_state* rounds, int nrounds, unsigned char* cip
|
||||||
|
|
||||||
static void AES_decrypt(const AES_state* rounds, int nrounds, unsigned char* plain16, const unsigned char* cipher16) {
|
static void AES_decrypt(const AES_state* rounds, int nrounds, unsigned char* plain16, const unsigned char* cipher16) {
|
||||||
/* Most AES decryption implementations use the alternate scheme
|
/* Most AES decryption implementations use the alternate scheme
|
||||||
* (the Equivalent Inverse Cipher), which looks more like encryption, but
|
* (the Equivalent Inverse Cipher), which allows for more code reuse between
|
||||||
* needs different round constants. We can't reuse any code here anyway, so
|
* the encryption and decryption code, but requires separate setup for both.
|
||||||
* don't bother. */
|
*/
|
||||||
AES_state s = {{0}};
|
AES_state s = {{0}};
|
||||||
int round;
|
int round;
|
||||||
|
|
||||||
|
|
2
test.c
2
test.c
|
@ -102,7 +102,7 @@ int main(void) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (fail == 0) {
|
if (fail == 0) {
|
||||||
fprintf(stderr, "All tests succesful\n");
|
fprintf(stderr, "All tests successful\n");
|
||||||
} else {
|
} else {
|
||||||
fprintf(stderr, "%i tests failed\n", fail);
|
fprintf(stderr, "%i tests failed\n", fail);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue