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

Browse source

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

...

This commit is contained in:

Linus Torvalds 2015-10-01 07:50:08 -04:00

parent dd36d7393d 0266715155

commit 9522f476d9

5 changed files with 82 additions and 30 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

Documentation/Changes

View file

4

crypto/asymmetric_keys/x509_public_key.c

View file

4

scripts/extract-cert.c

View file

94

scripts/sign-file.c

View file

8

security/keys/gc.c

View file