[GIT,PULL] Crypto Fixes for 5.5
mbox series

Message ID 20191202062017.ge4rz72ki3vczhgb@gondor.apana.org.au
State Accepted
Commit 483847a70262f7361f8a6f78513c985c2c8b1719
Headers show
Series
  • [GIT,PULL] Crypto Fixes for 5.5
Related show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git linus

Message

Herbert Xu Dec. 2, 2019, 6:20 a.m. UTC
Hi Linus:

This push fixes the following issues:

- 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.

The following changes since commit 4ee812f6143d78d8ba1399671d78c8d78bf2817c:

  crypto: vmx - Avoid weird build failures (2019-11-22 18:48:39 +0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git linus

for you to fetch changes up to 8a6b8f4d7a891ac66db4f97900a86b55c84a5802:

  crypto: hisilicon - fix a NULL vs IS_ERR() bug in sec_create_qp_ctx() (2019-11-27 13:08:50 +0800)

----------------------------------------------------------------
Dan Carpenter (1):
      crypto: hisilicon - fix a NULL vs IS_ERR() bug in sec_create_qp_ctx()

Herbert Xu (1):
      crypto: talitos - Fix build error by selecting LIB_DES

Jason A. Donenfeld (1):
      crypto: arch - conditionalize crypto api in arch glue for lib code

 arch/arm/crypto/chacha-glue.c              | 26 ++++++++++++++++----------
 arch/arm/crypto/curve25519-glue.c          |  5 +++--
 arch/arm/crypto/poly1305-glue.c            |  9 ++++++---
 arch/arm64/crypto/chacha-neon-glue.c       |  5 +++--
 arch/arm64/crypto/poly1305-glue.c          |  5 +++--
 arch/mips/crypto/chacha-glue.c             |  6 ++++--
 arch/mips/crypto/poly1305-glue.c           |  6 ++++--
 arch/x86/crypto/blake2s-glue.c             |  6 ++++--
 arch/x86/crypto/chacha_glue.c              |  5 +++--
 arch/x86/crypto/curve25519-x86_64.c        |  7 ++++---
 arch/x86/crypto/poly1305_glue.c            |  5 +++--
 drivers/crypto/Kconfig                     |  1 +
 drivers/crypto/hisilicon/sec2/sec_crypto.c |  4 ++--
 13 files changed, 56 insertions(+), 34 deletions(-)

Thanks,

Comments

pr-tracker-bot@kernel.org Dec. 3, 2019, 1:30 a.m. UTC | #1
The pull request you sent on Mon, 2 Dec 2019 14:20:17 +0800:

> git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git linus

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/483847a70262f7361f8a6f78513c985c2c8b1719

Thank you!