Re: [GIT PULL] KEYS: Changes for keyrings for security/next

2014-09-22 Thread David Howells
James Morris  wrote:

> Ok, pulled to my next branch.

Thanks!

David
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [GIT PULL] KEYS: Changes for keyrings for security/next

2014-09-22 Thread James Morris
On Mon, 22 Sep 2014, David Howells wrote:

> James Morris  wrote:
> 
> > > Can you please pull these changes into security/next.  They include the 
> > > fixes
> > > tag I previously requested as there's a dependency between these changes 
> > > and
> > > the fixes.
> > > 
> > 
> > I'm getting this warning after pulling your code:
> > 
> >   CC  crypto/hash_info.o
> > crypto/asymmetric_keys/asymmetric_type.c: In function 
> > asymmetric_key_hex_to_key_id:
> > crypto/asymmetric_keys/asymmetric_type.c:110: warning: ignoring return 
> > value of hex2bin, declared with attribute warn_unused_result
> 
> I've posted an additional patch that moves some of the prevalidation to after
> the memory allocation in asymmetric_key_hex_to_key_id() and added it onto the
> keys-next branch.  Here's a revised pull request.
> ---
> Can you please pull these changes into security/next.  They include the fixes
> tag I previously requested as there's a dependency between these changes and
> the fixes.
> 

Ok, pulled to my next branch.


-- 
James Morris


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [GIT PULL] KEYS: Changes for keyrings for security/next

2014-09-22 Thread James Morris
On Mon, 22 Sep 2014, David Howells wrote:

 James Morris jmor...@namei.org wrote:
 
   Can you please pull these changes into security/next.  They include the 
   fixes
   tag I previously requested as there's a dependency between these changes 
   and
   the fixes.
   
  
  I'm getting this warning after pulling your code:
  
CC  crypto/hash_info.o
  crypto/asymmetric_keys/asymmetric_type.c: In function 
  asymmetric_key_hex_to_key_id:
  crypto/asymmetric_keys/asymmetric_type.c:110: warning: ignoring return 
  value of hex2bin, declared with attribute warn_unused_result
 
 I've posted an additional patch that moves some of the prevalidation to after
 the memory allocation in asymmetric_key_hex_to_key_id() and added it onto the
 keys-next branch.  Here's a revised pull request.
 ---
 Can you please pull these changes into security/next.  They include the fixes
 tag I previously requested as there's a dependency between these changes and
 the fixes.
 

Ok, pulled to my next branch.


-- 
James Morris
jmor...@namei.org

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [GIT PULL] KEYS: Changes for keyrings for security/next

2014-09-22 Thread David Howells
James Morris jmor...@namei.org wrote:

 Ok, pulled to my next branch.

Thanks!

David
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [GIT PULL] KEYS: Changes for keyrings for security/next

2014-09-21 Thread David Howells
James Morris  wrote:

> > Can you please pull these changes into security/next.  They include the 
> > fixes
> > tag I previously requested as there's a dependency between these changes and
> > the fixes.
> > 
> 
> I'm getting this warning after pulling your code:
> 
>   CC  crypto/hash_info.o
> crypto/asymmetric_keys/asymmetric_type.c: In function 
> asymmetric_key_hex_to_key_id:
> crypto/asymmetric_keys/asymmetric_type.c:110: warning: ignoring return 
> value of hex2bin, declared with attribute warn_unused_result

I've posted an additional patch that moves some of the prevalidation to after
the memory allocation in asymmetric_key_hex_to_key_id() and added it onto the
keys-next branch.  Here's a revised pull request.
---
Can you please pull these changes into security/next.  They include the fixes
tag I previously requested as there's a dependency between these changes and
the fixes.

So, there are the fixes to go upstream:

 (1) Reinstate the production of EPERM for key types beginning with '.' in
 requests from userspace.

 (2) Tidy up the cleanup of PKCS#7 message signed information blocks and fix a
 bug this made more obvious.

There are some additional fixes which can go through security/next:

 (1) Insert some missing 'static' annotations.

And then there are some improvements to X.509 and PKCS#7:

