Skip to content

Commit

Permalink
Squashed 'src/crypto/ctaes/' changes from cd3c3ac..003a4ac
Browse files Browse the repository at this point in the history
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
  • Loading branch information
sipa committed Dec 9, 2016
1 parent a545127 commit 8501bed
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions ctaes.c
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ static void SubBytes(AES_state *s, int inv) {
D = U7;
}

/* Non-linear transformation (identical to the code in SubBytes) */
/* Non-linear transformation (shared between the forward and backward case) */
M1 = T13 & T6;
M6 = T3 & T16;
M11 = T1 & T15;
Expand Down Expand Up @@ -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) {
/* Most AES decryption implementations use the alternate scheme
* (the Equivalent Inverse Cipher), which looks more like encryption, but
* needs different round constants. We can't reuse any code here anyway, so
* don't bother. */
* (the Equivalent Inverse Cipher), which allows for more code reuse between
* the encryption and decryption code, but requires separate setup for both.
*/
AES_state s = {{0}};
int round;

Expand Down
2 changes: 1 addition & 1 deletion test.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ int main(void) {
}
}
if (fail == 0) {
fprintf(stderr, "All tests succesful\n");
fprintf(stderr, "All tests successful\n");
} else {
fprintf(stderr, "%i tests failed\n", fail);
}
Expand Down

0 comments on commit 8501bed

Please sign in to comment.