Commit 28eb177d authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master' into upstream 

Conflicts:

	net/ieee80211/ieee80211_crypt_tkip.c
	net/ieee80211/ieee80211_crypt_wep.c
parents fd8ae94e db392219

Documentation/crypto/api-intro.txt

+22 −14
Original line number Original line Diff line number Diff line
@@ -19,15 +19,14 @@ At the lowest level are algorithms, which register dynamically with the 
API.

API.





'Transforms' are user-instantiated objects, which maintain state, handle all

'Transforms' are user-instantiated objects, which maintain state, handle all

of the implementation logic (e.g. manipulating page vectors), provide an 

of the implementation logic (e.g. manipulating page vectors) and provide an 

abstraction to the underlying algorithms, and handle common logical 

abstraction to the underlying algorithms.  However, at the user 

operations (e.g. cipher modes, HMAC for digests).  However, at the user 

level they are very simple.

level they are very simple.





Conceptually, the API layering looks like this:

Conceptually, the API layering looks like this:





  [transform api]  (user interface)

  [transform api]  (user interface)

  [transform ops]  (per-type logic glue e.g. cipher.c, digest.c)

  [transform ops]  (per-type logic glue e.g. cipher.c, compress.c)

  [algorithm api]  (for registering algorithms)

  [algorithm api]  (for registering algorithms)

  

  

The idea is to make the user interface and algorithm registration API

The idea is to make the user interface and algorithm registration API
@@ -44,22 +43,27 @@ under development. 
Here's an example of how to use the API:

Here's an example of how to use the API:





	#include <linux/crypto.h>

	#include <linux/crypto.h>

	#include <linux/err.h>

	#include <linux/scatterlist.h>

	

	

	struct scatterlist sg[2];

	struct scatterlist sg[2];

	char result[128];

	char result[128];

	struct crypto_tfm *tfm;

	struct crypto_hash *tfm;

	struct hash_desc desc;

	

	

	tfm = crypto_alloc_tfm("md5", 0);

	tfm = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC);

	if (tfm == NULL)

	if (IS_ERR(tfm))

		fail();

		fail();

		

		

	/* ... set up the scatterlists ... */

	/* ... set up the scatterlists ... */





	crypto_digest_init(tfm);

	desc.tfm = tfm;

	crypto_digest_update(tfm, &sg, 2);

	desc.flags = 0;

	crypto_digest_final(tfm, result);

	

	

	crypto_free_tfm(tfm);

	if (crypto_hash_digest(&desc, &sg, 2, result))

		fail();

	

	crypto_free_hash(tfm);





    

    

Many real examples are available in the regression test module (tcrypt.c).

Many real examples are available in the regression test module (tcrypt.c).
@@ -126,7 +130,7 @@ might already be working on. 
BUGS

BUGS





Send bug reports to:

Send bug reports to:

James Morris <jmorris@redhat.com>

Herbert Xu <herbert@gondor.apana.org.au>

Cc: David S. Miller <davem@redhat.com>

Cc: David S. Miller <davem@redhat.com>
@@ -134,13 +138,14 @@ FURTHER INFORMATION 




For further patches and various updates, including the current TODO

For further patches and various updates, including the current TODO

list, see:

list, see:

http://samba.org/~jamesm/crypto/

http://gondor.apana.org.au/~herbert/crypto/









AUTHORS

AUTHORS





James Morris

James Morris

David S. Miller

David S. Miller

Herbert Xu









CREDITS

CREDITS
@@ -238,8 +243,11 @@ Anubis algorithm contributors: 
Tiger algorithm contributors:

Tiger algorithm contributors:

  Aaron Grothe

  Aaron Grothe





VIA PadLock contributors:

  Michal Ludvig



Generic scatterwalk code by Adam J. Richter <adam@yggdrasil.com>

Generic scatterwalk code by Adam J. Richter <adam@yggdrasil.com>





Please send any credits updates or corrections to:

Please send any credits updates or corrections to:

James Morris <jmorris@redhat.com>

Herbert Xu <herbert@gondor.apana.org.au>

MAINTAINERS

+25 −0
Original line number Original line Diff line number Diff line
@@ -298,6 +298,14 @@ L: info-linux@geode.amd.com 
W:	http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html

