Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
[CRYPTO] geode: Fix in-place operations and set key
+10
-5
+9
-3
drivers/crypto/geode-aes.c
+9
-3
drivers/crypto/geode-aes.c
···
102
102
u32 flags = 0;
103
103
unsigned long iflags;
104
104
105
-
if (op->len == 0 || op->src == op->dst)
105
+
if (op->len == 0)
106
106
return 0;
107
107
108
-
if (op->flags & AES_FLAGS_COHERENT)
108
+
/* If the source and destination is the same, then
109
+
* we need to turn on the coherent flags, otherwise
110
+
* we don't need to worry
111
+
*/
112
+
113
+
if (op->src == op->dst)
109
114
flags |= (AES_CTRL_DCA | AES_CTRL_SCA);
110
115
111
116
if (op->dir == AES_DIR_ENCRYPT)
···
125
120
_writefield(AES_WRITEIV0_REG, op->iv);
126
121
}
127
122
128
-
if (op->flags & AES_FLAGS_USRKEY) {
123
+
if (!(op->flags & AES_FLAGS_HIDDENKEY)) {
129
124
flags |= AES_CTRL_WRKEY;
130
125
_writefield(AES_WRITEKEY0_REG, op->key);
131
126
}
···
294
289
.setkey = geode_setkey,
295
290
.encrypt = geode_cbc_encrypt,
296
291
.decrypt = geode_cbc_decrypt,
292
+
.ivsize = AES_IV_LENGTH,
297
293
}
298
294
}
299
295
};