commit 9522f476d932eb23ebf8dbbc6b4e2f966f3fe911
author Linus Torvalds <torvalds@linux-foundation.org> Thu Oct 01 07:50:08 2015 -0400
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Oct 01 07:50:08 2015 -0400
tree 89a2e788915e614f29bd95ab9f57169412d72859
parent dd36d7393d6310b0c1adefb22fba79c3cf8a577c
parent 0266715155379820c5c626e2cd4b8c91751036bc

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