Linus Torvalds c49c41a413 Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security ... * '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 fd77846152 ("security: remove the security_netlink_recv hook as it is equivalent to capable()") - a new user of it appeared in commit a38f7907b9 ("crypto: Add userspace configuration API") causing no automatic merge conflict, but Eric Paris pointed out the issue.		2012-01-14 18:36:33 -08:00
..
async_tx	crypto: add module.h to those files that are explicitly using it	2011-10-31 19:31:11 -04:00
ablkcipher.c	crypto: algapi - Fix build problem with NET disabled	2011-11-11 06:57:06 +08:00
aead.c	crypto: algapi - Fix build problem with NET disabled	2011-11-11 06:57:06 +08:00
aes_generic.c
af_alg.c
ahash.c	crypto: algapi - Fix build problem with NET disabled	2011-11-11 06:57:06 +08:00
algapi.c	crypto: Unlink and free instances when deleted	2011-11-09 12:04:06 +08:00
algboss.c
algif_hash.c
algif_skcipher.c
ansi_cprng.c	crypto: ansi_cprng - enforce key != seed in fips mode	2011-11-09 12:04:06 +08:00
anubis.c
api.c
arc4.c
authenc.c
authencesn.c
blkcipher.c	crypto: algapi - Fix build problem with NET disabled	2011-11-11 06:57:06 +08:00
blowfish_common.c
blowfish_generic.c	crypto: blowfish - rename C-version to blowfish_generic	2011-09-22 21:25:26 +10:00
camellia.c
cast5.c
cast6.c
cbc.c
ccm.c
chainiv.c
cipher.c
compress.c
crc32c.c
cryptd.c
crypto_null.c
crypto_user.c	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
crypto_wq.c	crypto: add module.h to those files that are explicitly using it	2011-10-31 19:31:11 -04:00
ctr.c
cts.c
deflate.c
des_generic.c
ecb.c
eseqiv.c
fcrypt.c
fips.c
gcm.c
gf128mul.c
ghash-generic.c	crypto: ghash - Avoid null pointer dereference if no key is set	2011-10-21 13:18:42 +02:00
hmac.c
internal.h	crypto: Export crypto_remove_final	2011-10-21 14:24:03 +02:00
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2012-01-10 22:01:27 -08:00
khazad.c
krng.c
lrw.c	crypto: lrw - add interface for parallelized cipher implementions	2011-11-09 11:50:31 +08:00
lzo.c
Makefile	crypto: serpent - rename serpent.c to serpent_generic.c	2011-11-30 16:12:44 +08:00
md4.c	crypto: add module.h to those files that are explicitly using it	2011-10-31 19:31:11 -04:00
md5.c
michael_mic.c
pcbc.c
pcompress.c	crypto: algapi - Fix build problem with NET disabled	2011-11-11 06:57:06 +08:00
pcrypt.c
proc.c	crypto: add module.h to those files that are explicitly using it	2011-10-31 19:31:11 -04:00
ripemd.h
rmd128.c
rmd160.c
rmd256.c
rmd320.c
rng.c	crypto: algapi - Fix build problem with NET disabled	2011-11-11 06:57:06 +08:00
salsa20_generic.c
scatterwalk.c
seed.c
seqiv.c
serpent_generic.c	crypto: serpent - rename serpent.c to serpent_generic.c	2011-11-30 16:12:44 +08:00
sha1_generic.c
sha256_generic.c
sha512_generic.c
shash.c	crypto: algapi - Fix build problem with NET disabled	2011-11-11 06:57:06 +08:00
tcrypt.c	crypto: tcrypt - add xts(twofish) tests	2011-11-09 11:57:56 +08:00
tcrypt.h	crypto: tcrypt - add xts(serpent) tests	2011-11-09 11:57:56 +08:00
tea.c
testmgr.c	crypto: serpent - add 8-way parallel x86_64/SSE2 assembler implementation	2011-11-21 16:13:23 +08:00
testmgr.h	crypto: testmgr - add xts(twofish) test vectors	2011-11-09 11:57:56 +08:00
tgr192.c
twofish_common.c	crypto: twofish-x86_64-3way - add lrw support	2011-11-09 11:53:32 +08:00
twofish_generic.c
vmac.c	crypto: add module.h to those files that are explicitly using it	2011-10-31 19:31:11 -04:00
wp512.c	crypto: whirlpool - count rounds from 0	2011-10-21 14:24:16 +02:00
xcbc.c	crypto: add module.h to those files that are explicitly using it	2011-10-31 19:31:11 -04:00
xor.c
xts.c	crypto: xts: add interface for parallelized cipher implementations	2011-11-09 11:56:06 +08:00
zlib.c