History

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull security subsystem updates from James Morris: "In this release: - PKCS#7 parser for the key management subsystem from David Howells - appoint Kees Cook as seccomp maintainer - bugfixes and general maintenance across the subsystem" * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (94 commits) X.509: Need to export x509_request_asymmetric_key() netlabel: shorter names for the NetLabel catmap funcs/structs netlabel: fix the catmap walking functions netlabel: fix the horribly broken catmap functions netlabel: fix a problem when setting bits below the previously lowest bit PKCS#7: X.509 certificate issuer and subject are mandatory fields in the ASN.1 tpm: simplify code by using %*phN specifier tpm: Provide a generic means to override the chip returned timeouts tpm: missing tpm_chip_put in tpm_get_random() tpm: Properly clean sysfs entries in error path tpm: Add missing tpm_do_selftest to ST33 I2C driver PKCS#7: Use x509_request_asymmetric_key() Revert "selinux: fix the default socket labeling in sock_graft()" X.509: x509_request_asymmetric_keys() doesn't need string length arguments PKCS#7: fix sparse non static symbol warning KEYS: revert encrypted key change ima: add support for measuring and appraising firmware firmware_class: perform new LSM checks security: introduce kernel_fw_from_file hook PKCS#7: Missing inclusion of linux/err.h ...

Linus Torvalds committed 12 years ago

Commit bb2cbf52 parents e7fda6c 478d085110 files · +4480 −834Browse files

Showing the changes to scripts (2 of 110 files). Show all

Unified · Split

2 files
  1. scripts/selinux/genheaders/Makefile +0 −1
  2. scripts/selinux/mdp/Makefile +1 −1
scripts/selinux/genheaders/Makefile+0−1
@@ -2,4 +2,3 @@ hostprogs-y := genheaders · 1 unmodified line
22 HOST_EXTRACFLAGS += -Isecurity/selinux/include
33
44 always := $(hostprogs-y)
5−clean-files := $(hostprogs-y)
scripts/selinux/mdp/Makefile+1−1
@@ -2,4 +2,4 @@ hostprogs-y := mdp · 1 unmodified line
22 HOST_EXTRACFLAGS += -Isecurity/selinux/include
33
44 always := $(hostprogs-y)
5−clean-files := $(hostprogs-y) policy.* file_contexts
5+clean-files := policy.* file_contexts

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t