diff options
| author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-08-14 14:10:11 +0200 |
|---|---|---|
| committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-08-14 14:10:11 +0200 |
| commit | f194976e811a6c717b0afe68259e75a2772782b0 (patch) | |
| tree | b480edee4273bab808c63ab766e77b0ed52e01fa /cmd/pk12util | |
| parent | f91691dddde48da951717e95026315398f5a53db (diff) | |
| download | nss-hg-f194976e811a6c717b0afe68259e75a2772782b0.tar.gz | |
Bug 1295115 - follow up to clang-format for CI, r= kaie
Diffstat (limited to 'cmd/pk12util')
| -rw-r--r-- | cmd/pk12util/pk12util.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/cmd/pk12util/pk12util.c b/cmd/pk12util/pk12util.c index f8f8370f3..cca27cbf6 100644 --- a/cmd/pk12util/pk12util.c +++ b/cmd/pk12util/pk12util.c @@ -752,8 +752,7 @@ P12U_ListPKCS12File(char *in_file, PK11SlotInfo *slot, PR_Close(fd); } } else if (SECU_PrintSignedData(stdout, dip->der, - (dip->hasKey) ? - "(has private key)" + (dip->hasKey) ? "(has private key)" : "", 0, (SECU_PPFunc)SECU_PrintCertificate) != 0) { @@ -982,10 +981,8 @@ main(int argc, char **argv) slotname = SECU_GetOptionArg(&pk12util, opt_TokenName); - import_file = (pk12util.options[opt_List].activated) ? - SECU_GetOptionArg(&pk12util, opt_List) - : - SECU_GetOptionArg(&pk12util, opt_Import); + import_file = (pk12util.options[opt_List].activated) ? SECU_GetOptionArg(&pk12util, opt_List) + : SECU_GetOptionArg(&pk12util, opt_Import); export_file = SECU_GetOptionArg(&pk12util, opt_Export); if (pk12util.options[opt_P12FilePWFile].activated) { @@ -1052,8 +1049,7 @@ main(int argc, char **argv) } } - certCipher = PK11_IsFIPS() ? SEC_OID_UNKNOWN : - SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_40_BIT_RC2_CBC; + certCipher = PK11_IsFIPS() ? SEC_OID_UNKNOWN : SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_40_BIT_RC2_CBC; if (pk12util.options[opt_CertCipher].activated) { char *cipherString = pk12util.options[opt_CertCipher].arg; |