projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
HTTP client: make server/proxy and port params more consistent; minor other improvements
[openssl.git]
/
apps
/
pkcs8.c
diff --git
a/apps/pkcs8.c
b/apps/pkcs8.c
index 1ccaff06f80019b63155750eeeeaa9beebb692be..b058ea1980e597e3534389bb743611c2e2143a79 100644
(file)
--- a/
apps/pkcs8.c
+++ b/
apps/pkcs8.c
@@
-26,7
+26,7
@@
typedef enum OPTION_choice {
#endif
OPT_V2, OPT_V1, OPT_V2PRF, OPT_ITER, OPT_PASSIN, OPT_PASSOUT,
OPT_TRADITIONAL,
#endif
OPT_V2, OPT_V1, OPT_V2PRF, OPT_ITER, OPT_PASSIN, OPT_PASSOUT,
OPT_TRADITIONAL,
- OPT_R_ENUM
+ OPT_R_ENUM
, OPT_PROV_ENUM
} OPTION_CHOICE;
const OPTIONS pkcs8_options[] = {
} OPTION_CHOICE;
const OPTIONS pkcs8_options[] = {
@@
-63,6
+63,7
@@
const OPTIONS pkcs8_options[] = {
#endif
OPT_R_OPTIONS,
#endif
OPT_R_OPTIONS,
+ OPT_PROV_OPTIONS,
{NULL}
};
{NULL}
};
@@
-127,6
+128,10
@@
int pkcs8_main(int argc, char **argv)
if (!opt_rand(o))
goto end;
break;
if (!opt_rand(o))
goto end;
break;
+ case OPT_PROV_CASES:
+ if (!opt_provider(o))
+ goto end;
+ break;
case OPT_TRADITIONAL:
traditional = 1;
break;
case OPT_TRADITIONAL:
traditional = 1;
break;