kris/pqc
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add release function for AES key schedule

Browse Source
This commit is contained in:
Douglas Stebila 2019-06-20 21:07:03 -04:00
parent 5bdb9569e3
commit 4157e0fbad
12 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/aes.c
View File

@ -622,3 +622,21 @@ void aes256_ctr(unsigned char *out, size_t outlen, const unsigned char *iv, cons
aes_ctr(out, outlen, iv, ctx->sk_exp, 14);
}
#ifdef __GNUC__
# define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
#else
# define UNUSED(x) UNUSED_ ## x
#endif
void aes128_ctx_release(aes128ctx *UNUSED(r)) {
// no-op for PQClean's basic AES operation
}
void aes192_ctx_release(aes192ctx *UNUSED(r)) {
// no-op for PQClean's basic AES operation
}
void aes256_ctx_release(aes256ctx *UNUSED(r)) {
// no-op for PQClean's basic AES operation
}

6
common/aes.h
View File

@ -30,6 +30,8 @@ void aes128_ecb(unsigned char *out, const unsigned char *in, size_t nblocks, con
void aes128_ctr(unsigned char *out, size_t outlen, const unsigned char *iv, const aes128ctx *ctx);
void aes128_ctx_release(aes128ctx *r);
void aes192_keyexp(aes192ctx *r, const unsigned char *key);
@ -37,6 +39,8 @@ void aes192_ecb(unsigned char *out, const unsigned char *in, size_t nblocks, con
void aes192_ctr(unsigned char *out, size_t outlen, const unsigned char *iv, const aes192ctx *ctx);
void aes192_ctx_release(aes192ctx *r);
void aes256_keyexp(aes256ctx *r, const unsigned char *key);
@ -44,5 +48,7 @@ void aes256_ecb(unsigned char *out, const unsigned char *in, size_t nblocks, con
void aes256_ctr(unsigned char *out, size_t outlen, const unsigned char *iv, const aes256ctx *ctx);
void aes256_ctx_release(aes256ctx *r);
#endif

2
crypto_kem/frodokem1344aes/clean/matrix_aes.c
View File

@ -33,6 +33,7 @@ int PQCLEAN_FRODOKEM1344AES_CLEAN_mul_add_as_plus_e(uint16_t *out, const uint16_
}
aes128_ecb((uint8_t *) A, (uint8_t *) A, PARAMS_N * PARAMS_N * sizeof(int16_t) / AES_BLOCKBYTES, &ctx128);
aes128_ctx_release(&ctx128);
for (i = 0; i < PARAMS_N * PARAMS_N; i++) {
A[i] = PQCLEAN_FRODOKEM1344AES_CLEAN_LE_TO_UINT16(A[i]);
@ -73,6 +74,7 @@ int PQCLEAN_FRODOKEM1344AES_CLEAN_mul_add_sa_plus_e(uint16_t *out, const uint16_
}
aes128_ecb((uint8_t *) A, (uint8_t *) A, PARAMS_N * PARAMS_N * sizeof(int16_t) / AES_BLOCKBYTES, &ctx128);
aes128_ctx_release(&ctx128);
for (i = 0; i < PARAMS_N * PARAMS_N; i++) {
A[i] = PQCLEAN_FRODOKEM1344AES_CLEAN_LE_TO_UINT16(A[i]);

2
crypto_kem/frodokem1344aes/opt/matrix_aes.c
View File

@ -63,6 +63,7 @@ int PQCLEAN_FRODOKEM1344AES_OPT_mul_add_as_plus_e(uint16_t *out, const uint16_t
out[(i + 3)*PARAMS_NBAR + k] += sum[3];
}
}
aes128_ctx_release(&ctx128);
return 1;
}
@ -121,5 +122,6 @@ int PQCLEAN_FRODOKEM1344AES_OPT_mul_add_sa_plus_e(uint16_t *out, const uint16_t
}
}
}
aes128_ctx_release(&ctx128);
return 1;
}

2
crypto_kem/frodokem640aes/clean/matrix_aes.c
View File

