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

Commit 974e4b75 authored by Tan Swee Heng's avatar Tan Swee Heng Committed by Herbert Xu
Browse files

[CRYPTO] salsa20_i586: Salsa20 stream cipher algorithm (i586 version) 

This patch contains the salsa20-i586 implementation. The original
assembly code came from
<http://cr.yp.to/snuffle/salsa20/x86-pm/salsa20.s

>. I have reformatted
it (added indents) so that it matches the other algorithms in
arch/x86/crypto.

Signed-off-by: default avatarTan Swee Heng <thesweeheng@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent dadbc53d

arch/x86/crypto/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -4,12 +4,14 @@ 


obj-$(CONFIG_CRYPTO_AES_586) += aes-i586.o

obj-$(CONFIG_CRYPTO_TWOFISH_586) += twofish-i586.o

obj-$(CONFIG_CRYPTO_SALSA20_586) += salsa20-i586.o



obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o

obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.o



aes-i586-y := aes-i586-asm_32.o aes_glue.o

twofish-i586-y := twofish-i586-asm_32.o twofish_32.o

salsa20-i586-y := salsa20-i586-asm_32.o salsa20_glue.o



aes-x86_64-y := aes-x86_64-asm_64.o aes_glue.o

twofish-x86_64-y := twofish-x86_64-asm_64.o twofish_64.o

arch/x86/crypto/salsa20-i586-asm_32.S

0 → 100644
+1114 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/x86/crypto/salsa20_glue.c

0 → 100644
+127 −0

File added.

Preview size limit exceeded, changes collapsed.

crypto/Kconfig

+15 −0
Original line number Diff line number Diff line
@@ -489,6 +489,21 @@ config CRYPTO_SALSA20 
	  The Salsa20 stream cipher algorithm is designed by Daniel J.

	  Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html>



config CRYPTO_SALSA20_586

	tristate "Salsa20 stream cipher algorithm (i586) (EXPERIMENTAL)"

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

	depends on EXPERIMENTAL

	select CRYPTO_BLKCIPHER

	select CRYPTO_SALSA20

	help

	  Salsa20 stream cipher algorithm.



	  Salsa20 is a stream cipher submitted to eSTREAM, the ECRYPT

	  Stream Cipher Project. See <http://www.ecrypt.eu.org/stream/>



	  The Salsa20 stream cipher algorithm is designed by Daniel J.

	  Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html>



config CRYPTO_DEFLATE

	tristate "Deflate compression algorithm"

	select CRYPTO_ALGAPI