diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /crypto/xts.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'crypto/xts.c')
| -rw-r--r-- | crypto/xts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/xts.c b/crypto/xts.c index 555ecaab1e54..851705446c82 100644 --- a/crypto/xts.c +++ b/crypto/xts.c | |||
| @@ -45,7 +45,7 @@ static int setkey(struct crypto_tfm *parent, const u8 *key, | |||
| 45 | return -EINVAL; | 45 | return -EINVAL; |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | /* we need two cipher instances: one to compute the inital 'tweak' | 48 | /* we need two cipher instances: one to compute the initial 'tweak' |
| 49 | * by encrypting the IV (usually the 'plain' iv) and the other | 49 | * by encrypting the IV (usually the 'plain' iv) and the other |
| 50 | * one to encrypt and decrypt the data */ | 50 | * one to encrypt and decrypt the data */ |
| 51 | 51 | ||