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

Commit 27d189c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (46 commits)
  hwrng: via_rng - Fix memory scribbling on some CPUs
  crypto: padlock - Move padlock.h into include/crypto
  hwrng: via_rng - Fix asm constraints
  crypto: n2 - use __devexit not __exit in n2_unregister_algs
  crypto: mark crypto workqueues CPU_INTENSIVE
  crypto: mv_cesa - dont return PTR_ERR() of wrong pointer
  crypto: ripemd - Set module author and update email address
  crypto: omap-sham - backlog handling fix
  crypto: gf128mul - Remove experimental tag
  crypto: af_alg - fix af_alg memory_allocated data type
  crypto: aesni-intel - Fixed build with binutils 2.16
  crypto: af_alg - Make sure sk_security is initialized on accept()ed sockets
  net: Add missing lockdep class names for af_alg
  include: Install linux/if_alg.h for user-space crypto API
  crypto: omap-aes - checkpatch --file warning fixes
  crypto: omap-aes - initialize aes module once per request
  crypto: omap-aes - unnecessary code removed
  crypto: omap-aes - error handling implementation improved
  crypto: omap-aes - redundant locking is removed
  crypto: omap-aes - DMA initialization fixes for OMAP off mode
  ...
parents a1703154 55db8387

arch/x86/crypto/aesni-intel_asm.S

+1802 −30

File changed.

Preview size limit exceeded, changes collapsed.

arch/x86/crypto/aesni-intel_glue.c

+533 −7

File changed.

Preview size limit exceeded, changes collapsed.

crypto/Kconfig

+28 −6
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ config CRYPTO_MANAGER_DISABLE_TESTS 


config CRYPTO_GF128MUL

	tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	help

	  Efficient table driven implementation of multiplications in the

	  field GF(2^128).  This is needed by some cypher modes. This
@@ -539,8 +538,9 @@ config CRYPTO_AES_X86_64 


config CRYPTO_AES_NI_INTEL

	tristate "AES cipher algorithms (AES-NI)"

	depends on (X86 || UML_X86) && 64BIT

	select CRYPTO_AES_X86_64

	depends on (X86 || UML_X86)

	select CRYPTO_AES_X86_64 if 64BIT

	select CRYPTO_AES_586 if !64BIT

	select CRYPTO_CRYPTD

	select CRYPTO_ALGAPI

	select CRYPTO_FPU
@@ -563,9 +563,10 @@ config CRYPTO_AES_NI_INTEL 


	  See <http://csrc.nist.gov/encryption/aes/> for more information.



	  In addition to AES cipher algorithm support, the

	  acceleration for some popular block cipher mode is supported

	  too, including ECB, CBC, CTR, LRW, PCBC, XTS.

	  In addition to AES cipher algorithm support, the acceleration

	  for some popular block cipher mode is supported too, including

	  ECB, CBC, LRW, PCBC, XTS. The 64 bit version has additional

	  acceleration for CTR.



config CRYPTO_ANUBIS

	tristate "Anubis cipher algorithm"
@@ -841,6 +842,27 @@ config CRYPTO_ANSI_CPRNG 
	  ANSI X9.31 A.2.4. Note that this option must be enabled if

	  CRYPTO_FIPS is selected



config CRYPTO_USER_API

	tristate



config CRYPTO_USER_API_HASH

	tristate "User-space interface for hash algorithms"

	depends on NET

	select CRYPTO_HASH

	select CRYPTO_USER_API

	help

	  This option enables the user-spaces interface for hash

	  algorithms.



config CRYPTO_USER_API_SKCIPHER

	tristate "User-space interface for symmetric key cipher algorithms"

	depends on NET

	select CRYPTO_BLKCIPHER

	select CRYPTO_USER_API

	help

	  This option enables the user-spaces interface for symmetric

	  key cipher algorithms.



source "drivers/crypto/Kconfig"



endif	# if CRYPTO

crypto/Makefile

+10 −7
Original line number Diff line number Diff line
@@ -3,32 +3,32 @@ 
#



obj-$(CONFIG_CRYPTO) += crypto.o

crypto-objs := api.o cipher.o compress.o

crypto-y := api.o cipher.o compress.o



obj-$(CONFIG_CRYPTO_WORKQUEUE) += crypto_wq.o



obj-$(CONFIG_CRYPTO_FIPS) += fips.o



crypto_algapi-$(CONFIG_PROC_FS) += proc.o

crypto_algapi-objs := algapi.o scatterwalk.o $(crypto_algapi-y)

crypto_algapi-y := algapi.o scatterwalk.o $(crypto_algapi-y)

obj-$(CONFIG_CRYPTO_ALGAPI2) += crypto_algapi.o



obj-$(CONFIG_CRYPTO_AEAD2) += aead.o



crypto_blkcipher-objs := ablkcipher.o

crypto_blkcipher-objs += blkcipher.o

crypto_blkcipher-y := ablkcipher.o

crypto_blkcipher-y += blkcipher.o

obj-$(CONFIG_CRYPTO_BLKCIPHER2) += crypto_blkcipher.o

obj-$(CONFIG_CRYPTO_BLKCIPHER2) += chainiv.o

obj-$(CONFIG_CRYPTO_BLKCIPHER2) += eseqiv.o

obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o



crypto_hash-objs += ahash.o

crypto_hash-objs += shash.o

crypto_hash-y += ahash.o

crypto_hash-y += shash.o

obj-$(CONFIG_CRYPTO_HASH2) += crypto_hash.o



obj-$(CONFIG_CRYPTO_PCOMP2) += pcompress.o



cryptomgr-objs := algboss.o testmgr.o

cryptomgr-y := algboss.o testmgr.o



obj-$(CONFIG_CRYPTO_MANAGER2) += cryptomgr.o

obj-$(CONFIG_CRYPTO_HMAC) += hmac.o
@@ -85,6 +85,9 @@ obj-$(CONFIG_CRYPTO_RNG2) += krng.o 
obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_cprng.o

obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o

obj-$(CONFIG_CRYPTO_GHASH) += ghash-generic.o

obj-$(CONFIG_CRYPTO_USER_API) += af_alg.o

obj-$(CONFIG_CRYPTO_USER_API_HASH) += algif_hash.o

obj-$(CONFIG_CRYPTO_USER_API_SKCIPHER) += algif_skcipher.o



#

# generic algorithms and the async_tx api

crypto/af_alg.c

0 → 100644
+483 −0

File added.

Preview size limit exceeded, changes collapsed.