projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Style fixes and use the source parameter so the OCSP path works
[openssl.git]
/
apps
/
dsa.c
diff --git
a/apps/dsa.c
b/apps/dsa.c
index f608d7d276931e26d37ab9e08af44bcaa26a28e9..dddc5b816c4cd030fe5296b9dac79c3c1a61a677 100644
(file)
--- a/
apps/dsa.c
+++ b/
apps/dsa.c
@@
-37,7
+37,7
@@
typedef enum OPTION_choice {
const OPTIONS dsa_options[] = {
{"help", OPT_HELP, '-', "Display this summary"},
{"inform", OPT_INFORM, 'f', "Input format, DER PEM PVK"},
const OPTIONS dsa_options[] = {
{"help", OPT_HELP, '-', "Display this summary"},
{"inform", OPT_INFORM, 'f', "Input format, DER PEM PVK"},
- {"outform", OPT_OUTFORM, '
F
', "Output format, DER PEM PVK"},
+ {"outform", OPT_OUTFORM, '
f
', "Output format, DER PEM PVK"},
{"in", OPT_IN, 's', "Input key"},
{"out", OPT_OUT, '>', "Output file"},
{"noout", OPT_NOOUT, '-', "Don't print key out"},
{"in", OPT_IN, 's', "Input key"},
{"out", OPT_OUT, '>', "Output file"},
{"noout", OPT_NOOUT, '-', "Don't print key out"},
@@
-96,8
+96,7
@@
int dsa_main(int argc, char **argv)
infile = opt_arg();
break;
case OPT_OUTFORM:
infile = opt_arg();
break;
case OPT_OUTFORM:
- if (!opt_format
- (opt_arg(), OPT_FMT_PEMDER | OPT_FMT_PVK, &outformat))
+ if (!opt_format(opt_arg(), OPT_FMT_ANY, &outformat))
goto opthelp;
break;
case OPT_OUT:
goto opthelp;
break;
case OPT_OUT:
@@
-214,7
+213,7
@@
int dsa_main(int argc, char **argv)
i = PEM_write_bio_DSAPrivateKey(out, dsa, enc,
NULL, 0, NULL, passout);
}
i = PEM_write_bio_DSAPrivateKey(out, dsa, enc,
NULL, 0, NULL, passout);
}
-# if
!defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_RC4)
+# if
ndef OPENSSL_NO_RSA
} else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {
EVP_PKEY *pk;
pk = EVP_PKEY_new();
} else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {
EVP_PKEY *pk;
pk = EVP_PKEY_new();
@@
-226,7
+225,13
@@
int dsa_main(int argc, char **argv)
goto end;
}
assert(private);
goto end;
}
assert(private);
+# ifdef OPENSSL_NO_RC4
+ BIO_printf(bio_err, "PVK format not supported\n");
+ EVP_PKEY_free(pk);
+ goto end;
+# else
i = i2b_PVK_bio(out, pk, pvk_encr, 0, passout);
i = i2b_PVK_bio(out, pk, pvk_encr, 0, passout);
+# endif
}
else if (pubin || pubout)
i = i2b_PublicKey_bio(out, pk);
}
else if (pubin || pubout)
i = i2b_PublicKey_bio(out, pk);
@@
-249,6
+254,7
@@
int dsa_main(int argc, char **argv)
end:
BIO_free_all(out);
DSA_free(dsa);
end:
BIO_free_all(out);
DSA_free(dsa);
+ release_engine(e);
OPENSSL_free(passin);
OPENSSL_free(passout);
return (ret);
OPENSSL_free(passin);
OPENSSL_free(passout);
return (ret);