Hi James,

Could you pull these changes into your next branch please?

There are three groups:

 (1) Miscellaneous cleanups.

 (2) Add scripts for extracting system cert list and module sigs.

 (3) Condense the type-specific data in the key struct into the payload
     data as it doesn't really make any sense to keep them separate.

David
---
The following changes since commit 09302fd19efbff9569eaad3f78ead8f411defd87:

  Merge branch 'smack-for-4.4' of https://github.com/cschaufler/smack-next into 
next (2015-10-21 10:49:29 +1100)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git 
tags/keys-next-20151021

for you to fetch changes up to 146aa8b1453bd8f1ff2304ffb71b4ee0eb9acdcc:

  KEYS: Merge the type-specific data with the payload data (2015-10-21 15:18:36 
+0100)

----------------------------------------------------------------
Keyring changes for next

----------------------------------------------------------------
David Howells (3):
      KEYS: Provide a script to extract the sys cert list from a vmlinux file
      KEYS: Provide a script to extract a module signature
      KEYS: Merge the type-specific data with the payload data

Geliang Tang (1):
      KEYS: use kvfree() in add_key

Insu Yun (1):
      keys: Be more consistent in selection of union members used

Paul Gortmaker (1):
      certs: add .gitignore to stop git nagging about x509_certificate_list

 Documentation/crypto/asymmetric-keys.txt         |  27 +++--
 Documentation/security/keys.txt                  |  41 ++++---
 certs/.gitignore                                 |   4 +
 crypto/asymmetric_keys/asymmetric_keys.h         |   5 -
 crypto/asymmetric_keys/asymmetric_type.c         |  44 ++++---
 crypto/asymmetric_keys/public_key.c              |   4 +-
 crypto/asymmetric_keys/signature.c               |   2 +-
 crypto/asymmetric_keys/x509_parser.h             |   1 +
 crypto/asymmetric_keys/x509_public_key.c         |   9 +-
 fs/cifs/cifs_spnego.c                            |   6 +-
 fs/cifs/cifsacl.c                                |  25 ++--
 fs/cifs/connect.c                                |   9 +-
 fs/cifs/sess.c                                   |   2 +-
 fs/cifs/smb2pdu.c                                |   2 +-
 fs/ecryptfs/ecryptfs_kernel.h                    |   5 +-
 fs/ext4/crypto_key.c                             |   4 +-
 fs/f2fs/crypto_key.c                             |   4 +-
 fs/fscache/object-list.c                         |   4 +-
 fs/nfs/nfs4idmap.c                               |   4 +-
 include/crypto/public_key.h                      |   1 -
 include/keys/asymmetric-subtype.h                |   2 +-
 include/keys/asymmetric-type.h                   |  15 +++
 include/keys/user-type.h                         |   8 ++
 include/linux/key-type.h                         |   3 +-
 include/linux/key.h                              |  33 +++---
 kernel/.gitignore                                |   1 -
 kernel/module_signing.c                          |   1 +
 lib/digsig.c                                     |   7 +-
 net/ceph/ceph_common.c                           |   2 +-
 net/ceph/crypto.c                                |   6 +-
 net/dns_resolver/dns_key.c                       |  20 ++--
 net/dns_resolver/dns_query.c                     |   7 +-
 net/dns_resolver/internal.h                      |   8 ++
 net/rxrpc/af_rxrpc.c                             |   2 +-
 net/rxrpc/ar-key.c                               |  32 ++---
 net/rxrpc/ar-output.c                            |   2 +-
 net/rxrpc/ar-security.c                          |   4 +-
 net/rxrpc/rxkad.c                                |  16 +--
 scripts/extract-module-sig.pl                    | 136 +++++++++++++++++++++
 scripts/extract-sys-certs.pl                     | 144 +++++++++++++++++++++++
 security/integrity/evm/evm_crypto.c              |   2 +-
 security/keys/big_key.c                          |  47 +++++---
 security/keys/encrypted-keys/encrypted.c         |  18 +--
 security/keys/encrypted-keys/encrypted.h         |   4 +-
 security/keys/encrypted-keys/masterkey_trusted.c |   4 +-
 security/keys/key.c                              |  20 ++--
 security/keys/keyctl.c                           |  12 +-
 security/keys/keyring.c                          |  12 +-
 security/keys/process_keys.c                     |   4 +-
 security/keys/request_key.c                      |   4 +-
 security/keys/request_key_auth.c                 |  12 +-
 security/keys/trusted.c                          |   6 +-
 security/keys/user_defined.c                     |  14 +--
 53 files changed, 572 insertions(+), 239 deletions(-)
 create mode 100644 certs/.gitignore
 create mode 100755 scripts/extract-module-sig.pl
 create mode 100755 scripts/extract-sys-certs.pl
--
To unsubscribe from this list: send the line "unsubscribe 
linux-security-module" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to