Merge tag 'keys-next-20160505' of...
Merge tag 'keys-next-20160505' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Showing
- Documentation/security/keys.txt 52 additions, 0 deletionsDocumentation/security/keys.txt
- arch/x86/kernel/kexec-bzimage64.c 4 additions, 14 deletionsarch/x86/kernel/kexec-bzimage64.c
- certs/Kconfig 9 additions, 0 deletionscerts/Kconfig
- certs/system_keyring.c 113 additions, 26 deletionscerts/system_keyring.c
- crypto/asymmetric_keys/Kconfig 3 additions, 3 deletionscrypto/asymmetric_keys/Kconfig
- crypto/asymmetric_keys/Makefile 4 additions, 1 deletioncrypto/asymmetric_keys/Makefile
- crypto/asymmetric_keys/asymmetric_keys.h 2 additions, 0 deletionscrypto/asymmetric_keys/asymmetric_keys.h
- crypto/asymmetric_keys/asymmetric_type.c 94 additions, 2 deletionscrypto/asymmetric_keys/asymmetric_type.c
- crypto/asymmetric_keys/mscode_parser.c 7 additions, 14 deletionscrypto/asymmetric_keys/mscode_parser.c
- crypto/asymmetric_keys/pkcs7_key_type.c 28 additions, 44 deletionscrypto/asymmetric_keys/pkcs7_key_type.c
- crypto/asymmetric_keys/pkcs7_parser.c 34 additions, 25 deletionscrypto/asymmetric_keys/pkcs7_parser.c
- crypto/asymmetric_keys/pkcs7_parser.h 4 additions, 7 deletionscrypto/asymmetric_keys/pkcs7_parser.h
- crypto/asymmetric_keys/pkcs7_trust.c 14 additions, 29 deletionscrypto/asymmetric_keys/pkcs7_trust.c
- crypto/asymmetric_keys/pkcs7_verify.c 46 additions, 61 deletionscrypto/asymmetric_keys/pkcs7_verify.c
- crypto/asymmetric_keys/public_key.c 14 additions, 6 deletionscrypto/asymmetric_keys/public_key.c
- crypto/asymmetric_keys/restrict.c 108 additions, 0 deletionscrypto/asymmetric_keys/restrict.c
- crypto/asymmetric_keys/signature.c 18 additions, 0 deletionscrypto/asymmetric_keys/signature.c
- crypto/asymmetric_keys/verify_pefile.c 9 additions, 31 deletionscrypto/asymmetric_keys/verify_pefile.c
- crypto/asymmetric_keys/verify_pefile.h 2 additions, 3 deletionscrypto/asymmetric_keys/verify_pefile.h
- crypto/asymmetric_keys/x509_cert_parser.c 31 additions, 21 deletionscrypto/asymmetric_keys/x509_cert_parser.c
Please register or sign in to comment