Skip to content
Commits on Oct 4, 2012
  1. Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

    committed Oct 4, 2012
    Pull crypto update from Herbert Xu:
     - Optimised AES/SHA1 for ARM.
     - IPsec ESN support in talitos and caam.
     - x86_64/avx implementation of cast5/cast6.
     - Add/use multi-algorithm registration helpers where possible.
     - Added IBM Power7+ in-Nest support.
     - Misc fixes.
    
    Fix up trivial conflicts in crypto/Kconfig due to the sparc64 crypto
    config options being added next to the new ARM ones.
    
    [ Side note: cut-and-paste duplicate help texts make those conflicts
      harder to read than necessary, thanks to git being smart about
      minimizing conflicts and maximizing the common parts... ]
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (71 commits)
      crypto: x86/glue_helper - fix storing of new IV in CBC encryption
      crypto: cast5/avx - fix storing of new IV in CBC encryption
      crypto: tcrypt - add missing tests for camellia and ghash
      crypto: testmgr - make test_aead also test 'dst != src' code paths
      crypto: testmgr - make test_skcipher also test 'dst != src' code paths
      crypto: testmgr - add test vectors for CTR mode IV increasement
      crypto: testmgr - add test vectors for partial ctr(cast5) and ctr(cast6)
      crypto: testmgr - allow non-multi page and multi page skcipher tests from same test template
      crypto: caam - increase TRNG clocks per sample
      crypto, tcrypt: remove local_bh_disable/enable() around local_irq_disable/enable()
      crypto: tegra-aes - fix error return code
      crypto: crypto4xx - fix error return code
      crypto: hifn_795x - fix error return code
      crypto: ux500 - fix error return code
      crypto: caam - fix error IDs for SEC v5.x RNG4
      hwrng: mxc-rnga - Access data via structure
      hwrng: mxc-rnga - Adapt clocks to new i.mx clock framework
      crypto: caam - add IPsec ESN support
      crypto: 842 - remove .cra_list initialization
      Revert "[CRYPTO] cast6: inline bloat--"
      ...
Commits on Sep 10, 2012
  1. @ebiederm @davem330

    netlink: Rename pid to portid to avoid confusion

    ebiederm committed with davem330 Sep 7, 2012
    It is a frequent mistake to confuse the netlink port identifier with a
    process identifier.  Try to reduce this confusion by renaming fields
    that hold port identifiers portid instead of pid.
    
    I have carefully avoided changing the structures exported to
    userspace to avoid changing the userspace API.
    
    I have successfully built an allyesconfig kernel with this change.
    
    Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
    Acked-by: Stephen Hemminger <shemminger@vyatta.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Commits on Sep 8, 2012
  1. @davem330

    netlink: hide struct module parameter in netlink_kernel_create

    Pablo Neira Ayuso committed with davem330 Sep 8, 2012
    This patch defines netlink_kernel_create as a wrapper function of
    __netlink_kernel_create to hide the struct module *me parameter
    (which seems to be THIS_MODULE in all existing netlink subsystems).
    
    Suggested by David S. Miller.
    
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Commits on Sep 6, 2012
  1. @jkivilin @herbertx

    crypto: crypto_user - fix sparse warnings (symbol was not declared, s…

    jkivilin committed with herbertx Aug 28, 2012
    …hould be static?)
    
    Fix "symbol 'x' was not declared. Should it be static?" sparse warnings.
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Commits on Jun 29, 2012
  1. @davem330

    netlink: add netlink_kernel_cfg parameter to netlink_kernel_create

    Pablo Neira Ayuso committed with davem330 Jun 29, 2012
    This patch adds the following structure:
    
    struct netlink_kernel_cfg {
            unsigned int    groups;
            void            (*input)(struct sk_buff *skb);
            struct mutex    *cb_mutex;
    };
    
    That can be passed to netlink_kernel_create to set optional configurations
    for netlink kernel sockets.
    
    I've populated this structure by looking for NULL and zero parameters at the
    existing code. The remaining parameters that always need to be set are still
    left in the original interface.
    
    That includes optional parameters for the netlink socket creation. This allows
    easy extensibility of this interface in the future.
    
    This patch also adapts all callers to use this new interface.
    
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Commits on Apr 10, 2012
  1. @davem330
Commits on Apr 2, 2012
  1. @davem330

    crypto: Stop using NLA_PUT*().

    davem330 committed Apr 1, 2012
    These macros contain a hidden goto, and are thus extremely error
    prone and make code hard to audit.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