W:	http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html

S:	Supported

S:	Supported





AMSO1100 RNIC DRIVER

P:	Tom Tucker

M:	tom@opengridcomputing.com

P:	Steve Wise

M:	swise@opengridcomputing.com

L:	openib-general@openib.org

S:	Maintained



AOA (Apple Onboard Audio) ALSA DRIVER

AOA (Apple Onboard Audio) ALSA DRIVER

P:	Johannes Berg

P:	Johannes Berg

M:	johannes@sipsolutions.net

M:	johannes@sipsolutions.net
@@ -991,6 +999,14 @@ EFS FILESYSTEM 
W:	http://aeschi.ch.eu.org/efs/

W:	http://aeschi.ch.eu.org/efs/

S:	Orphan

S:	Orphan





EHCA (IBM GX bus InfiniBand adapter) DRIVER:

P:	Hoang-Nam Nguyen

M:	hnguyen@de.ibm.com

P:	Christoph Raisch

M:	raisch@de.ibm.com

L:	openib-general@openib.org

S:	Supported



EMU10K1 SOUND DRIVER

EMU10K1 SOUND DRIVER

P:	James Courtier-Dutton

P:	James Courtier-Dutton

M:	James@superbug.demon.co.uk

M:	James@superbug.demon.co.uk
@@ -1783,6 +1799,13 @@ W: http://www.penguinppc.org/ 
L:     linuxppc-embedded@ozlabs.org

L:     linuxppc-embedded@ozlabs.org

S:     Maintained

S:     Maintained





LINUX FOR POWERPC PA SEMI PWRFICIENT

P:	Olof Johansson

M:	olof@lixom.net

W:	http://www.pasemi.com/

L:	linuxppc-dev@ozlabs.org

S:	Supported



LLC (802.2)

LLC (802.2)

P:	Arnaldo Carvalho de Melo

P:	Arnaldo Carvalho de Melo

M:	acme@conectiva.com.br

M:	acme@conectiva.com.br
@@ -2451,6 +2474,8 @@ S: Maintained 
S390

S390

P:	Martin Schwidefsky

P:	Martin Schwidefsky

M:	schwidefsky@de.ibm.com

M:	schwidefsky@de.ibm.com

P:	Heiko Carstens

M:	heiko.carstens@de.ibm.com

M:	linux390@de.ibm.com

M:	linux390@de.ibm.com

L:	linux-390@vm.marist.edu

L:	linux-390@vm.marist.edu

W:	http://www.ibm.com/developerworks/linux/linux390/

W:	http://www.ibm.com/developerworks/linux/linux390/

arch/i386/crypto/Makefile

+3 −0
Original line number Original line Diff line number Diff line
@@ -5,5 +5,8 @@ 
# 

# 





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

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

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





aes-i586-y := aes-i586-asm.o aes.o

aes-i586-y := aes-i586-asm.o aes.o

twofish-i586-y := twofish-i586-asm.o twofish.o

arch/i386/crypto/aes.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -379,12 +379,13 @@ static void gen_tabs(void) 
}

}





static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,

static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,

		       unsigned int key_len, u32 *flags)

		       unsigned int key_len)

