Merge pull request #89 from nickaknudson/master

CTR-only mode still needs functions to update counter (iv)
This commit is contained in:
kokke 2018-02-01 09:23:46 +01:00 committed by GitHub
commit 61fa5c1d28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

2
aes.c
View File

@ -226,7 +226,7 @@ void AES_init_ctx(struct AES_ctx* ctx, const uint8_t* key)
{
KeyExpansion(ctx->RoundKey, key);
}
#if defined(CBC) && (CBC == 1)
#if (defined(CBC) && (CBC == 1)) || (defined(CTR) && (CTR == 1))
void AES_init_ctx_iv(struct AES_ctx* ctx, const uint8_t* key, const uint8_t* iv)
{
KeyExpansion(ctx->RoundKey, key);

2
aes.h
View File

@ -49,7 +49,7 @@ struct AES_ctx
};
void AES_init_ctx(struct AES_ctx* ctx, const uint8_t* key);
#if defined(CBC) && (CBC == 1)
#if (defined(CBC) && (CBC == 1)) || (defined(CTR) && (CTR == 1))
void AES_init_ctx_iv(struct AES_ctx* ctx, const uint8_t* key, const uint8_t* iv);
void AES_ctx_set_iv(struct AES_ctx* ctx, const uint8_t* iv);
#endif