Merge remote-tracking branch 'integrity/next-with-keys' into keys-next
authorDavid Howells <dhowells@redhat.com>
Tue, 22 Jul 2014 20:54:43 +0000 (21:54 +0100)
committerDavid Howells <dhowells@redhat.com>
Tue, 22 Jul 2014 20:54:43 +0000 (21:54 +0100)
commit64724cfc6eea920dbaada14f0fb978b1dd31192d
treed2f491be07a05e2d96b5c8b8e5a0a878f285eb22
parent6204e0025566ad3992ce649d4f44b7e8cdde2293
parent7d2ce2320e8efdc4a6dcbae7b329ed3f0d1cd778
Merge remote-tracking branch 'integrity/next-with-keys' into keys-next

Signed-off-by: David Howells <dhowells@redhat.com>
crypto/asymmetric_keys/asymmetric_type.c
crypto/asymmetric_keys/x509_public_key.c