Commits on Mar 29, 2012
  1. @herbertx

    crypto: user - Fix size of netlink dump message

    Steffen Klassert committed with herbertx Mar 29, 2012
    The default netlink message size limit might be exceeded when dumping a
    lot of algorithms to userspace. As a result, not all of the instantiated
    algorithms dumped to userspace. So calculate an upper bound on the message
    size and call netlink_dump_start() with that value.
    
    Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  2. @herbertx

    crypto: user - Fix lookup of algorithms with IV generator

    Steffen Klassert committed with herbertx Mar 29, 2012
    We lookup algorithms with crypto_alg_mod_lookup() when instantiating via
    crypto_add_alg(). However, algorithms that are wrapped by an IV genearator
    (e.g. aead or genicv type algorithms) need special care. The userspace
    process hangs until it gets a timeout when we use crypto_alg_mod_lookup()
    to lookup these algorithms. So export the lookup functions for these
    algorithms and use them in crypto_add_alg().
    
    Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Commits on Mar 21, 2012
  1. Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

    committed Mar 21, 2012
    Pull crypto update from Herbert Xu:
     "* sha512 bug fixes (already in your tree).
      * SHA224/SHA384 AEAD support in caam.
      * X86-64 optimised version of Camellia.
      * Tegra AES support.
      * Bulk algorithm registration interface to make driver registration easier.
      * padata race fixes.
      * Misc fixes."
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (31 commits)
      padata: Fix race on sequence number wrap
      padata: Fix race in the serialization path
      crypto: camellia - add assembler implementation for x86_64
      crypto: camellia - rename camellia.c to camellia_generic.c
      crypto: camellia - fix checkpatch warnings
      crypto: camellia - rename camellia module to camellia_generic
      crypto: tcrypt - add more camellia tests
      crypto: testmgr - add more camellia test vectors
      crypto: camellia - simplify key setup and CAMELLIA_ROUNDSM macro
      crypto: twofish-x86_64/i586 - set alignmask to zero
      crypto: blowfish-x86_64 - set alignmask to zero
      crypto: serpent-sse2 - combine ablk_*_init functions
      crypto: blowfish-x86_64 - use crypto_[un]register_algs
      crypto: twofish-x86_64-3way - use crypto_[un]register_algs
      crypto: serpent-sse2 - use crypto_[un]register_algs
      crypto: serpent-sse2 - remove dead code from serpent_sse2_glue.c::serpent_sse2_init()
      crypto: twofish-x86 - Remove dead code from twofish_glue_3way.c::init()
      crypto: In crypto_add_alg(), 'exact' wants to be initialized to 0
      crypto: caam - fix gcc 4.6 warning
      crypto: Add bulk algorithm registration interface
      ...
