summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2014-04-17 15:12:00 +0000
committerjsing <jsing@openbsd.org>2014-04-17 15:12:00 +0000
commit69bdfcb1d8825eb31b2551adb65080d35b51623e (patch)
tree79b71c98a33ee66e7926347e0ab563c92748caca
parentMake sure the original thread is blocked until any other threads are (diff)
downloadwireguard-openbsd-69bdfcb1d8825eb31b2551adb65080d35b51623e.tar.xz
wireguard-openbsd-69bdfcb1d8825eb31b2551adb65080d35b51623e.zip
More KNF.
-rw-r--r--lib/libssl/src/apps/dsa.c28
1 files changed, 17 insertions, 11 deletions
diff --git a/lib/libssl/src/apps/dsa.c b/lib/libssl/src/apps/dsa.c
index af5702cf72f..3dad04317f9 100644
--- a/lib/libssl/src/apps/dsa.c
+++ b/lib/libssl/src/apps/dsa.c
@@ -266,7 +266,7 @@ bad:
passin, e, "Public Key");
else
pkey = load_key(bio_err, infile, informat, 1,
- passin, e, "Private Key");
+ passin, e, "Private Key");
if (pkey) {
dsa = EVP_PKEY_get1_DSA(pkey);
@@ -288,11 +288,12 @@ bad:
}
}
- if (text)
+ if (text) {
if (!DSA_print(out, dsa, 0)) {
- perror(outfile);
- ERR_print_errors(bio_err);
- goto end;
+ perror(outfile);
+ ERR_print_errors(bio_err);
+ goto end;
+ }
}
if (modulus) {
@@ -338,12 +339,17 @@ bad:
} else
ret = 0;
end:
- if (in != NULL) BIO_free(in);
- if (out != NULL) BIO_free_all(out);
- if (dsa != NULL) DSA_free(dsa);
- if (passin) free(passin);
- if (passout) free(passout);
- apps_shutdown();
+ if (in != NULL)
+ BIO_free(in);
+ if (out != NULL)
+ BIO_free_all(out);
+ if (dsa != NULL)
+ DSA_free(dsa);
+ if (passin)
+ free(passin);
+ if (passout)
+ free(passout);
+ apps_shutdown();
OPENSSL_EXIT(ret);
}
#else /* !OPENSSL_NO_DSA */