{

{

	int i;

	int i;

	u32 ss[8];

	u32 ss[8];

	struct aes_ctx *ctx = crypto_tfm_ctx(tfm);

	struct aes_ctx *ctx = crypto_tfm_ctx(tfm);

	const __le32 *key = (const __le32 *)in_key;

	const __le32 *key = (const __le32 *)in_key;

	u32 *flags = &tfm->crt_flags;





	/* encryption schedule */

	/* encryption schedule */

arch/i386/crypto/twofish-i586-asm.S

0 → 100644
+335 −0
Original line number Original line Diff line number Diff line 
/***************************************************************************

*   Copyright (C) 2006 by Joachim Fritschi, <jfritschi@freenet.de>        *

*                                                                         *

*   This program is free software; you can redistribute it and/or modify  *

*   it under the terms of the GNU General Public License as published by  *

*   the Free Software Foundation; either version 2 of the License, or     *

*   (at your option) any later version.                                   *

*                                                                         *

*   This program is distributed in the hope that it will be useful,       *

*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *

*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *

*   GNU General Public License for more details.                          *

*                                                                         *

*   You should have received a copy of the GNU General Public License     *

*   along with this program; if not, write to the                         *

*   Free Software Foundation, Inc.,                                       *

*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *

***************************************************************************/



.file "twofish-i586-asm.S"

.text



#include <asm/asm-offsets.h>



/* return adress at 0 */



#define in_blk    12  /* input byte array address parameter*/

#define out_blk   8  /* output byte array address parameter*/

#define tfm       4  /* Twofish context structure */



#define a_offset	0

#define b_offset	4

#define c_offset	8

#define d_offset	12



/* Structure of the crypto context struct*/



#define s0	0	/* S0 Array 256 Words each */

#define s1	1024	/* S1 Array */

#define s2	2048	/* S2 Array */

#define s3	3072	/* S3 Array */

#define w	4096	/* 8 whitening keys (word) */

#define k	4128	/* key 1-32 ( word ) */



/* define a few register aliases to allow macro substitution */



#define R0D    %eax

#define R0B    %al

#define R0H    %ah



#define R1D    %ebx

#define R1B    %bl

#define R1H    %bh



#define R2D    %ecx

#define R2B    %cl

#define R2H    %ch



#define R3D    %edx

#define R3B    %dl

#define R3H    %dh





/* performs input whitening */

#define input_whitening(src,context,offset)\

	xor	w+offset(context),	src;



/* performs input whitening */

#define output_whitening(src,context,offset)\

	xor	w+16+offset(context),	src;



/*

 * a input register containing a (rotated 16)

 * b input register containing b

 * c input register containing c

 * d input register containing d (already rol $1)

 * operations on a and b are interleaved to increase performance

 */

#define encrypt_round(a,b,c,d,round)\

	push	d ## D;\

	movzx	b ## B,		%edi;\

	mov	s1(%ebp,%edi,4),d ## D;\

	movzx	a ## B,		%edi;\

	mov	s2(%ebp,%edi,4),%esi;\

	movzx	b ## H,		%edi;\

	ror	$16,		b ## D;\

	xor	s2(%ebp,%edi,4),d ## D;\

	movzx	a ## H,		%edi;\

	ror	$16,		a ## D;\

	xor	s3(%ebp,%edi,4),%esi;\

	movzx	b ## B,		%edi;\

	xor	s3(%ebp,%edi,4),d ## D;\

	movzx	a ## B,		%edi;\

	xor	(%ebp,%edi,4),	%esi;\

	movzx	b ## H,		%edi;\

	ror	$15,		b ## D;\

	xor	(%ebp,%edi,4),	d ## D;\

	movzx	a ## H,		%edi;\

	xor	s1(%ebp,%edi,4),%esi;\

	pop	%edi;\

	add	d ## D,		%esi;\

	add	%esi,		d ## D;\

	add	k+round(%ebp),	%esi;\

	xor	%esi,		c ## D;\

	rol	$15,		c ## D;\

	add	k+4+round(%ebp),d ## D;\

	xor	%edi,		d ## D;



/*

 * a input register containing a (rotated 16)

 * b input register containing b

 * c input register containing c

 * d input register containing d (already rol $1)

 * operations on a and b are interleaved to increase performance

 * last round has different rotations for the output preparation

 */

#define encrypt_last_round(a,b,c,d,round)\

	push	d ## D;\

	movzx	b ## B,		%edi;\

	mov	s1(%ebp,%edi,4),d ## D;\

	movzx	a ## B,		%edi;\

	mov	s2(%ebp,%edi,4),%esi;\

	movzx	b ## H,		%edi;\

	ror	$16,		b ## D;\

	xor	s2(%ebp,%edi,4),d ## D;\

	movzx	a ## H,		%edi;\

	ror	$16,		a ## D;\

	xor	s3(%ebp,%edi,4),%esi;\

	movzx	b ## B,		%edi;\

	xor	s3(%ebp,%edi,4),d ## D;\

	movzx	a ## B,		%edi;\

	xor	(%ebp,%edi,4),	%esi;\

	movzx	b ## H,		%edi;\

	ror	$16,		b ## D;\

	xor	(%ebp,%edi,4),	d ## D;\

	movzx	a ## H,		%edi;\

	xor	s1(%ebp,%edi,4),%esi;\

	pop	%edi;\

	add	d ## D,		%esi;\

	add	%esi,		d ## D;\

	add	k+round(%ebp),	%esi;\

	xor	%esi,		c ## D;\

	ror	$1,		c ## D;\

	add	k+4+round(%ebp),d ## D;\

	xor	%edi,		d ## D;



/*

 * a input register containing a

 * b input register containing b (rotated 16)

 * c input register containing c

 * d input register containing d (already rol $1)

 * operations on a and b are interleaved to increase performance

 */

#define decrypt_round(a,b,c,d,round)\

	push	c ## D;\

	movzx	a ## B,		%edi;\

	mov	(%ebp,%edi,4),	c ## D;\

	movzx	b ## B,		%edi;\

	mov	s3(%ebp,%edi,4),%esi;\

	movzx	a ## H,		%edi;\

	ror	$16,		a ## D;\

	xor	s1(%ebp,%edi,4),c ## D;\

	movzx	b ## H,		%edi;\

	ror	$16,		b ## D;\

	xor	(%ebp,%edi,4),	%esi;\

	movzx	a ## B,		%edi;\

	xor	s2(%ebp,%edi,4),c ## D;\

	movzx	b ## B,		%edi;\

	xor	s1(%ebp,%edi,4),%esi;\

	movzx	a ## H,		%edi;\

	ror	$15,		a ## D;\

	xor	s3(%ebp,%edi,4),c ## D;\

	movzx	b ## H,		%edi;\

	xor	s2(%ebp,%edi,4),%esi;\

	pop	%edi;\

	add	%esi,		c ## D;\

	add	c ## D,		%esi;\

	add	k+round(%ebp),	c ## D;\

	xor	%edi,		c ## D;\

	add	k+4+round(%ebp),%esi;\

	xor	%esi,		d ## D;\

	rol	$15,		d ## D;



/*

 * a input register containing a

 * b input register containing b (rotated 16)

 * c input register containing c

 * d input register containing d (already rol $1)

 * operations on a and b are interleaved to increase performance

 * last round has different rotations for the output preparation

 */

#define decrypt_last_round(a,b,c,d,round)\

	push	c ## D;\

	movzx	a ## B,		%edi;\

	mov	(%ebp,%edi,4),	c ## D;\

	movzx	b ## B,		%edi;\

	mov	s3(%ebp,%edi,4),%esi;\

	movzx	a ## H,		%edi;\

	ror	$16,		a ## D;\

	xor	s1(%ebp,%edi,4),c ## D;\

	movzx	b ## H,		%edi;\

	ror	$16,		b ## D;\

	xor	(%ebp,%edi,4),	%esi;\

	movzx	a ## B,		%edi;\

	xor	s2(%ebp,%edi,4),c ## D;\

	movzx	b ## B,		%edi;\

	xor	s1(%ebp,%edi,4),%esi;\

	movzx	a ## H,		%edi;\

	ror	$16,		a ## D;\

	xor	s3(%ebp,%edi,4),c ## D;\

	movzx	b ## H,		%edi;\

	xor	s2(%ebp,%edi,4),%esi;\

	pop	%edi;\

	add	%esi,		c ## D;\

	add	c ## D,		%esi;\

	add	k+round(%ebp),	c ## D;\

	xor	%edi,		c ## D;\

	add	k+4+round(%ebp),%esi;\

	xor	%esi,		d ## D;\

	ror	$1,		d ## D;



.align 4

.global twofish_enc_blk

.global twofish_dec_blk



twofish_enc_blk:

	push	%ebp			/* save registers according to calling convention*/

	push    %ebx

	push    %esi

	push    %edi



	mov	tfm + 16(%esp),	%ebp	/* abuse the base pointer: set new base bointer to the crypto tfm */

	add	$crypto_tfm_ctx_offset, %ebp	/* ctx adress */

	mov     in_blk+16(%esp),%edi	/* input adress in edi */



	mov	(%edi),		%eax

	mov	b_offset(%edi),	%ebx

	mov	c_offset(%edi),	%ecx

	mov	d_offset(%edi),	%edx

	input_whitening(%eax,%ebp,a_offset)

	ror	$16,	%eax

	input_whitening(%ebx,%ebp,b_offset)

	input_whitening(%ecx,%ebp,c_offset)

	input_whitening(%edx,%ebp,d_offset)

	rol	$1,	%edx



	encrypt_round(R0,R1,R2,R3,0);

	encrypt_round(R2,R3,R0,R1,8);

	encrypt_round(R0,R1,R2,R3,2*8);

	encrypt_round(R2,R3,R0,R1,3*8);

	encrypt_round(R0,R1,R2,R3,4*8);

	encrypt_round(R2,R3,R0,R1,5*8);

	encrypt_round(R0,R1,R2,R3,6*8);

	encrypt_round(R2,R3,R0,R1,7*8);

	encrypt_round(R0,R1,R2,R3,8*8);

	encrypt_round(R2,R3,R0,R1,9*8);

	encrypt_round(R0,R1,R2,R3,10*8);

	encrypt_round(R2,R3,R0,R1,11*8);

	encrypt_round(R0,R1,R2,R3,12*8);

	encrypt_round(R2,R3,R0,R1,13*8);

	encrypt_round(R0,R1,R2,R3,14*8);

	encrypt_last_round(R2,R3,R0,R1,15*8);



	output_whitening(%eax,%ebp,c_offset)

	output_whitening(%ebx,%ebp,d_offset)

	output_whitening(%ecx,%ebp,a_offset)

	output_whitening(%edx,%ebp,b_offset)

	mov	out_blk+16(%esp),%edi;

	mov	%eax,		c_offset(%edi)

	mov	%ebx,		d_offset(%edi)

	mov	%ecx,		(%edi)

	mov	%edx,		b_offset(%edi)



	pop	%edi

	pop	%esi

	pop	%ebx

	pop	%ebp

	mov	$1,	%eax

	ret



twofish_dec_blk:

	push	%ebp			/* save registers according to calling convention*/

	push    %ebx

	push    %esi

	push    %edi





	mov	tfm + 16(%esp),	%ebp	/* abuse the base pointer: set new base bointer to the crypto tfm */

	add	$crypto_tfm_ctx_offset, %ebp	/* ctx adress */

	mov     in_blk+16(%esp),%edi	/* input adress in edi */



	mov	(%edi),		%eax

	mov	b_offset(%edi),	%ebx

	mov	c_offset(%edi),	%ecx

	mov	d_offset(%edi),	%edx

	output_whitening(%eax,%ebp,a_offset)

	output_whitening(%ebx,%ebp,b_offset)

	ror	$16,	%ebx

	output_whitening(%ecx,%ebp,c_offset)

	output_whitening(%edx,%ebp,d_offset)

	rol	$1,	%ecx



	decrypt_round(R0,R1,R2,R3,15*8);

	decrypt_round(R2,R3,R0,R1,14*8);

	decrypt_round(R0,R1,R2,R3,13*8);

	decrypt_round(R2,R3,R0,R1,12*8);

	decrypt_round(R0,R1,R2,R3,11*8);

	decrypt_round(R2,R3,R0,R1,10*8);

	decrypt_round(R0,R1,R2,R3,9*8);

	decrypt_round(R2,R3,R0,R1,8*8);

	decrypt_round(R0,R1,R2,R3,7*8);

	decrypt_round(R2,R3,R0,R1,6*8);

	decrypt_round(R0,R1,R2,R3,5*8);

	decrypt_round(R2,R3,R0,R1,4*8);

	decrypt_round(R0,R1,R2,R3,3*8);

	decrypt_round(R2,R3,R0,R1,2*8);

	decrypt_round(R0,R1,R2,R3,1*8);

	decrypt_last_round(R2,R3,R0,R1,0);



	input_whitening(%eax,%ebp,c_offset)

	input_whitening(%ebx,%ebp,d_offset)

	input_whitening(%ecx,%ebp,a_offset)

	input_whitening(%edx,%ebp,b_offset)

	mov	out_blk+16(%esp),%edi;

	mov	%eax,		c_offset(%edi)

	mov	%ebx,		d_offset(%edi)

	mov	%ecx,		(%edi)

	mov	%edx,		b_offset(%edi)



	pop	%edi

	pop	%esi

	pop	%ebx

	pop	%ebp

	mov	$1,	%eax

	ret