Commits on Feb 26, 2012
  1. @davem330

    netlink: add netlink_dump_control structure for netlink_dump_start()

    Pablo Neira Ayuso committed with davem330 Feb 24, 2012
    Davem considers that the argument list of this interface is getting
    out of control. This patch tries to address this issue following
    his proposal:
    
    struct netlink_dump_control c = { .dump = dump, .done = done, ... };
    
    netlink_dump_start(..., &c);
    
    Suggested by David S. Miller.
    
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Commits on Feb 5, 2012
  1. @jjuhl @herbertx

    crypto: In crypto_add_alg(), 'exact' wants to be initialized to 0

    jjuhl committed with herbertx Jan 29, 2012
    We declare 'exact' without initializing it and then do:
    
    [...]
    	if (strlen(p->cru_driver_name))
    		exact = 1;
    
    	if (priority && !exact)
    		return -EINVAL;
    
    [...]
    
    If the first 'if' is not true, then the second will test an
    uninitialized 'exact'.
    As far as I can tell, what we want is for 'exact' to be initialized to
    0 (zero/false).
    
    Signed-off-by: Jesper Juhl <jj@chaosbits.net>
    Acked-by: Steffen Klassert <steffen.klassert@secunet.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Commits on Jan 15, 2012
  1. Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-s…

    committed Jan 14, 2012
    …ecurity
    
    * 'for-linus' of git://selinuxproject.org/~jmorris/linux-security:
      capabilities: remove __cap_full_set definition
      security: remove the security_netlink_recv hook as it is equivalent to capable()
      ptrace: do not audit capability check when outputing /proc/pid/stat
      capabilities: remove task_ns_* functions
      capabitlies: ns_capable can use the cap helpers rather than lsm call
      capabilities: style only - move capable below ns_capable
      capabilites: introduce new has_ns_capabilities_noaudit
      capabilities: call has_ns_capability from has_capability
      capabilities: remove all _real_ interfaces
      capabilities: introduce security_capable_noaudit
      capabilities: reverse arguments to security_capable
      capabilities: remove the task from capable LSM hook entirely
      selinux: sparse fix: fix several warnings in the security server cod
      selinux: sparse fix: fix warnings in netlink code
      selinux: sparse fix: eliminate warnings for selinuxfs
      selinux: sparse fix: declare selinux_disable() in security.h
      selinux: sparse fix: move selinux_complete_init
      selinux: sparse fix: make selinux_secmark_refcount static
      SELinux: Fix RCU deref check warning in sel_netport_insert()
    
    Manually fix up a semantic mis-merge wrt security_netlink_recv():
    
     - the interface was removed in commit fd77846 ("security: remove
       the security_netlink_recv hook as it is equivalent to capable()")
    
     - a new user of it appeared in commit a38f790 ("crypto: Add
       userspace configuration API")
    
    causing no automatic merge conflict, but Eric Paris pointed out the
    issue.
Commits on Jan 11, 2012
  1. Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

    committed Jan 10, 2012
    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (54 commits)
      crypto: gf128mul - remove leftover "(EXPERIMENTAL)" in Kconfig
      crypto: serpent-sse2 - remove unneeded LRW/XTS #ifdefs
      crypto: serpent-sse2 - select LRW and XTS
      crypto: twofish-x86_64-3way - remove unneeded LRW/XTS #ifdefs
      crypto: twofish-x86_64-3way - select LRW and XTS
      crypto: xts - remove dependency on EXPERIMENTAL
      crypto: lrw - remove dependency on EXPERIMENTAL
      crypto: picoxcell - fix boolean and / or confusion
      crypto: caam - remove DECO access initialization code
      crypto: caam - fix polarity of "propagate error" logic
      crypto: caam - more desc.h cleanups
      crypto: caam - desc.h - convert spaces to tabs
      crypto: talitos - convert talitos_error to struct device
      crypto: talitos - remove NO_IRQ references
      crypto: talitos - fix bad kfree
      crypto: convert drivers/crypto/* to use module_platform_driver()
      char: hw_random: convert drivers/char/hw_random/* to use module_platform_driver()
      crypto: serpent-sse2 - should select CRYPTO_CRYPTD
      crypto: serpent - rename serpent.c to serpent_generic.c
      crypto: serpent - cleanup checkpatch errors and warnings
      ...
Commits on Nov 9, 2011
  1. @herbertx

    crypto: Unlink and free instances when deleted

    Steffen Klassert committed with herbertx Nov 8, 2011
    We leak the crypto instance when we unregister an instance with
    crypto_del_alg(). Therefore we introduce crypto_unregister_instance()
    to unlink the crypto instance from the template's instances list and
    to free the recources of the instance properly.
    
    Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Commits on Nov 1, 2011
  1. @herbertx

    crypto: user - Fix rwsem leak in crypto_user

    Jonathan Corbet committed with herbertx Nov 2, 2011
    The list_empty case in crypto_alg_match() will return without calling
    up_read() on crypto_alg_sem.  We could do the "goto out" routine, but the
    function will clearly do the right thing with that test simply removed.
    
    Signed-off-by: Jonathan Corbet <corbet@lwn.net>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Commits on Oct 21, 2011
  1. @herbertx

    crypto: user - Initialise match in crypto_alg_match

    herbertx committed Oct 21, 2011
    We need to default match to 0 as otherwise it may lead to a false
    positive.
    
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  2. @herbertx

    crypto: Add userspace report for compress type algorithms

    Steffen Klassert committed with herbertx Sep 27, 2011
    Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  3. @herbertx

    crypto: Add userspace report for cipher type algorithms

    Steffen Klassert committed with herbertx Sep 27, 2011
    Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  4. @herbertx

    crypto: Add userspace report for larval type algorithms

    Steffen Klassert committed with herbertx Sep 27, 2011
    Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  5. @herbertx

    crypto: Add a report function pointer to crypto_type

    Steffen Klassert committed with herbertx Sep 27, 2011
    We add a report function pointer to struct crypto_type. This function
    pointer is used from the crypto userspace configuration API to report
    crypto algorithms to userspace.
    
    Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  6. @herbertx

    crypto: Add userspace configuration API

    Steffen Klassert committed with herbertx Sep 27, 2011
    This patch adds a basic userspace configuration API for the crypto layer.
    With this it is possible to instantiate, remove and to show crypto
    algorithms from userspace.
    
    Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Something went wrong with that request. Please try again.