diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-01 07:50:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-01 07:50:08 -0400 |
| commit | 9522f476d932eb23ebf8dbbc6b4e2f966f3fe911 (patch) | |
| tree | 89a2e788915e614f29bd95ab9f57169412d72859 /fs | |
| parent | Merge git://www.linux-watchdog.org/linux-watchdog (diff) | |
| parent | Merge tag 'keys-fixes-20150925' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into for-linus (diff) | |
| download | linux-dev-9522f476d932eb23ebf8dbbc6b4e2f966f3fe911.tar.xz linux-dev-9522f476d932eb23ebf8dbbc6b4e2f966f3fe911.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull key signing fixes from James Morris:
"Keyrings and modsign fixes from David Howells"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
MODSIGN: Change from CMS to PKCS#7 signing if the openssl is too old
X.509: Don't strip leading 00's from key ID when constructing key description
KEYS: Remove unnecessary header #inclusions from extract-cert.c
KEYS: Fix race between key destruction and finding a keyring by name
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions