diff options
| author | Kinichiro Inoguchi <inoguchi@cvs.openbsd.org> | 2022-04-28 15:42:11 +0000 |
|---|---|---|
| committer | Kinichiro Inoguchi <inoguchi@cvs.openbsd.org> | 2022-04-28 15:42:11 +0000 |
| commit | a094a9e6fb8a29e916ed9646be1acc7aa842b4b5 (patch) | |
| tree | 016decab374bd09b4eef20f7e7b877cc403a965d /usr.bin | |
| parent | df3b59fdb91dfb694fdf1c59ce3baf88a173d7d5 (diff) | |
Fix comparison in openssl(1) pkcs12
comment from tb@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/openssl/pkcs12.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/openssl/pkcs12.c b/usr.bin/openssl/pkcs12.c index 93924d4b8b3..b725d773da3 100644 --- a/usr.bin/openssl/pkcs12.c +++ b/usr.bin/openssl/pkcs12.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pkcs12.c,v 1.19 2022/04/28 15:29:10 inoguchi Exp $ */ +/* $OpenBSD: pkcs12.c,v 1.20 2022/04/28 15:42:10 inoguchi Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -784,7 +784,7 @@ pkcs12_main(int argc, char **argv) if (!pkcs12_config.twopass) strlcpy(macpass, pass, sizeof macpass); - if ((pkcs12_config.options & INFO) && p12->mac != NULL) + if ((pkcs12_config.options & INFO) != 0 && p12->mac != NULL) BIO_printf(bio_err, "MAC Iteration %ld\n", p12->mac->iter ? ASN1_INTEGER_get(p12->mac->iter) : 1); if (pkcs12_config.macver) { @@ -1097,7 +1097,7 @@ set_pbe(BIO *err, int *ppbe, const char *str) { if (str == NULL) return 0; - if (!strcmp(str, "NONE")) { + if (strcmp(str, "NONE") == 0) { *ppbe = -1; return 1; } |