Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security subsystem updates from James Morris. Mostly ima, selinux, smack and key handling updates. * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (65 commits) integrity: do zero padding of the key id KEYS: output last portion of fingerprint in /proc/keys KEYS: strip 'id:' from ca_keyid KEYS: use swapped SKID for performing partial matching KEYS: Restore partial ID matching functionality for asymmetric keys X.509: If available, use the raw subjKeyId to form the key description KEYS: handle error code encoded in pointer selinux: normalize audit log formatting selinux: cleanup error reporting in selinux_nlmsg_perm() KEYS: Check hex2bin()'s return when generating an asymmetric key ID ima: detect violations for mmaped files ima: fix race condition on ima_rdwr_violation_check and process_measurement ima: added ima_policy_flag variable ima: return an error code from ima_add_boot_aggregate() ima: provide 'ima_appraise=log' kernel option ima: move keyring initialization to ima_init() PKCS#7: Handle PKCS#7 messages that contain no X.509 certs PKCS#7: Better handling of unsupported crypto KEYS: Overhaul key identification when searching for asymmetric keys KEYS: Implement binary asymmetric key ID handling ...
Showing
- Documentation/kernel-parameters.txt 1 addition, 1 deletionDocumentation/kernel-parameters.txt
- Documentation/security/keys.txt 52 additions, 13 deletionsDocumentation/security/keys.txt
- MAINTAINERS 2 additions, 0 deletionsMAINTAINERS
- crypto/asymmetric_keys/asymmetric_keys.h 3 additions, 2 deletionscrypto/asymmetric_keys/asymmetric_keys.h
- crypto/asymmetric_keys/asymmetric_type.c 203 additions, 62 deletionscrypto/asymmetric_keys/asymmetric_type.c
- crypto/asymmetric_keys/pkcs7_key_type.c 0 additions, 2 deletionscrypto/asymmetric_keys/pkcs7_key_type.c
- crypto/asymmetric_keys/pkcs7_parser.c 60 additions, 39 deletionscrypto/asymmetric_keys/pkcs7_parser.c
- crypto/asymmetric_keys/pkcs7_parser.h 2 additions, 4 deletionscrypto/asymmetric_keys/pkcs7_parser.h
- crypto/asymmetric_keys/pkcs7_trust.c 62 additions, 28 deletionscrypto/asymmetric_keys/pkcs7_trust.c
- crypto/asymmetric_keys/pkcs7_verify.c 71 additions, 31 deletionscrypto/asymmetric_keys/pkcs7_verify.c
- crypto/asymmetric_keys/signature.c 1 addition, 0 deletionscrypto/asymmetric_keys/signature.c
- crypto/asymmetric_keys/x509_cert_parser.c 35 additions, 22 deletionscrypto/asymmetric_keys/x509_cert_parser.c
- crypto/asymmetric_keys/x509_parser.h 6 additions, 2 deletionscrypto/asymmetric_keys/x509_parser.h
- crypto/asymmetric_keys/x509_public_key.c 75 additions, 40 deletionscrypto/asymmetric_keys/x509_public_key.c
- fs/cifs/cifs_spnego.c 0 additions, 1 deletionfs/cifs/cifs_spnego.c
- fs/cifs/cifsacl.c 0 additions, 1 deletionfs/cifs/cifsacl.c
- fs/namei.c 1 addition, 1 deletionfs/namei.c
- fs/nfs/idmap.c 0 additions, 2 deletionsfs/nfs/idmap.c
- fs/nfsd/vfs.c 1 addition, 1 deletionfs/nfsd/vfs.c
- include/crypto/public_key.h 4 additions, 2 deletionsinclude/crypto/public_key.h
Loading
Please register or sign in to comment