Changes for next to improve the matching of asymmetric keys and to improve the
handling of PKCS#7 certificates:

 (1) Provide a method to preparse the data supplied for matching a key.  This
 permits they key type to extract out the bits it needs for matching once
 only.

 Further, the type of search (direct lookup or iterative) can be set and
 the function used to actually check the match can be set by preparse
 rather than being hard coded for the type.

 (2) Improves asymmetric keys identification.

 Keys derived from X.509 certs now get labelled with IDs derived from their
 issuer and certificate number (required to match PKCS#7) and from their
 SKID and subject (required to match X.509).

 IDs are now binary and match criterion preparsing is provided so that
 criteria can be turned into binary blobs to make matching faster.

 (3) Improves PKCS#7 message handling to permit PKCS#7 messages without X.509
 cert lists to be matched to trusted keys, thereby allowing minimally sized
 PKCS#7 certs to be used.

 (4) Improves PKCS#7 message handling to better handle certificate chains that
 are broken due to unsupported crypto that can otherwise by used to
 intersect a trust keyring.

 (5) An alteration to to get rid of a warning due to the return value of
 hex2bin() not being checked.

David
---
The following changes since commit ac60ab4b4968b54fb5af20eac9dd78e36ad910c1:

  Merge branch 'next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next 
(2014-09-12 22:40:22 +1000)

are available in the git repository at:


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

for you to fetch changes up to d1ac5540455c3a2a11e943e19e2dc044cebe147d:

  KEYS: Check hex2bin()'s return when generating an asymmetric key ID 
(2014-09-22 00:02:01 +0100)


(from the branch description for keys-next local branch)

Keyrings for linux-next
Keyrings changes for next


David Howells (19):
  KEYS: Fix missing statics
  PKCS#7: Add a missing static
  KEYS: Reinstate EPERM for a key type name beginning with a '.'
  PKCS#7: Provide a single place to do signed info block freeing
  PKCS#7: Fix the parser cleanup to drain parsed out X.509 certs
  Merge tag 'keys-fixes-20140916' into keys-next
  Merge tag 'keys-next-fixes-20140916' into keys-next
  Provide a binary to hex conversion function
  KEYS: Preparse match data
  KEYS: Remove key_type::def_lookup_type
  KEYS: Remove key_type::match in favour of overriding default by 
match_preparse
  KEYS: Make the key matching functions return bool
  KEYS: Update the keyrings documentation for match changes
  KEYS: Implement binary asymmetric key ID handling
  KEYS: Overhaul key identification when searching for asymmetric keys
  PKCS#7: Better handling of unsupported crypto
  PKCS#7: Handle PKCS#7 messages that contain no X.509 certs
  Merge tag 'keys-pkcs7-20140916' into keys-next
  KEYS: Check hex2bin()'s return when generating an asymmetric key ID

 Documentation/security/keys.txt   |  65 +++--
 crypto/asymmetric_keys/asymmetric_keys.h  |   8 +-
 crypto/asymmetric_keys/asymmetric_type.c  | 223 +-
 crypto/asymmetric_keys/pkcs7_key_type.c   |   2 -
 crypto/asymmetric_keys/pkcs7_parser.c |  99 +++--
 crypto/asymmetric_keys/pkcs7_parser.h |   6 +-
 crypto/asymmetric_keys/pkcs7_trust.c  |  87 

Re: [GIT PULL] KEYS: Changes for keyrings for security/next

2014-09-21 Thread David Howells
James Morris jmor...@namei.org wrote:

  Can you please pull these changes into security/next.  They include the 
  fixes
  tag I previously requested as there's a dependency between these changes and
  the fixes.
  
 
 I'm getting this warning after pulling your code:
 
   CC  crypto/hash_info.o
 crypto/asymmetric_keys/asymmetric_type.c: In function 
 asymmetric_key_hex_to_key_id:
 crypto/asymmetric_keys/asymmetric_type.c:110: warning: ignoring return 
 value of hex2bin, declared with attribute warn_unused_result

I've posted an additional patch that moves some of the prevalidation to after
the memory allocation in asymmetric_key_hex_to_key_id() and added it onto the
keys-next branch.  Here's a revised pull request.
---
Can you please pull these changes into security/next.  They include the fixes
tag I previously requested as there's a dependency between these changes and
the fixes.

So, there are the fixes to go upstream:

 (1) Reinstate the production of EPERM for key types beginning with '.' in
 requests from userspace.

 (2) Tidy up the cleanup of PKCS#7 message signed information blocks and fix a
 bug this made more obvious.

There are some additional fixes which can go through security/next:

 (1) Insert some missing 'static' annotations.

And then there are some improvements to X.509 and PKCS#7:

Changes for next to improve the matching of asymmetric keys and to improve the
handling of PKCS#7 certificates:

 (1) Provide a method to preparse the data supplied for matching a key.  This
 permits they key type to extract out the bits it needs for matching once
 only.

 Further, the type of search (direct lookup or iterative) can be set and
 the function used to actually check the match can be set by preparse
 rather than being hard coded for the type.

 (2) Improves asymmetric keys identification.

 Keys derived from X.509 certs now get labelled with IDs derived from their
 issuer and certificate number (required to match PKCS#7) and from their
 SKID and subject (required to match X.509).

 IDs are now binary and match criterion preparsing is provided so that
 criteria can be turned into binary blobs to make matching faster.

 (3) Improves PKCS#7 message handling to permit PKCS#7 messages without X.509
 cert lists to be matched to trusted keys, thereby allowing minimally sized
 PKCS#7 certs to be used.

 (4) Improves PKCS#7 message handling to better handle certificate chains that
 are broken due to unsupported crypto that can otherwise by used to
 intersect a trust keyring.

 (5) An alteration to to get rid of a warning due to the return value of
 hex2bin() not being checked.

David
---
The following changes since commit ac60ab4b4968b54fb5af20eac9dd78e36ad910c1:

  Merge branch 'next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next 
(2014-09-12 22:40:22 +1000)

are available in the git repository at:


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

for you to fetch changes up to d1ac5540455c3a2a11e943e19e2dc044cebe147d:

  KEYS: Check hex2bin()'s return when generating an asymmetric key ID 
(2014-09-22 00:02:01 +0100)


(from the branch description for keys-next local branch)

Keyrings for linux-next
Keyrings changes for next


David Howells (19):
  KEYS: Fix missing statics
  PKCS#7: Add a missing static
  KEYS: Reinstate EPERM for a key type name beginning with a '.'
  PKCS#7: Provide a single place to do signed info block freeing
  PKCS#7: Fix the parser cleanup to drain parsed out X.509 certs
  Merge tag 'keys-fixes-20140916' into keys-next
  Merge tag 'keys-next-fixes-20140916' into keys-next
  Provide a binary to hex conversion function
  KEYS: Preparse match data
  KEYS: Remove key_type::def_lookup_type
  KEYS: Remove key_type::match in favour of overriding default by 
match_preparse
  KEYS: Make the key matching functions return bool
  KEYS: Update the keyrings documentation for match changes
  KEYS: Implement binary asymmetric key ID handling
  KEYS: Overhaul key identification when searching for asymmetric keys
  PKCS#7: Better handling of unsupported crypto
  PKCS#7: Handle PKCS#7 messages that contain no X.509 certs
  Merge tag 'keys-pkcs7-20140916' into keys-next
  KEYS: Check hex2bin()'s return when generating an asymmetric key ID

 Documentation/security/keys.txt   |  65 +++--
 crypto/asymmetric_keys/asymmetric_keys.h  |   8 +-
 crypto/asymmetric_keys/asymmetric_type.c  | 223 +-
 crypto/asymmetric_keys/pkcs7_key_type.c   |   2 -
 crypto/asymmetric_keys/pkcs7_parser.c |  99 +++--
 crypto/asymmetric_keys/pkcs7_parser.h |   6 +-
 crypto/asymmetric_keys/pkcs7_trust.c  |  87 

Re: [GIT PULL] KEYS: Changes for keyrings for security/next

2014-09-20 Thread David Howells
James Morris  wrote:

> I'm getting this warning after pulling your code:
> 
>   CC  crypto/hash_info.o
> crypto/asymmetric_keys/asymmetric_type.c: In function 
> asymmetric_key_hex_to_key_id:
> crypto/asymmetric_keys/asymmetric_type.c:110: warning: ignoring return 
> value of hex2bin, declared with attribute warn_unused_result

I don't see that with my compiler for some reason.  I'm not sure what to do
about it even so.  I don't need to check the result of hex2bin because I've
done all the checks required before allocating the buffer for hex2bin to write
into.  I could remove the attribute from hex2bin(), I suppose.

David
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [GIT PULL] KEYS: Changes for keyrings for security/next

2014-09-20 Thread David Howells
James Morris jmor...@namei.org wrote:

 I'm getting this warning after pulling your code:
 
   CC  crypto/hash_info.o
 crypto/asymmetric_keys/asymmetric_type.c: In function 
 asymmetric_key_hex_to_key_id:
 crypto/asymmetric_keys/asymmetric_type.c:110: warning: ignoring return 
 value of hex2bin, declared with attribute warn_unused_result

I don't see that with my compiler for some reason.  I'm not sure what to do
about it even so.  I don't need to check the result of hex2bin because I've
done all the checks required before allocating the buffer for hex2bin to write
into.  I could remove the attribute from hex2bin(), I suppose.

David
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [GIT PULL] KEYS: Changes for keyrings for security/next

2014-09-19 Thread James Morris
On Tue, 16 Sep 2014, David Howells wrote:

> Hi James,
> 
> Can you please pull these changes into security/next.  They include the fixes
> tag I previously requested as there's a dependency between these changes and
> the fixes.
> 

I'm getting this warning after pulling your code:

  CC  crypto/hash_info.o
crypto/asymmetric_keys/asymmetric_type.c: In function 
asymmetric_key_hex_to_key_id:
crypto/asymmetric_keys/asymmetric_type.c:110: warning: ignoring return 
value of hex2bin, declared with attribute warn_unused_result



-- 
James Morris


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [GIT PULL] KEYS: Changes for keyrings for security/next

2014-09-19 Thread James Morris
On Tue, 16 Sep 2014, David Howells wrote:

 Hi James,
 
 Can you please pull these changes into security/next.  They include the fixes
 tag I previously requested as there's a dependency between these changes and
 the fixes.
 

I'm getting this warning after pulling your code:

  CC  crypto/hash_info.o
crypto/asymmetric_keys/asymmetric_type.c: In function 
asymmetric_key_hex_to_key_id:
crypto/asymmetric_keys/asymmetric_type.c:110: warning: ignoring return 
value of hex2bin, declared with attribute warn_unused_result



-- 
James Morris
jmor...@namei.org

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[GIT PULL] KEYS: Changes for keyrings for security/next

2014-09-16 Thread David Howells
Hi James,

Can you please pull these changes into security/next.  They include the fixes
tag I previously requested as there's a dependency between these changes and
the fixes.

So, there are the fixes to go upstream:

 (1) Reinstate the production of EPERM for key types beginning with '.' in
 requests from userspace.

 (2) Tidy up the cleanup of PKCS#7 message signed information blocks and fix a
 bug this made more obvious.

There are some additional fixes which can go through security/next:

 (1) Insert some missing 'static' annotations.

And then there are some improvements to X.509 and PKCS#7:

Changes for next to improve the matching of asymmetric keys and to improve the
handling of PKCS#7 certificates:

 (1) Provide a method to preparse the data supplied for matching a key.  This
 permits they key type to extract out the bits it needs for matching once
 only.

 Further, the type of search (direct lookup or iterative) can be set and
 the function used to actually check the match can be set by preparse
 rather than being hard coded for the type.

 (2) Improves asymmetric keys identification.

 Keys derived from X.509 certs now get labelled with IDs derived from their
 issuer and certificate number (required to match PKCS#7) and from their
 SKID and subject (required to match X.509).

 IDs are now binary and match criterion preparsing is provided so that
 criteria can be turned into binary blobs to make matching faster.

 (3) Improves PKCS#7 message handling to permit PKCS#7 messages without X.509
 cert lists to be matched to trusted keys, thereby allowing minimally sized
 PKCS#7 certs to be used.

 (4) Improves PKCS#7 message handling to better handle certificate chains that
 are broken due to unsupported crypto that can otherwise by used to
 intersect a trust keyring.

David
---
The following changes since commit ac60ab4b4968b54fb5af20eac9dd78e36ad910c1:

  Merge branch 'next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next 
(2014-09-12 22:40:22 +1000)

are available in the git repository at:


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

for you to fetch changes up to d3e4f41973753a7768a5728be53c7d9a3fdf86cb:

  Merge tag 'keys-pkcs7-20140916' into keys-next (2014-09-16 17:38:07 +0100)



(from the branch description for keys-next local branch)

Keyrings for linux-next
Keyrings changes for next


David Howells (18):
  KEYS: Fix missing statics
  PKCS#7: Add a missing static
  KEYS: Reinstate EPERM for a key type name beginning with a '.'
  PKCS#7: Provide a single place to do signed info block freeing
  PKCS#7: Fix the parser cleanup to drain parsed out X.509 certs
  Merge tag 'keys-fixes-20140916' into keys-next
  Merge tag 'keys-next-fixes-20140916' into keys-next
  Provide a binary to hex conversion function
  KEYS: Preparse match data
  KEYS: Remove key_type::def_lookup_type
  KEYS: Remove key_type::match in favour of overriding default by 
match_preparse
  KEYS: Make the key matching functions return bool
  KEYS: Update the keyrings documentation for match changes
  KEYS: Implement binary asymmetric key ID handling
  KEYS: Overhaul key identification when searching for asymmetric keys
  PKCS#7: Better handling of unsupported crypto
  PKCS#7: Handle PKCS#7 messages that contain no X.509 certs
  Merge tag 'keys-pkcs7-20140916' into keys-next

 Documentation/security/keys.txt   |  65 +++--
 crypto/asymmetric_keys/asymmetric_keys.h  |   8 +-
 crypto/asymmetric_keys/asymmetric_type.c  | 222 +-
 crypto/asymmetric_keys/pkcs7_key_type.c   |   2 -
 crypto/asymmetric_keys/pkcs7_parser.c |  99 +++--
 crypto/asymmetric_keys/pkcs7_parser.h |   6 +-
 crypto/asymmetric_keys/pkcs7_trust.c  |  87 
 crypto/asymmetric_keys/pkcs7_verify.c | 102 +-
 crypto/asymmetric_keys/x509_cert_parser.c |  55 +---
 crypto/asymmetric_keys/x509_parser.h  |   6 +-
 crypto/asymmetric_keys/x509_public_key.c  | 102 --
 fs/cifs/cifs_spnego.c |   1 -
 fs/cifs/cifsacl.c |   1 -
 fs/nfs/idmap.c|   2 -
 include/crypto/public_key.h   |   5 +-
 include/keys/asymmetric-type.h|  38 +
 include/keys/user-type.h  |   1 -
 include/linux/kernel.h|   1 +
 include/linux/key-type.h  |  34 -
 lib/hexdump.c |  16 +++
 net/ceph/crypto.c |   1 -
 net/dns_resolver/dns_key.c|  18 ++-
 net/rxrpc/ar-key.c|   2 -
 security/keys/big_key.c   |   2 -
 

[GIT PULL] KEYS: Changes for keyrings for security/next

2014-09-16 Thread David Howells
Hi James,

Can you please pull these changes into security/next.  They include the fixes
tag I previously requested as there's a dependency between these changes and
the fixes.

So, there are the fixes to go upstream:

 (1) Reinstate the production of EPERM for key types beginning with '.' in
 requests from userspace.

 (2) Tidy up the cleanup of PKCS#7 message signed information blocks and fix a
 bug this made more obvious.

There are some additional fixes which can go through security/next:

 (1) Insert some missing 'static' annotations.

And then there are some improvements to X.509 and PKCS#7:

Changes for next to improve the matching of asymmetric keys and to improve the
handling of PKCS#7 certificates:

 (1) Provide a method to preparse the data supplied for matching a key.  This
 permits they key type to extract out the bits it needs for matching once
 only.

 Further, the type of search (direct lookup or iterative) can be set and
 the function used to actually check the match can be set by preparse
 rather than being hard coded for the type.

 (2) Improves asymmetric keys identification.

 Keys derived from X.509 certs now get labelled with IDs derived from their
 issuer and certificate number (required to match PKCS#7) and from their
 SKID and subject (required to match X.509).

 IDs are now binary and match criterion preparsing is provided so that
 criteria can be turned into binary blobs to make matching faster.

 (3) Improves PKCS#7 message handling to permit PKCS#7 messages without X.509
 cert lists to be matched to trusted keys, thereby allowing minimally sized
 PKCS#7 certs to be used.

 (4) Improves PKCS#7 message handling to better handle certificate chains that
 are broken due to unsupported crypto that can otherwise by used to
 intersect a trust keyring.

David
---
The following changes since commit ac60ab4b4968b54fb5af20eac9dd78e36ad910c1:

  Merge branch 'next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next 
(2014-09-12 22:40:22 +1000)

are available in the git repository at:


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

for you to fetch changes up to d3e4f41973753a7768a5728be53c7d9a3fdf86cb:

  Merge tag 'keys-pkcs7-20140916' into keys-next (2014-09-16 17:38:07 +0100)



(from the branch description for keys-next local branch)

Keyrings for linux-next
Keyrings changes for next


David Howells (18):
  KEYS: Fix missing statics
  PKCS#7: Add a missing static
  KEYS: Reinstate EPERM for a key type name beginning with a '.'
  PKCS#7: Provide a single place to do signed info block freeing
  PKCS#7: Fix the parser cleanup to drain parsed out X.509 certs
  Merge tag 'keys-fixes-20140916' into keys-next
  Merge tag 'keys-next-fixes-20140916' into keys-next
  Provide a binary to hex conversion function
  KEYS: Preparse match data
  KEYS: Remove key_type::def_lookup_type
  KEYS: Remove key_type::match in favour of overriding default by 
match_preparse
  KEYS: Make the key matching functions return bool
  KEYS: Update the keyrings documentation for match changes
  KEYS: Implement binary asymmetric key ID handling
  KEYS: Overhaul key identification when searching for asymmetric keys
  PKCS#7: Better handling of unsupported crypto
  PKCS#7: Handle PKCS#7 messages that contain no X.509 certs
  Merge tag 'keys-pkcs7-20140916' into keys-next

 Documentation/security/keys.txt   |  65 +++--
 crypto/asymmetric_keys/asymmetric_keys.h  |   8 +-
 crypto/asymmetric_keys/asymmetric_type.c  | 222 +-
 crypto/asymmetric_keys/pkcs7_key_type.c   |   2 -
 crypto/asymmetric_keys/pkcs7_parser.c |  99 +++--
 crypto/asymmetric_keys/pkcs7_parser.h |   6 +-
 crypto/asymmetric_keys/pkcs7_trust.c  |  87 
 crypto/asymmetric_keys/pkcs7_verify.c | 102 +-
 crypto/asymmetric_keys/x509_cert_parser.c |  55 +---
 crypto/asymmetric_keys/x509_parser.h  |   6 +-
 crypto/asymmetric_keys/x509_public_key.c  | 102 --
 fs/cifs/cifs_spnego.c |   1 -
 fs/cifs/cifsacl.c |   1 -
 fs/nfs/idmap.c|   2 -
 include/crypto/public_key.h   |   5 +-
 include/keys/asymmetric-type.h|  38 +
 include/keys/user-type.h  |   1 -
 include/linux/kernel.h|   1 +
 include/linux/key-type.h  |  34 -
 lib/hexdump.c |  16 +++
 net/ceph/crypto.c |   1 -
 net/dns_resolver/dns_key.c|  18 ++-
 net/rxrpc/ar-key.c|   2 -
 security/keys/big_key.c   |   2 -