diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr.bin/openssl/gendsa.c | 20 | ||||
| -rw-r--r-- | src/usr.bin/openssl/genrsa.c | 20 | 
2 files changed, 20 insertions, 20 deletions
diff --git a/src/usr.bin/openssl/gendsa.c b/src/usr.bin/openssl/gendsa.c index 982676818a..fff0053279 100644 --- a/src/usr.bin/openssl/gendsa.c +++ b/src/usr.bin/openssl/gendsa.c  | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: gendsa.c,v 1.13 2019/07/16 12:36:50 inoguchi Exp $ */ | 1 | /* $OpenBSD: gendsa.c,v 1.14 2019/07/24 14:23:25 inoguchi Exp $ */ | 
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 
| 3 | * All rights reserved. | 3 | * All rights reserved. | 
| 4 | * | 4 | * | 
| @@ -133,19 +133,19 @@ static const struct option gendsa_options[] = { | |||
| 133 | #ifndef OPENSSL_NO_AES | 133 | #ifndef OPENSSL_NO_AES | 
| 134 | { | 134 | { | 
| 135 | .name = "aes128", | 135 | .name = "aes128", | 
| 136 | .desc = "Encrypt PEM output with cbc aes", | 136 | .desc = "Encrypt PEM output with CBC AES", | 
| 137 | .type = OPTION_ARGV_FUNC, | 137 | .type = OPTION_ARGV_FUNC, | 
| 138 | .opt.argvfunc = set_enc, | 138 | .opt.argvfunc = set_enc, | 
| 139 | }, | 139 | }, | 
| 140 | { | 140 | { | 
| 141 | .name = "aes192", | 141 | .name = "aes192", | 
| 142 | .desc = "Encrypt PEM output with cbc aes", | 142 | .desc = "Encrypt PEM output with CBC AES", | 
| 143 | .type = OPTION_ARGV_FUNC, | 143 | .type = OPTION_ARGV_FUNC, | 
| 144 | .opt.argvfunc = set_enc, | 144 | .opt.argvfunc = set_enc, | 
| 145 | }, | 145 | }, | 
| 146 | { | 146 | { | 
| 147 | .name = "aes256", | 147 | .name = "aes256", | 
| 148 | .desc = "Encrypt PEM output with cbc aes", | 148 | .desc = "Encrypt PEM output with CBC AES", | 
| 149 | .type = OPTION_ARGV_FUNC, | 149 | .type = OPTION_ARGV_FUNC, | 
| 150 | .opt.argvfunc = set_enc, | 150 | .opt.argvfunc = set_enc, | 
| 151 | }, | 151 | }, | 
| @@ -153,19 +153,19 @@ static const struct option gendsa_options[] = { | |||
| 153 | #ifndef OPENSSL_NO_CAMELLIA | 153 | #ifndef OPENSSL_NO_CAMELLIA | 
| 154 | { | 154 | { | 
| 155 | .name = "camellia128", | 155 | .name = "camellia128", | 
| 156 | .desc = "Encrypt PEM output with cbc camellia", | 156 | .desc = "Encrypt PEM output with CBC Camellia", | 
| 157 | .type = OPTION_ARGV_FUNC, | 157 | .type = OPTION_ARGV_FUNC, | 
| 158 | .opt.argvfunc = set_enc, | 158 | .opt.argvfunc = set_enc, | 
| 159 | }, | 159 | }, | 
| 160 | { | 160 | { | 
| 161 | .name = "camellia192", | 161 | .name = "camellia192", | 
| 162 | .desc = "Encrypt PEM output with cbc camellia", | 162 | .desc = "Encrypt PEM output with CBC Camellia", | 
| 163 | .type = OPTION_ARGV_FUNC, | 163 | .type = OPTION_ARGV_FUNC, | 
| 164 | .opt.argvfunc = set_enc, | 164 | .opt.argvfunc = set_enc, | 
| 165 | }, | 165 | }, | 
| 166 | { | 166 | { | 
| 167 | .name = "camellia256", | 167 | .name = "camellia256", | 
| 168 | .desc = "Encrypt PEM output with cbc camellia", | 168 | .desc = "Encrypt PEM output with CBC Camellia", | 
| 169 | .type = OPTION_ARGV_FUNC, | 169 | .type = OPTION_ARGV_FUNC, | 
| 170 | .opt.argvfunc = set_enc, | 170 | .opt.argvfunc = set_enc, | 
| 171 | }, | 171 | }, | 
| @@ -173,13 +173,13 @@ static const struct option gendsa_options[] = { | |||
| 173 | #ifndef OPENSSL_NO_DES | 173 | #ifndef OPENSSL_NO_DES | 
| 174 | { | 174 | { | 
| 175 | .name = "des", | 175 | .name = "des", | 
| 176 | .desc = "Encrypt the generated key with DES in cbc mode", | 176 | .desc = "Encrypt the generated key with DES in CBC mode", | 
| 177 | .type = OPTION_ARGV_FUNC, | 177 | .type = OPTION_ARGV_FUNC, | 
| 178 | .opt.argvfunc = set_enc, | 178 | .opt.argvfunc = set_enc, | 
| 179 | }, | 179 | }, | 
| 180 | { | 180 | { | 
| 181 | .name = "des3", | 181 | .name = "des3", | 
| 182 | .desc = "Encrypt the generated key with DES in ede cbc mode (168 bit key)", | 182 | .desc = "Encrypt the generated key with DES in EDE CBC mode (168 bit key)", | 
| 183 | .type = OPTION_ARGV_FUNC, | 183 | .type = OPTION_ARGV_FUNC, | 
| 184 | .opt.argvfunc = set_enc, | 184 | .opt.argvfunc = set_enc, | 
| 185 | }, | 185 | }, | 
| @@ -187,7 +187,7 @@ static const struct option gendsa_options[] = { | |||
| 187 | #ifndef OPENSSL_NO_IDEA | 187 | #ifndef OPENSSL_NO_IDEA | 
| 188 | { | 188 | { | 
| 189 | .name = "idea", | 189 | .name = "idea", | 
| 190 | .desc = "Encrypt the generated key with IDEA in cbc mode", | 190 | .desc = "Encrypt the generated key with IDEA in CBC mode", | 
| 191 | .type = OPTION_ARGV_FUNC, | 191 | .type = OPTION_ARGV_FUNC, | 
| 192 | .opt.argvfunc = set_enc, | 192 | .opt.argvfunc = set_enc, | 
| 193 | }, | 193 | }, | 
diff --git a/src/usr.bin/openssl/genrsa.c b/src/usr.bin/openssl/genrsa.c index 002842b04b..f0cea1f9b1 100644 --- a/src/usr.bin/openssl/genrsa.c +++ b/src/usr.bin/openssl/genrsa.c  | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: genrsa.c,v 1.16 2019/07/16 12:50:30 inoguchi Exp $ */ | 1 | /* $OpenBSD: genrsa.c,v 1.17 2019/07/24 14:23:25 inoguchi Exp $ */ | 
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 
| 3 | * All rights reserved. | 3 | * All rights reserved. | 
| 4 | * | 4 | * | 
| @@ -179,19 +179,19 @@ static const struct option genrsa_options[] = { | |||
| 179 | #ifndef OPENSSL_NO_AES | 179 | #ifndef OPENSSL_NO_AES | 
| 180 | { | 180 | { | 
| 181 | .name = "aes128", | 181 | .name = "aes128", | 
| 182 | .desc = "Encrypt PEM output with cbc aes", | 182 | .desc = "Encrypt PEM output with CBC AES", | 
| 183 | .type = OPTION_ARGV_FUNC, | 183 | .type = OPTION_ARGV_FUNC, | 
| 184 | .opt.argvfunc = set_enc, | 184 | .opt.argvfunc = set_enc, | 
| 185 | }, | 185 | }, | 
| 186 | { | 186 | { | 
| 187 | .name = "aes192", | 187 | .name = "aes192", | 
| 188 | .desc = "Encrypt PEM output with cbc aes", | 188 | .desc = "Encrypt PEM output with CBC AES", | 
| 189 | .type = OPTION_ARGV_FUNC, | 189 | .type = OPTION_ARGV_FUNC, | 
| 190 | .opt.argvfunc = set_enc, | 190 | .opt.argvfunc = set_enc, | 
| 191 | }, | 191 | }, | 
| 192 | { | 192 | { | 
| 193 | .name = "aes256", | 193 | .name = "aes256", | 
| 194 | .desc = "Encrypt PEM output with cbc aes", | 194 | .desc = "Encrypt PEM output with CBC AES", | 
| 195 | .type = OPTION_ARGV_FUNC, | 195 | .type = OPTION_ARGV_FUNC, | 
| 196 | .opt.argvfunc = set_enc, | 196 | .opt.argvfunc = set_enc, | 
| 197 | }, | 197 | }, | 
| @@ -199,19 +199,19 @@ static const struct option genrsa_options[] = { | |||
| 199 | #ifndef OPENSSL_NO_CAMELLIA | 199 | #ifndef OPENSSL_NO_CAMELLIA | 
| 200 | { | 200 | { | 
| 201 | .name = "camellia128", | 201 | .name = "camellia128", | 
| 202 | .desc = "Encrypt PEM output with cbc camellia", | 202 | .desc = "Encrypt PEM output with CBC Camellia", | 
| 203 | .type = OPTION_ARGV_FUNC, | 203 | .type = OPTION_ARGV_FUNC, | 
| 204 | .opt.argvfunc = set_enc, | 204 | .opt.argvfunc = set_enc, | 
| 205 | }, | 205 | }, | 
| 206 | { | 206 | { | 
| 207 | .name = "camellia192", | 207 | .name = "camellia192", | 
| 208 | .desc = "Encrypt PEM output with cbc camellia", | 208 | .desc = "Encrypt PEM output with CBC Camellia", | 
| 209 | .type = OPTION_ARGV_FUNC, | 209 | .type = OPTION_ARGV_FUNC, | 
| 210 | .opt.argvfunc = set_enc, | 210 | .opt.argvfunc = set_enc, | 
| 211 | }, | 211 | }, | 
| 212 | { | 212 | { | 
| 213 | .name = "camellia256", | 213 | .name = "camellia256", | 
| 214 | .desc = "Encrypt PEM output with cbc camellia", | 214 | .desc = "Encrypt PEM output with CBC Camellia", | 
| 215 | .type = OPTION_ARGV_FUNC, | 215 | .type = OPTION_ARGV_FUNC, | 
| 216 | .opt.argvfunc = set_enc, | 216 | .opt.argvfunc = set_enc, | 
| 217 | }, | 217 | }, | 
| @@ -219,13 +219,13 @@ static const struct option genrsa_options[] = { | |||
| 219 | #ifndef OPENSSL_NO_DES | 219 | #ifndef OPENSSL_NO_DES | 
| 220 | { | 220 | { | 
| 221 | .name = "des", | 221 | .name = "des", | 
| 222 | .desc = "Encrypt the generated key with DES in cbc mode", | 222 | .desc = "Encrypt the generated key with DES in CBC mode", | 
| 223 | .type = OPTION_ARGV_FUNC, | 223 | .type = OPTION_ARGV_FUNC, | 
| 224 | .opt.argvfunc = set_enc, | 224 | .opt.argvfunc = set_enc, | 
| 225 | }, | 225 | }, | 
| 226 | { | 226 | { | 
| 227 | .name = "des3", | 227 | .name = "des3", | 
| 228 | .desc = "Encrypt the generated key with DES in ede cbc mode (168 bit key)", | 228 | .desc = "Encrypt the generated key with DES in EDE CBC mode (168 bit key)", | 
| 229 | .type = OPTION_ARGV_FUNC, | 229 | .type = OPTION_ARGV_FUNC, | 
| 230 | .opt.argvfunc = set_enc, | 230 | .opt.argvfunc = set_enc, | 
| 231 | }, | 231 | }, | 
| @@ -233,7 +233,7 @@ static const struct option genrsa_options[] = { | |||
| 233 | #ifndef OPENSSL_NO_IDEA | 233 | #ifndef OPENSSL_NO_IDEA | 
| 234 | { | 234 | { | 
| 235 | .name = "idea", | 235 | .name = "idea", | 
| 236 | .desc = "Encrypt the generated key with IDEA in cbc mode", | 236 | .desc = "Encrypt the generated key with IDEA in CBC mode", | 
| 237 | .type = OPTION_ARGV_FUNC, | 237 | .type = OPTION_ARGV_FUNC, | 
| 238 | .opt.argvfunc = set_enc, | 238 | .opt.argvfunc = set_enc, | 
| 239 | }, | 239 | }, | 
