projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add more features that may be disabled
[openssl.git]
/
apps
/
pkeyparam.c
diff --git
a/apps/pkeyparam.c
b/apps/pkeyparam.c
index 5a5caf56bda8c58e6f4ca39334d84f4e9a6b9bc6..215611eb347d2a4243d7fd389cd208bc4070a65c 100644
(file)
--- a/
apps/pkeyparam.c
+++ b/
apps/pkeyparam.c
@@
-85,7
+85,7
@@
int pkeyparam_main(int argc, char **argv)
EVP_PKEY *pkey = NULL;
int text = 0, noout = 0, ret = 1;
OPTION_CHOICE o;
EVP_PKEY *pkey = NULL;
int text = 0, noout = 0, ret = 1;
OPTION_CHOICE o;
- char *infile = NULL, *outfile = NULL, *prog
, *engine = NULL
;
+ char *infile = NULL, *outfile = NULL, *prog;
prog = opt_init(argc, argv, pkeyparam_options);
while ((o = opt_next()) != OPT_EOF) {
prog = opt_init(argc, argv, pkeyparam_options);
while ((o = opt_next()) != OPT_EOF) {
@@
-105,7
+105,7
@@
int pkeyparam_main(int argc, char **argv)
outfile = opt_arg();
break;
case OPT_ENGINE:
outfile = opt_arg();
break;
case OPT_ENGINE:
-
engine = opt_arg(
);
+
(void)setup_engine(opt_arg(), 0
);
break;
case OPT_TEXT:
text = 1;
break;
case OPT_TEXT:
text = 1;
@@
-118,14
+118,13
@@
int pkeyparam_main(int argc, char **argv)
argc = opt_num_rest();
argv = opt_rest();
argc = opt_num_rest();
argv = opt_rest();
-#ifndef OPENSSL_NO_ENGINE
- setup_engine(engine, 0);
-#endif
+ if (!app_load_modules(NULL))
+ goto end;
- in = bio_open_default(infile,
"r"
);
+ in = bio_open_default(infile,
'r', FORMAT_PEM
);
if (in == NULL)
goto end;
if (in == NULL)
goto end;
- out = bio_open_default(outfile,
"w"
);
+ out = bio_open_default(outfile,
'w', FORMAT_PEM
);
if (out == NULL)
goto end;
pkey = PEM_read_bio_Parameters(in, NULL);
if (out == NULL)
goto end;
pkey = PEM_read_bio_Parameters(in, NULL);