On Thu, 7 Apr 2016, David Howells wrote:

diff --git a/crypto/asymmetric_keys/pkcs7_trust.c 
b/crypto/asymmetric_keys/pkcs7_trust.c
index b9a5487cd82d..0dccb6fe7634 100644
--- a/crypto/asymmetric_keys/pkcs7_trust.c
+++ b/crypto/asymmetric_keys/pkcs7_trust.c
@@ -170,8 +162,7 @@ verified:
 * May also return -ENOMEM.
 */
int pkcs7_validate_trust(struct pkcs7_message *pkcs7,
-                        struct key *trust_keyring,
-                        bool *_trusted)

This doesn't build after the keys-trust branch was rebased on v4.6-rc2. A reference to _trusted was added in commit e5435891 ("PKCS#7: pkcs7_validate_trust(): initialize the _trusted output argument"), right after the local declarations.

+                        struct key *trust_keyring)
{
        struct pkcs7_signed_info *sinfo;
        struct x509_certificate *p;

Regards,

--
Mat Martineau
Intel OTC

Reply via email to