linux-toradex.git/crypto, branch Colibri_T30_LinuxImageV2.1Beta2_20140206

Revert "crypto: testmgr: add support for aes ofb mode"

2012-03-16T03:29:37+00:00

This reverts commit 2afef0391f30a2831f8beed6a89351682c8a81f6.

Change-Id: Ieef8fd28ba78334a4a0a1b7c64ba6fd4d0f4cb05
Reviewed-on: http://git-master/r/90082
Reviewed-by: Mallikarjun Kasoju 
Tested-by: Mallikarjun Kasoju 
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Venkat Moganty

crypto: sha512 - reduce stack usage to safe number

2012-02-10T02:20:23+00:00

commit 51fc6dc8f948047364f7d42a4ed89b416c6cc0a3 upstream.

For rounds 16--79, W[i] only depends on W[i - 2], W[i - 7], W[i - 15] and W[i - 16].
Consequently, keeping all W[80] array on stack is unnecessary,
only 16 values are really needed.

Using W[16] instead of W[80] greatly reduces stack usage
(~750 bytes to ~340 bytes on x86_64).

Line by line explanation:
* BLEND_OP
  array is "circular" now, all indexes have to be modulo 16.
  Round number is positive, so remainder operation should be
  without surprises.

* initial full message scheduling is trimmed to first 16 values which
  come from data block, the rest is calculated before it's needed.

* original loop body is unrolled version of new SHA512_0_15 and
  SHA512_16_79 macros, unrolling was done to not do explicit variable
  renaming. Otherwise it's the very same code after preprocessing.
  See sha1_transform() code which does the same trick.

