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

Commit 48467641 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

parents 3863e724 d70063c4

Documentation/crypto/api-intro.txt

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ CAST5 algorithm contributors: 


TEA/XTEA algorithm contributors:

  Aaron Grothe

  Michael Ringe



Khazad algorithm contributors:

  Aaron Grothe

crypto/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ config CRYPTO_CAST6 
	  described in RFC2612.



config CRYPTO_TEA

	tristate "TEA and XTEA cipher algorithms"

	tristate "TEA, XTEA and XETA cipher algorithms"

	depends on CRYPTO

	help

	  TEA cipher algorithm.
@@ -232,6 +232,9 @@ config CRYPTO_TEA 
	  the TEA algorithm to address a potential key weakness

	  in the TEA algorithm.



	  Xtendend Encryption Tiny Algorithm is a mis-implementation 

	  of the XTEA algorithm for compatibility purposes.



config CRYPTO_ARC4

	tristate "ARC4 cipher algorithm"

	depends on CRYPTO

crypto/api.c

+2 −1
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ static inline struct crypto_alg *crypto_alg_mod_lookup(const char *name) 


static int crypto_init_flags(struct crypto_tfm *tfm, u32 flags)

{

	tfm->crt_flags = 0;

	tfm->crt_flags = flags & CRYPTO_TFM_REQ_MASK;

	flags &= ~CRYPTO_TFM_REQ_MASK;

	

	switch (crypto_tfm_alg_type(tfm)) {

	case CRYPTO_ALG_TYPE_CIPHER:

crypto/cipher.c

+0 −4
Original line number Diff line number Diff line
@@ -377,11 +377,7 @@ static int nocrypt_iv(struct crypto_tfm *tfm, 
int crypto_init_cipher_flags(struct crypto_tfm *tfm, u32 flags)

{

	u32 mode = flags & CRYPTO_TFM_MODE_MASK;

	

	tfm->crt_cipher.cit_mode = mode ? mode : CRYPTO_TFM_MODE_ECB;

	if (flags & CRYPTO_TFM_REQ_WEAK_KEY)

		tfm->crt_flags = CRYPTO_TFM_REQ_WEAK_KEY;

	

	return 0;

}

crypto/internal.h

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/interrupt.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/slab.h>

#include <asm/kmap_types.h>



extern enum km_type crypto_km_types[];
@@ -38,7 +39,7 @@ static inline void crypto_kunmap(void *vaddr, int out) 


static inline void crypto_yield(struct crypto_tfm *tfm)

{

	if (!in_atomic())

	if (tfm->crt_flags & CRYPTO_TFM_REQ_MAY_SLEEP)

		cond_resched();

}