Permalink
Browse files

Switch aesni_enc() -> aesni_encrypt_xts() and related functions

  • Loading branch information...
1 parent 699bf87 commit f7b7133a1c18fec93e58432717c15a81c8a8d9b8 @kmoore134 kmoore134 committed Sep 13, 2013
Showing with 2 additions and 4 deletions.
  1. +2 −2 sys/fs/pefs/pefs_aesni.c
  2. +0 −2 sys/fs/pefs/pefs_aesni.h
@@ -117,7 +117,7 @@ pefs_aesni_encrypt(const struct pefs_session *xses,
const struct pefs_aesni_ctx *ctx = &xctx->o.pctx_aesni;
if (ses->fpu_saved >= 0)
- aesni_enc(ctx->rounds - 1, ctx->enc_schedule, in, out, NULL);
+ aesni_encrypt_xts(ctx->rounds - 1, ctx->enc_schedule, in, out, NULL);
else
rijndael_encrypt(&ctx->sw, in, out);
}
@@ -130,7 +130,7 @@ pefs_aesni_decrypt(const struct pefs_session *xses,
const struct pefs_aesni_ctx *ctx = &xctx->o.pctx_aesni;
if (ses->fpu_saved >= 0)
- aesni_dec(ctx->rounds - 1, ctx->dec_schedule, in, out, NULL);
+ aesni_decrypt_xts(ctx->rounds - 1, ctx->dec_schedule, in, out, NULL);
else
rijndael_decrypt(&ctx->sw, in, out);
}
@@ -27,8 +27,6 @@
*/
#include <crypto/aesni/aesni.h>
-#include <contrib/llvm/tools/clang/lib/Headers/wmmintrin.h>
-#include <crypto/aesni/aesencdec.h>
struct pefs_aesni_ctx {
uint8_t enc_schedule[AES_SCHED_LEN] __aligned(16);

0 comments on commit f7b7133

Please sign in to comment.