diff options
| author | James Morris | 2014-08-05 16:52:01 +0200 |
|---|---|---|
| committer | James Morris | 2014-08-05 16:52:01 +0200 |
| commit | 478d085524c57cf4283699f529d5a4c22188ea69 (patch) | |
| tree | e97cdfff78867f247871be7f89341f087c766311 /crypto/asymmetric_keys/pkcs7_verify.c | |
| parent | Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next (diff) | |
| parent | X.509: Need to export x509_request_asymmetric_key() (diff) | |
| download | kernel-qcow2-linux-478d085524c57cf4283699f529d5a4c22188ea69.tar.gz kernel-qcow2-linux-478d085524c57cf4283699f529d5a4c22188ea69.tar.xz kernel-qcow2-linux-478d085524c57cf4283699f529d5a4c22188ea69.zip | |
Merge tag 'keys-next-20140805' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'crypto/asymmetric_keys/pkcs7_verify.c')
| -rw-r--r-- | crypto/asymmetric_keys/pkcs7_verify.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crypto/asymmetric_keys/pkcs7_verify.c b/crypto/asymmetric_keys/pkcs7_verify.c index 51ff36f3a913..c62cf8006e1f 100644 --- a/crypto/asymmetric_keys/pkcs7_verify.c +++ b/crypto/asymmetric_keys/pkcs7_verify.c @@ -190,14 +190,12 @@ static int pkcs7_verify_sig_chain(struct pkcs7_message *pkcs7, if (ret < 0) return ret; - if (x509->issuer) - pr_debug("- issuer %s\n", x509->issuer); + pr_debug("- issuer %s\n", x509->issuer); if (x509->authority) pr_debug("- authkeyid %s\n", x509->authority); if (!x509->authority || - (x509->subject && - strcmp(x509->subject, x509->issuer) == 0)) { + strcmp(x509->subject, x509->issuer) == 0) { /* If there's no authority certificate specified, then * the certificate must be self-signed and is the root * of the chain. Likewise if the cert is its own |