Commit bbce2ad2 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:
 "Here is the crypto update for 4.8:

  API:
   - first part of skcipher low-level conversions
   - add KPP (Key-agreement Protocol Primitives) interface.

  Algorithms:
   - fix IPsec/cryptd reordering issues that affects aesni
   - RSA no longer does explicit leading zero removal
   - add SHA3
   - add DH
   - add ECDH
   - improve DRBG performance by not doing CTR by hand

  Drivers:
   - add x86 AVX2 multibuffer SHA256/512
   - add POWER8 optimised crc32c
   - add xts support to vmx
   - add DH support to qat
   - add RSA support to caam
   - add Layerscape support to caam
   - add SEC1 AEAD support to talitos
   - improve performance by chaining requests in marvell/cesa
   - add support for Araneus Alea I USB RNG
   - add support for Broadcom BCM5301 RNG
   - add support for Amlogic Meson RNG
   - add support Broadcom NSP SoC RNG"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (180 commits)
  crypto: vmx - Fix aes_p8_xts_decrypt build failure
  crypto: vmx - Ignore generated files
  crypto: vmx - Adding support for XTS
  crypto: vmx - Adding asm subroutines for XTS
  crypto: skcipher - add comment for skcipher_alg->base
  crypto: testmgr - Print akcipher algorithm name
  crypto: marvell - Fix wrong flag used for GFP in mv_cesa_dma_add_iv_op
  crypto: nx - off by one bug in nx_of_update_msc()
  crypto: rsa-pkcs1pad - fix rsa-pkcs1pad request struct
  crypto: scatterwalk - Inline start/map/done
  crypto: scatterwalk - Remove unnecessary BUG in scatterwalk_start
  crypto: scatterwalk - Remove unnecessary advance in scatterwalk_pagedone
  crypto: scatterwalk - Fix test in scatterwalk_done
  crypto: api - Optimise away crypto_yield when hard preemption is on
  crypto: scatterwalk - add no-copy support to copychunks
  crypto: scatterwalk - Remove scatterwalk_bytes_sglen
  crypto: omap - Stop using crypto scatterwalk_bytes_sglen
  crypto: skcipher - Remove top-level givcipher interface
  crypto: user - Remove crypto_lookup_skcipher call
  crypto: cts - Convert to skcipher
  ...
parents 0f776dc3 0f95e2ff

Documentation/DocBook/crypto-API.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -440,8 +440,8 @@ 
     The type flag specifies the type of the cipher algorithm.

     The caller usually provides a 0 when the caller wants the

     default handling. Otherwise, the caller may provide the

     following selections which match the the aforementioned

     cipher types:

     following selections which match the aforementioned cipher

     types:

    </para>



    <itemizedlist>

Documentation/crypto/asymmetric-keys.txt

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ the criterion string: 
Looking in /proc/keys, the last 8 hex digits of the key fingerprint are

displayed, along with the subtype:



	1a39e171 I-----     1 perm 3f010000     0     0 asymmetri modsign.0: DSA 5acc2142 []

	1a39e171 I-----     1 perm 3f010000     0     0 asymmetric modsign.0: DSA 5acc2142 []





=========================

Documentation/devicetree/bindings/rng/brcm,bcm2835.txt

+7 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ BCM2835 Random number generator 


Required properties:



- compatible : should be "brcm,bcm2835-rng"

- compatible : should be "brcm,bcm2835-rng"  or "brcm,bcm-nsp-rng" or

  "brcm,bcm5301x-rng"

- reg : Specifies base physical address and size of the registers.



Example:
@@ -11,3 +12,8 @@ rng { 
        compatible = "brcm,bcm2835-rng";

        reg = <0x7e104000 0x10>;

};



rng@18033000 {

	compatible = "brcm,bcm-nsp-rng";

	reg = <0x18033000 0x14>;

};

MAINTAINERS

+4 −1
Original line number Diff line number Diff line
@@ -3286,6 +3286,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git

S:	Maintained

F:	Documentation/crypto/

F:	Documentation/devicetree/bindings/crypto/

F:	Documentation/DocBook/crypto-API.tmpl

F:	arch/*/crypto/

F:	crypto/
@@ -5273,6 +5274,7 @@ M: Matt Mackall <mpm@selenic.com> 
M:	Herbert Xu <herbert@gondor.apana.org.au>

L:	linux-crypto@vger.kernel.org

S:	Odd fixes

F:	Documentation/devicetree/bindings/rng/

F:	Documentation/hw_random.txt

F:	drivers/char/hw_random/

F:	include/linux/hw_random.h
@@ -9318,7 +9320,8 @@ L: rtc-linux@googlegroups.com 
S:	Maintained



QAT DRIVER

M:	Tadeusz Struk <tadeusz.struk@intel.com>

M:	Giovanni Cabiddu <giovanni.cabiddu@intel.com>

M:	Salvatore Benedetto <salvatore.benedetto@intel.com>

L:	qat-linux@intel.com

S:	Supported

F:	drivers/crypto/qat/

arch/arm/boot/dts/bcm-nsp.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -206,6 +206,11 @@ 
			brcm,nand-has-wp;

		};



		rng: rng@33000 {

			compatible = "brcm,bcm-nsp-rng";

			reg = <0x33000 0x14>;

		};



		ccbtimer0: timer@34000 {

			compatible = "arm,sp804";

			reg = <0x34000 0x1000>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE