diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-04-15 02:49:30 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-04-15 02:49:30 +0000 |
| commit | 06b7e5a0e4ba613acdef51aaaa1b338a0c3e12b3 (patch) | |
| tree | 295d9525390f62abfc6d32fffdd1857fc64edc6f /crypto/evp | |
| parent | 706735aea34218c811beaaa34fe6199556aa4837 (diff) | |
Add algorithm driver for XTS mode. Fix several bugs in EVP XTS implementation.
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/e_aes.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c index 019c9107c6..c093eb5e59 100644 --- a/crypto/evp/e_aes.c +++ b/crypto/evp/e_aes.c @@ -471,8 +471,6 @@ static int aes_xts_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr) /* key1 and key2 are used as an indicator both key and IV are set */ xctx->xts.key1 = NULL; xctx->xts.key2 = NULL; - xctx->xts.block1 = (block128_f)AES_encrypt; - xctx->xts.block2 = (block128_f)AES_encrypt; return 1; } @@ -485,13 +483,23 @@ static int aes_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, if (key) { - AES_set_encrypt_key(key, ctx->key_len * 8, &xctx->ks1); - AES_set_encrypt_key(key + ctx->key_len, ctx->key_len * 8, - &xctx->ks2); + /* key_len is two AES keys */ + if (ctx->encrypt) + { + AES_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1); + xctx->xts.block1 = (block128_f)AES_encrypt; + } + else + { + AES_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1); + xctx->xts.block1 = (block128_f)AES_decrypt; + } - xctx->xts.key1 = &xctx->ks1; - xctx->xts.block1 = (block128_f)AES_encrypt; + AES_set_encrypt_key(key + ctx->key_len/2, + ctx->key_len * 4, &xctx->ks2); xctx->xts.block2 = (block128_f)AES_encrypt; + + xctx->xts.key1 = &xctx->ks1; } if (iv) |