CommitterLinus Torvalds (1)
AuthorLinus Torvalds (1)
Branchesmaster (1)


Linux/linux 483847a — arch/arm/crypto chacha-glue.c poly1305-glue.c, arch/arm64/crypto poly1305-glue.c chacha-neon-glue.c

by Linus Torvalds on ⎇
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:

 - Fix build error in crypto lib code when crypto API is off

 - Fix NULL/error check in hisilicon

 - Fix Kconfig-related build error in talitos

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: hisilicon - fix a NULL vs IS_ERR() bug in sec_create_qp_ctx()
  crypto: talitos - Fix build error by selecting LIB_DES
  crypto: arch - conditionalize crypto api in arch glue for lib code
DeltaFile
+16-10arch/arm/crypto/chacha-glue.c
+6-3arch/arm/crypto/poly1305-glue.c
+4-3arch/x86/crypto/curve25519-x86_64.c
+4-2arch/mips/crypto/poly1305-glue.c
+4-2arch/mips/crypto/chacha-glue.c
+4-2arch/x86/crypto/blake2s-glue.c
+3-2arch/arm/crypto/curve25519-glue.c
+3-2arch/x86/crypto/poly1305_glue.c
+3-2arch/arm64/crypto/poly1305-glue.c
+3-2arch/x86/crypto/chacha_glue.c
+3-2arch/arm64/crypto/chacha-neon-glue.c
+2-2drivers/crypto/hisilicon/sec2/sec_crypto.c
+1-0drivers/crypto/Kconfig
+56-3413 files

UnifiedSplitRaw