@ -33,6 +33,7 @@ int PQCLEAN_FRODOKEM640AES_CLEAN_mul_add_as_plus_e(uint16_t *out, const uint16_t
}
aes128_ecb((uint8_t *) A, (uint8_t *) A, PARAMS_N * PARAMS_N * sizeof(int16_t) / AES_BLOCKBYTES, &ctx128);
aes128_ctx_release(&ctx128);
for (i = 0; i < PARAMS_N * PARAMS_N; i++) {
A[i] = PQCLEAN_FRODOKEM640AES_CLEAN_LE_TO_UINT16(A[i]);
@ -73,6 +74,7 @@ int PQCLEAN_FRODOKEM640AES_CLEAN_mul_add_sa_plus_e(uint16_t *out, const uint16_t
}
aes128_ecb((uint8_t *) A, (uint8_t *) A, PARAMS_N * PARAMS_N * sizeof(int16_t) / AES_BLOCKBYTES, &ctx128);
aes128_ctx_release(&ctx128);
for (i = 0; i < PARAMS_N * PARAMS_N; i++) {
A[i] = PQCLEAN_FRODOKEM640AES_CLEAN_LE_TO_UINT16(A[i]);

2
crypto_kem/frodokem640aes/opt/matrix_aes.c
View File

@ -63,6 +63,7 @@ int PQCLEAN_FRODOKEM640AES_OPT_mul_add_as_plus_e(uint16_t *out, const uint16_t *
out[(i + 3)*PARAMS_NBAR + k] += sum[3];
}
}
aes128_ctx_release(&ctx128);
return 1;
}
@ -121,5 +122,6 @@ int PQCLEAN_FRODOKEM640AES_OPT_mul_add_sa_plus_e(uint16_t *out, const uint16_t *
}
}
}
aes128_ctx_release(&ctx128);
return 1;
}

2
crypto_kem/frodokem976aes/clean/matrix_aes.c
View File

@ -33,6 +33,7 @@ int PQCLEAN_FRODOKEM976AES_CLEAN_mul_add_as_plus_e(uint16_t *out, const uint16_t
}
aes128_ecb((uint8_t *) A, (uint8_t *) A, PARAMS_N * PARAMS_N * sizeof(int16_t) / AES_BLOCKBYTES, &ctx128);
aes128_ctx_release(&ctx128);
for (i = 0; i < PARAMS_N * PARAMS_N; i++) {
A[i] = PQCLEAN_FRODOKEM976AES_CLEAN_LE_TO_UINT16(A[i]);
@ -73,6 +74,7 @@ int PQCLEAN_FRODOKEM976AES_CLEAN_mul_add_sa_plus_e(uint16_t *out, const uint16_t
}
aes128_ecb((uint8_t *) A, (uint8_t *) A, PARAMS_N * PARAMS_N * sizeof(int16_t) / AES_BLOCKBYTES, &ctx128);
aes128_ctx_release(&ctx128);
for (i = 0; i < PARAMS_N * PARAMS_N; i++) {
A[i] = PQCLEAN_FRODOKEM976AES_CLEAN_LE_TO_UINT16(A[i]);

2
crypto_kem/frodokem976aes/opt/matrix_aes.c
View File

@ -63,6 +63,7 @@ int PQCLEAN_FRODOKEM976AES_OPT_mul_add_as_plus_e(uint16_t *out, const uint16_t *
out[(i + 3)*PARAMS_NBAR + k] += sum[3];
}
}
aes128_ctx_release(&ctx128);
return 1;
}
@ -121,5 +122,6 @@ int PQCLEAN_FRODOKEM976AES_OPT_mul_add_sa_plus_e(uint16_t *out, const uint16_t *
}
}
}
aes128_ctx_release(&ctx128);
return 1;
}

1
crypto_kem/ledakemlt12/leaktime/rng.c
View File

@ -103,6 +103,7 @@ int PQCLEAN_LEDAKEMLT12_LEAKTIME_seedexpander(AES_XOF_struct *ctx, unsigned char
}
}
aes256_ctx_release(&ctx256);
return RNG_SUCCESS;
}

1
crypto_kem/ledakemlt32/leaktime/rng.c
View File

@ -103,6 +103,7 @@ int PQCLEAN_LEDAKEMLT32_LEAKTIME_seedexpander(AES_XOF_struct *ctx, unsigned char
}
}
aes256_ctx_release(&ctx256);
return RNG_SUCCESS;
}

1
crypto_kem/ledakemlt52/leaktime/rng.c
View File

@ -103,6 +103,7 @@ int PQCLEAN_LEDAKEMLT52_LEAKTIME_seedexpander(AES_XOF_struct *ctx, unsigned char
}
}
aes256_ctx_release(&ctx256);
return RNG_SUCCESS;
}

4
test/common/aes.c
View File

@ -96,5 +96,9 @@ int main(void)
r = 1;
}
aes128_ctx_release(&ctx128);
aes192_ctx_release(&ctx192);
aes256_ctx_release(&ctx256);
return r;
}