summaryrefslogtreecommitdiff
path: root/apps/pkcs8.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>1999-12-23 02:02:42 +0000
committerDr. Stephen Henson <steve@openssl.org>1999-12-23 02:02:42 +0000
commit525f51f6c98751de4db3b81789044d32e3686cda (patch)
tree6dd7f1baa5eb540c8e98a6401c5bd57709f1a1e9 /apps/pkcs8.c
parent78baa17ad04922f996514f24f3823b9b8d4ec434 (diff)
downloadopenssl-new-525f51f6c98751de4db3b81789044d32e3686cda.tar.gz
Add PKCS#8 utility functions and add PBE options.
Diffstat (limited to 'apps/pkcs8.c')
-rw-r--r--apps/pkcs8.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index a05388300a..8ac9e1238d 100644
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -99,6 +99,16 @@ int MAIN(int argc, char **argv)
badarg = 1;
}
} else badarg = 1;
+ } else if (!strcmp(*args,"-v1")) {
+ if (args[1]) {
+ args++;
+ pbe_nid=OBJ_txt2nid(*args);
+ if(pbe_nid == NID_undef) {
+ BIO_printf(bio_err,
+ "Unknown PBE algorithm %s\n", *args);
+ badarg = 1;
+ }
+ } else badarg = 1;
} else if (!strcmp(*args,"-inform")) {
if (args[1]) {
args++;
@@ -139,6 +149,7 @@ int MAIN(int argc, char **argv)
BIO_printf (bio_err, "-noiter use 1 as iteration count\n");
BIO_printf (bio_err, "-nocrypt use or expect unencrypted private key\n");
BIO_printf (bio_err, "-v2 alg use PKCS#5 v2.0 and cipher \"alg\"\n");
+ BIO_printf (bio_err, "-v1 obj use PKCS#5 v1.5 and cipher \"alg\"\n");
return (1);
}