KEYS: Merge the type-specific data with the payload data
authorDavid Howells <dhowells@redhat.com>
Wed, 21 Oct 2015 13:04:48 +0000 (14:04 +0100)
committerDavid Howells <dhowells@redhat.com>
Wed, 21 Oct 2015 14:18:36 +0000 (15:18 +0100)
commit146aa8b1453bd8f1ff2304ffb71b4ee0eb9acdcc
treea89ef2cd2e8029b0c09a58739cca0e7e2e68f4db
parent4adc605edc5f744dcf432241b5996ff6a13d868c
KEYS: Merge the type-specific data with the payload data

Merge the type-specific data with the payload data into one four-word chunk
as it seems pointless to keep them separate.

Use user_key_payload() for accessing the payloads of overloaded
user-defined keys.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: linux-cifs@vger.kernel.org
cc: ecryptfs@vger.kernel.org
cc: linux-ext4@vger.kernel.org
cc: linux-f2fs-devel@lists.sourceforge.net
cc: linux-nfs@vger.kernel.org
cc: ceph-devel@vger.kernel.org
cc: linux-ima-devel@lists.sourceforge.net
49 files changed:
Documentation/crypto/asymmetric-keys.txt
Documentation/security/keys.txt
crypto/asymmetric_keys/asymmetric_keys.h
crypto/asymmetric_keys/asymmetric_type.c
crypto/asymmetric_keys/public_key.c
crypto/asymmetric_keys/signature.c
crypto/asymmetric_keys/x509_parser.h
crypto/asymmetric_keys/x509_public_key.c
fs/cifs/cifs_spnego.c
fs/cifs/cifsacl.c
fs/cifs/connect.c
fs/cifs/sess.c
fs/cifs/smb2pdu.c
fs/ecryptfs/ecryptfs_kernel.h
fs/ext4/crypto_key.c
fs/f2fs/crypto_key.c
fs/fscache/object-list.c
fs/nfs/nfs4idmap.c
include/crypto/public_key.h
include/keys/asymmetric-subtype.h
include/keys/asymmetric-type.h
include/keys/user-type.h
include/linux/key-type.h
include/linux/key.h
kernel/module_signing.c
lib/digsig.c
net/ceph/ceph_common.c
net/ceph/crypto.c
net/dns_resolver/dns_key.c
net/dns_resolver/dns_query.c
net/dns_resolver/internal.h
net/rxrpc/af_rxrpc.c
net/rxrpc/ar-key.c
net/rxrpc/ar-output.c
net/rxrpc/ar-security.c
net/rxrpc/rxkad.c
security/integrity/evm/evm_crypto.c
security/keys/big_key.c
security/keys/encrypted-keys/encrypted.c
security/keys/encrypted-keys/encrypted.h
security/keys/encrypted-keys/masterkey_trusted.c
security/keys/key.c
security/keys/keyctl.c
security/keys/keyring.c
security/keys/process_keys.c
security/keys/request_key.c
security/keys/request_key_auth.c
security/keys/trusted.c
security/keys/user_defined.c