Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes a sporadic build failure in the qat driver as well as a
memory corruption bug in rsa-pkcs1pad"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: rsa-pkcs1pad - fix rsa-pkcs1pad request struct
crypto: qat - make qat_asym_algs.o depend on asn1 headers
+3
-2
+2
-2
crypto/rsa-pkcs1pad.c
+2
-2
crypto/rsa-pkcs1pad.c
···
102
102
};
103
103
104
104
struct pkcs1pad_request {
105
-
struct akcipher_request child_req;
106
-
107
105
struct scatterlist in_sg[3], out_sg[2];
108
106
uint8_t *in_buf, *out_buf;
107
+
108
+
struct akcipher_request child_req;
109
109
};
110
110
111
111
static int pkcs1pad_set_pub_key(struct crypto_akcipher *tfm, const void *key,
+1
drivers/crypto/qat/qat_common/Makefile
+1
drivers/crypto/qat/qat_common/Makefile
···
2
2
$(obj)/qat_rsapubkey-asn1.h
3
3
$(obj)/qat_rsaprivkey-asn1.o: $(obj)/qat_rsaprivkey-asn1.c \
4
4
$(obj)/qat_rsaprivkey-asn1.h
5
+
$(obj)/qat_asym_algs.o: $(obj)/qat_rsapubkey-asn1.h $(obj)/qat_rsaprivkey-asn1.h
5
6
6
7
clean-files += qat_rsapubkey-asn1.c qat_rsapubkey-asn1.h
7
8
clean-files += qat_rsaprivkey-asn1.c qat_rsaprivkey-asn1.h