Skip to contentSkip to conversation

security: keyrings and modsign fixes

GIT PULL James Morris 1 participant 1 message Sep 29, 2015

lore
Share & tools
lore
#0 lore raw

Please pull these keyrings and modsign fixes from David Howells.

The following changes since commit 3225031fbeb1e32b269a82eccd815128267a4bfe:

Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile (2015-09-28 12:27:18 -0400)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git for-linus

for you to fetch changes up to 0266715155379820c5c626e2cd4b8c91751036bc:

Merge tag 'keys-fixes-20150925' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into for-linus (2015-09-29 19:19:09 +1000)

----------------------------------------------------------------

David Howells (4):
KEYS: Fix race between key destruction and finding a keyring by name
KEYS: Remove unnecessary header #inclusions from extract-cert.c X.509: Don't strip leading 00's from key ID when constructing key description
MODSIGN: Change from CMS to PKCS#7 signing if the openssl is too old

James Morris (1):

      Merge tag 'keys-fixes-20150925' of git://git.kernel.org/.../dhowells/linux-fs into for-linus
 Documentation/Changes                    |  2 +-
 crypto/asymmetric_keys/x509_public_key.c |  4 --
 scripts/extract-cert.c                   |  4 --
 scripts/sign-file.c                      | 94 ++++++++++++++++++++++++++------
 security/keys/gc.c                       |  8 +--
 5 files changed, 82 insertions(+), 30 deletions(-)