diff options
| author | jmc <> | 2018-08-24 22:56:45 +0000 | 
|---|---|---|
| committer | jmc <> | 2018-08-24 22:56:45 +0000 | 
| commit | b018265c126888b282ba3172d0ccc97fd5d2982c (patch) | |
| tree | 69ff926744f617c7b29a20926d3377e3e8696ac7 /src | |
| parent | 8e193d2984d7936d529aa5923c6ab990118cd6ff (diff) | |
| download | openbsd-b018265c126888b282ba3172d0ccc97fd5d2982c.tar.gz openbsd-b018265c126888b282ba3172d0ccc97fd5d2982c.tar.bz2 openbsd-b018265c126888b282ba3172d0ccc97fd5d2982c.zip  | |
update usage for pkcs8;
ok tb
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr.bin/openssl/pkcs8.c | 19 | 
1 files changed, 9 insertions, 10 deletions
diff --git a/src/usr.bin/openssl/pkcs8.c b/src/usr.bin/openssl/pkcs8.c index 0327898903..7938bf8b09 100644 --- a/src/usr.bin/openssl/pkcs8.c +++ b/src/usr.bin/openssl/pkcs8.c  | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pkcs8.c,v 1.12 2018/08/24 20:09:56 tb Exp $ */ | 1 | /* $OpenBSD: pkcs8.c,v 1.13 2018/08/24 22:56:45 jmc Exp $ */ | 
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 
| 3 | * project 1999-2004. | 3 | * project 1999-2004. | 
| 4 | */ | 4 | */ | 
| @@ -113,8 +113,8 @@ static struct option pkcs8_options[] = { | |||
| 113 | }, | 113 | }, | 
| 114 | { | 114 | { | 
| 115 | .name = "inform", | 115 | .name = "inform", | 
| 116 | .argname = "format", | 116 | .argname = "der | pem", | 
| 117 | .desc = "Input format (DER or PEM (default))", | 117 | .desc = "Input format (default PEM)", | 
| 118 | .type = OPTION_ARG_FORMAT, | 118 | .type = OPTION_ARG_FORMAT, | 
| 119 | .opt.value = &pkcs8_config.informat, | 119 | .opt.value = &pkcs8_config.informat, | 
| 120 | }, | 120 | }, | 
| @@ -140,8 +140,8 @@ static struct option pkcs8_options[] = { | |||
| 140 | }, | 140 | }, | 
| 141 | { | 141 | { | 
| 142 | .name = "outform", | 142 | .name = "outform", | 
| 143 | .argname = "format", | 143 | .argname = "der | pem", | 
| 144 | .desc = "Output format (DER or PEM (default))", | 144 | .desc = "Output format (default PEM)", | 
| 145 | .type = OPTION_ARG_FORMAT, | 145 | .type = OPTION_ARG_FORMAT, | 
| 146 | .opt.value = &pkcs8_config.outformat, | 146 | .opt.value = &pkcs8_config.outformat, | 
| 147 | }, | 147 | }, | 
| @@ -186,11 +186,10 @@ static struct option pkcs8_options[] = { | |||
| 186 | static void | 186 | static void | 
| 187 | pkcs8_usage() | 187 | pkcs8_usage() | 
| 188 | { | 188 | { | 
| 189 | fprintf(stderr, "usage: pkcs8 [-embed] [-in file] " | 189 | fprintf(stderr, "usage: pkcs8 [-in file] [inform der | pem] " | 
| 190 | "[-inform fmt] [-nocrypt]\n" | 190 | "[-nocrypt] [-noiter]\n" | 
| 191 | " [-noiter] [-nooct] [-nsdb] [-out file] [-outform fmt] " | 191 | " [-out file] [-outform der | pem] [-passin arg]\n" | 
| 192 | "[-passin src]\n" | 192 | " [-passout arg] [-topk8] [-v1 alg] [-v2 alg]\n\n"); | 
| 193 | " [-passout src] [-topk8] [-v1 alg] [-v2 alg]\n\n"); | ||
| 194 | options_usage(pkcs8_options); | 193 | options_usage(pkcs8_options); | 
| 195 | } | 194 | } | 
| 196 | 195 | ||
