Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e1a29b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto updates from Herbert Xu:
 "API:

   - Decryption test vectors are now automatically generated from
     encryption test vectors.

  Algorithms:

   - Fix unaligned access issues in crc32/crc32c.

   - Add zstd compression algorithm.

   - Add AEGIS.

   - Add MORUS.

  Drivers:

   - Add accelerated AEGIS/MORUS on x86.

   - Add accelerated SM4 on arm64.

   - Removed x86 assembly salsa implementation as it is slower than C.

   - Add authenc(hmac(sha*), cbc(aes)) support in inside-secure.

   - Add ctr(aes) support in crypto4xx.

   - Add hardware key support in ccree.

   - Add support for new Centaur CPU in via-rng"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (112 commits)
  crypto: chtls - free beyond end rspq_skb_cache
  crypto: chtls - kbuild warnings
  crypto: chtls - dereference null variable
  crypto: chtls - wait for memory sendmsg, sendpage
  crypto: chtls - key len correction
  crypto: salsa20 - Revert "crypto: salsa20 - export generic helpers"
  crypto: x86/salsa20 - remove x86 salsa20 implementations
  crypto: ccp - Add GET_ID SEV command
  crypto: ccp - Add DOWNLOAD_FIRMWARE SEV command
  crypto: qat - Add MODULE_FIRMWARE for all qat drivers
  crypto: ccree - silence debug prints
  crypto: ccree - better clock handling
  crypto: ccree - correct host regs offset
  crypto: chelsio - Remove separate buffer used for DMA map B0 block in CCM
  crypt: chelsio - Send IV as Immediate for cipher algo
  crypto: chelsio - Return -ENOSPC for transient busy indication.
  crypto: caam/qi - fix warning in init_cgr()
  crypto: caam - fix rfc4543 descriptors
  crypto: caam - fix MC firmware detection
  crypto: clarify licensing of OpenSSL asm code
  ...
parents fd59ccc5 b268b350

arch/arm/crypto/sha1-armv4-large.S

+10 −0
Original line number Diff line number Diff line 
#define __ARM_ARCH__ __LINUX_ARM_ARCH__

@ SPDX-License-Identifier: GPL-2.0



@ This code is taken from the OpenSSL project but the author (Andy Polyakov)

@ has relicensed it under the GPLv2. Therefore this program is free software;

@ you can redistribute it and/or modify it under the terms of the GNU General

@ Public License version 2 as published by the Free Software Foundation.

@

@ The original headers, including the original license headers, are

@ included below for completeness.



@ ====================================================================

@ Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL

@ project. The module is, however, dual licensed under OpenSSL and

arch/arm/crypto/sha256-armv4.pl

+9 −2
Original line number Diff line number Diff line 
#!/usr/bin/env perl

# SPDX-License-Identifier: GPL-2.0



# This code is taken from the OpenSSL project but the author (Andy Polyakov)

# has relicensed it under the GPLv2. Therefore this program is free software;

# you can redistribute it and/or modify it under the terms of the GNU General

# Public License version 2 as published by the Free Software Foundation.

#

# The original headers, including the original license headers, are

# included below for completeness.



# ====================================================================

# Written by Andy Polyakov <appro@openssl.org> for the OpenSSL

# project. The module is, however, dual licensed under OpenSSL and

# CRYPTOGAMS licenses depending on where you obtain it. For further

# details see http://www.openssl.org/~appro/cryptogams/.

#

# Permission to use under GPL terms is granted.

# ====================================================================



# SHA256 block procedure for ARMv4. May 2007.

arch/arm/crypto/sha256-core.S_shipped

+9 −2
Original line number Diff line number Diff line 
@ SPDX-License-Identifier: GPL-2.0



@ This code is taken from the OpenSSL project but the author (Andy Polyakov)

@ has relicensed it under the GPLv2. Therefore this program is free software;

@ you can redistribute it and/or modify it under the terms of the GNU General

@ Public License version 2 as published by the Free Software Foundation.

@

@ The original headers, including the original license headers, are

@ included below for completeness.



@ ====================================================================

@ Written by Andy Polyakov <appro@openssl.org> for the OpenSSL

@ project. The module is, however, dual licensed under OpenSSL and

@ CRYPTOGAMS licenses depending on where you obtain it. For further

@ details see http://www.openssl.org/~appro/cryptogams/.

@

@ Permission to use under GPL terms is granted.

@ ====================================================================



@ SHA256 block procedure for ARMv4. May 2007.

arch/arm/crypto/sha512-armv4.pl

+9 −2
Original line number Diff line number Diff line 
#!/usr/bin/env perl

# SPDX-License-Identifier: GPL-2.0



# This code is taken from the OpenSSL project but the author (Andy Polyakov)

# has relicensed it under the GPLv2. Therefore this program is free software;

# you can redistribute it and/or modify it under the terms of the GNU General

# Public License version 2 as published by the Free Software Foundation.

#

# The original headers, including the original license headers, are

# included below for completeness.



# ====================================================================

# Written by Andy Polyakov <appro@openssl.org> for the OpenSSL

# project. The module is, however, dual licensed under OpenSSL and

# CRYPTOGAMS licenses depending on where you obtain it. For further

# details see http://www.openssl.org/~appro/cryptogams/.

#

# Permission to use under GPL terms is granted.

# ====================================================================



# SHA512 block procedure for ARMv4. September 2007.

arch/arm/crypto/sha512-core.S_shipped

+9 −2
Original line number Diff line number Diff line 
@ SPDX-License-Identifier: GPL-2.0



@ This code is taken from the OpenSSL project but the author (Andy Polyakov)

@ has relicensed it under the GPLv2. Therefore this program is free software;

@ you can redistribute it and/or modify it under the terms of the GNU General

@ Public License version 2 as published by the Free Software Foundation.

@

@ The original headers, including the original license headers, are

@ included below for completeness.



@ ====================================================================

@ Written by Andy Polyakov <appro@openssl.org> for the OpenSSL

@ project. The module is, however, dual licensed under OpenSSL and

@ CRYPTOGAMS licenses depending on where you obtain it. For further

@ details see http://www.openssl.org/~appro/cryptogams/.

@

@ Permission to use under GPL terms is granted.

@ ====================================================================



@ SHA512 block procedure for ARMv4. September 2007.