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 /Documentation | |
| parent | dd36d7393d6310b0c1adefb22fba79c3cf8a577c (diff) | |
| parent | 0266715155379820c5c626e2cd4b8c91751036bc (diff) | |
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 'Documentation')
| -rw-r--r-- | Documentation/Changes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/Changes b/Documentation/Changes index 6d8863004858..f447f0516f07 100644 --- a/Documentation/Changes +++ b/Documentation/Changes @@ -43,7 +43,7 @@ o udev 081 # udevd --version o grub 0.93 # grub --version || grub-install --version o mcelog 0.6 # mcelog --version o iptables 1.4.2 # iptables -V -o openssl & libcrypto 1.0.1k # openssl version +o openssl & libcrypto 1.0.0 # openssl version Kernel compilation |