Patch survives in-tree crypto test and original bugreport test
(ping flood with hmac(sha512).

See FIPS 180-2 for SHA-512 definition
http://csrc.nist.gov/publications/fips/fips180-2/fips180-2withchangenotice.pdf

Signed-off-by: Alexey Dobriyan 
Signed-off-by: Herbert Xu 
Signed-off-by: Greg Kroah-Hartman 
Signed-off-by: Varun Wadekar 
Change-Id: I7945bdc928bd3491117ea5e334a0bc5dd6231299
Reviewed-on: http://git-master/r/79657

crypto: sha512 - make it work, undo percpu message schedule

2012-02-10T02:20:21+00:00

commit 84e31fdb7c797a7303e0cc295cb9bc8b73fb872d upstream.

commit f9e2bca6c22d75a289a349f869701214d63b5060
aka "crypto: sha512 - Move message schedule W[80] to static percpu area"
created global message schedule area.

If sha512_update will ever be entered twice, hash will be silently
calculated incorrectly.

Probably the easiest way to notice incorrect hashes being calculated is
to run 2 ping floods over AH with hmac(sha512):

#!/usr/sbin/setkey -f
flush;
spdflush;
add IP1 IP2 ah 25 -A hmac-sha512 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000025;
add IP2 IP1 ah 52 -A hmac-sha512 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000052;
spdadd IP1 IP2 any -P out ipsec ah/transport//require;
spdadd IP2 IP1 any -P in ipsec ah/transport//require;

XfrmInStateProtoError will start ticking with -EBADMSG being returned
from ah_input(). This never happens with, say, hmac(sha1).

With patch applied (on BOTH sides), XfrmInStateProtoError does not tick
with multiple bidirectional ping flood streams like it doesn't tick
with SHA-1.

After this patch sha512_transform() will start using ~750 bytes of stack on x86_64.
This is OK for simple loads, for something more heavy, stack reduction will be done
separatedly.

Signed-off-by: Alexey Dobriyan
Signed-off-by: Herbert Xu
Signed-off-by: Greg Kroah-Hartman
Signed-off-by: Varun Wadekar
Change-Id: I752dc16e90deb04b35202fddce818ace0b605e9d
Reviewed-on: http://git-master/r/79656

crypto: testmgr: add support for aes ofb mode

2011-12-08T12:32:04+00:00

the fix add testcase for testing aes ofb mode.

Signed-off-by: Puneet Saxena 
Signed-off-by: Herbert Xu 

Bug 787628

cherry picked the following commit
http://git.kernel.org/?p=linux/kernel/git/herbert/
cryptodev-2.6.git;a=commit;h=ba0e14acc417eceb895efda1ff46366f4d1728f8

Reviewed-on: http://git-master/r/30339
Reviewed-on: http://git-master/r/54441
(cherry picked from commit b6a86d94028d57884b85179a641a6275d6708c70)

Change-Id: I5bbd3e8a04f0281ff5c22ffcf7522ac3d4a31e30
Reviewed-on: http://git-master/r/68150
Tested-by: Puneet Saxena 
Reviewed-by: Varun Wadekar

crypto: testmgr - Adding ofb(aes) and cmac(aes) tests

2011-12-01T05:41:47+00:00

Added ofb(aes) and cmac(aes) tests

Original-Change-Id: Ia79b0f979af88d337e91164f0b8b6d0eba18cd03
Reviewed-on: http://git-master/r/34701
Reviewed-by: Mallikarjun Kasoju 
Tested-by: Mallikarjun Kasoju 
Reviewed-by: Hanumanth Venkateswa Moganty 

Rebase-Id: R383d7f642cab41350f54367687861615f9484cf3

crypto: cryptd - Use subsys_initcall to prevent races with aesni

2011-11-11T17:44:47+00:00

commit b2bac6acf86d05d8af0499f37d91ecac15722803 upstream.

As cryptd is depeneded on by other algorithms such as aesni-intel,
it needs to be registered before them.  When everything is built
as modules, this occurs naturally.  However, for this to work when
they are built-in, we need to use subsys_initcall in cryptd.

Tested-by: Josh Boyer 
Signed-off-by: Herbert Xu 
Cc: Kerin Millar 
Signed-off-by: Greg Kroah-Hartman

crypto: ghash - Avoid null pointer dereference if no key is set

2011-10-21T11:18:42+00:00

The ghash_update function passes a pointer to gf128mul_4k_lle which will
be NULL if ghash_setkey is not called or if the most recent call to
ghash_setkey failed to allocate memory.  This causes an oops.  Fix this
up by returning an error code in the null case.

This is trivially triggered from unprivileged userspace through the
AF_ALG interface by simply writing to the socket without setting a key.

The ghash_final function has a similar issue, but triggering it requires
a memory allocation failure in ghash_setkey _after_ at least one
successful call to ghash_update.

  BUG: unable to handle kernel NULL pointer dereference at 00000670
  IP: [] gf128mul_4k_lle+0x23/0x60 [gf128mul]
  *pde = 00000000
  Oops: 0000 [#1] PREEMPT SMP
  Modules linked in: ghash_generic gf128mul algif_hash af_alg nfs lockd nfs_acl sunrpc bridge ipv6 stp llc

  Pid: 1502, comm: hashatron Tainted: G        W   3.1.0-rc9-00085-ge9308cf #32 Bochs Bochs
  EIP: 0060:[] EFLAGS: 00000202 CPU: 0
  EIP is at gf128mul_4k_lle+0x23/0x60 [gf128mul]
  EAX: d69db1f0 EBX: d6b8ddac ECX: 00000004 EDX: 00000000
  ESI: 00000670 EDI: d6b8ddac EBP: d6b8ddc8 ESP: d6b8dda4
   DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
  Process hashatron (pid: 1502, ti=d6b8c000 task=d6810000 task.ti=d6b8c000)
  Stack:
   00000000 d69db1f0 00000163 00000000 d6b8ddc8 c101a520 d69db1f0 d52aa000
   00000ff0 d6b8dde8 d88d310f d6b8a3f8 d52aa000 00001000 d88d502c d6b8ddfc
   00001000 d6b8ddf4 c11676ed d69db1e8 d6b8de24 c11679ad d52aa000 00000000
  Call Trace:
   [] ? kmap_atomic_prot+0x37/0xa6
   [] ghash_update+0x85/0xbe [ghash_generic]
   [] crypto_shash_update+0x18/0x1b
   [] shash_ahash_update+0x22/0x36
   [] shash_async_update+0xb/0xd
   [] hash_sendpage+0xba/0xf2 [algif_hash]
   [] kernel_sendpage+0x39/0x4e
   [] ? 0xd88cdfff
   [] sock_sendpage+0x37/0x3e
   [] ? kernel_sendpage+0x4e/0x4e
   [] pipe_to_sendpage+0x56/0x61
   [] splice_from_pipe_feed+0x58/0xcd
   [] ? splice_from_pipe_begin+0x10/0x10
   [] __splice_from_pipe+0x36/0x55
   [] ? splice_from_pipe_begin+0x10/0x10
   [] splice_from_pipe+0x51/0x64
   [] ? default_file_splice_write+0x2c/0x2c
   [] generic_splice_sendpage+0x13/0x15
   [] ? splice_from_pipe_begin+0x10/0x10
   [] do_splice_from+0x5d/0x67
   [] sys_splice+0x2bf/0x363
   [] ? sysenter_exit+0xf/0x16
   [] ? trace_hardirqs_on_caller+0x10e/0x13f
   [] sysenter_do_call+0x12/0x32
  Code: 83 c4 0c 5b 5e 5f c9 c3 55 b9 04 00 00 00 89 e5 57 8d 7d e4 56 53 8d 5d e4 83 ec 18 89 45 e0 89 55 dc 0f b6 70 0f c1 e6 04 01 d6  a5 be 0f 00 00 00 4e 89 d8 e8 48 ff ff ff 8b 45 e0 89 da 0f
  EIP: [] gf128mul_4k_lle+0x23/0x60 [gf128mul] SS:ESP 0068:d6b8dda4
  CR2: 0000000000000670
  ---[ end trace 4eaa2a86a8e2da24 ]---
  note: hashatron[1502] exited with preempt_count 1
  BUG: scheduling while atomic: hashatron/1502/0x10000002
  INFO: lockdep is turned off.
  [...]

Signed-off-by: Nick Bowler 
Cc: stable@kernel.org [2.6.37+]
Signed-off-by: Herbert Xu

crypto: Move md5_transform to lib/md5.c

2011-08-07T01:32:45+00:00

We are going to use this for TCP/IP sequence number and fragment ID
generation.

Signed-off-by: David S. Miller

atomic: use

2011-07-26T23:49:47+00:00

This allows us to move duplicated code in 
(atomic_inc_not_zero() for now) to 

Signed-off-by: Arun Sharma 
Reviewed-by: Eric Dumazet 
Cc: Ingo Molnar 
Cc: David Miller 
Cc: Eric Dumazet 
Acked-by: Mike Frysinger 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2011-07-25T20:56:39+00:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)