diff options
Diffstat (limited to 'src/usr.bin/openssl/req.c')
| -rw-r--r-- | src/usr.bin/openssl/req.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/usr.bin/openssl/req.c b/src/usr.bin/openssl/req.c index 352e38b226..c5cae4df89 100644 --- a/src/usr.bin/openssl/req.c +++ b/src/usr.bin/openssl/req.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: req.c,v 1.14 2017/01/20 08:57:12 deraadt Exp $ */ | 1 | /* $OpenBSD: req.c,v 1.15 2018/02/07 05:47:55 jsing 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 | * |
| @@ -340,7 +340,7 @@ req_main(int argc, char **argv) | |||
| 340 | } | 340 | } |
| 341 | 341 | ||
| 342 | if (badops) { | 342 | if (badops) { |
| 343 | bad: | 343 | bad: |
| 344 | BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog); | 344 | BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog); |
| 345 | BIO_printf(bio_err, "where options are\n"); | 345 | BIO_printf(bio_err, "where options are\n"); |
| 346 | BIO_printf(bio_err, " -inform arg input format - DER or PEM\n"); | 346 | BIO_printf(bio_err, " -inform arg input format - DER or PEM\n"); |
| @@ -591,7 +591,7 @@ bad: | |||
| 591 | cipher = NULL; | 591 | cipher = NULL; |
| 592 | 592 | ||
| 593 | i = 0; | 593 | i = 0; |
| 594 | loop: | 594 | loop: |
| 595 | if (!PEM_write_bio_PrivateKey(out, pkey, cipher, | 595 | if (!PEM_write_bio_PrivateKey(out, pkey, cipher, |
| 596 | NULL, 0, NULL, passout)) { | 596 | NULL, 0, NULL, passout)) { |
| 597 | if ((ERR_GET_REASON(ERR_peek_error()) == | 597 | if ((ERR_GET_REASON(ERR_peek_error()) == |
| @@ -858,7 +858,7 @@ loop: | |||
| 858 | } | 858 | } |
| 859 | } | 859 | } |
| 860 | ex = 0; | 860 | ex = 0; |
| 861 | end: | 861 | end: |
| 862 | if (ex) { | 862 | if (ex) { |
| 863 | ERR_print_errors(bio_err); | 863 | ERR_print_errors(bio_err); |
| 864 | } | 864 | } |
| @@ -943,7 +943,7 @@ make_REQ(X509_REQ * req, EVP_PKEY * pkey, char *subj, int multirdn, | |||
| 943 | goto err; | 943 | goto err; |
| 944 | 944 | ||
| 945 | ret = 1; | 945 | ret = 1; |
| 946 | err: | 946 | err: |
| 947 | return (ret); | 947 | return (ret); |
| 948 | } | 948 | } |
| 949 | 949 | ||
| @@ -996,7 +996,7 @@ prompt_info(X509_REQ * req, | |||
| 996 | } | 996 | } |
| 997 | if (sk_CONF_VALUE_num(dn_sk)) { | 997 | if (sk_CONF_VALUE_num(dn_sk)) { |
| 998 | i = -1; | 998 | i = -1; |
| 999 | start: for (;;) { | 999 | start: for (;;) { |
| 1000 | int ret; | 1000 | int ret; |
| 1001 | i++; | 1001 | i++; |
| 1002 | if (sk_CONF_VALUE_num(dn_sk) <= i) | 1002 | if (sk_CONF_VALUE_num(dn_sk) <= i) |
| @@ -1214,7 +1214,7 @@ add_DN_object(X509_NAME * n, char *text, const char *def, char *value, | |||
| 1214 | { | 1214 | { |
| 1215 | int i, ret = 0; | 1215 | int i, ret = 0; |
| 1216 | char buf[1024]; | 1216 | char buf[1024]; |
| 1217 | start: | 1217 | start: |
| 1218 | if (!batch) | 1218 | if (!batch) |
| 1219 | BIO_printf(bio_err, "%s [%s]:", text, def); | 1219 | BIO_printf(bio_err, "%s [%s]:", text, def); |
| 1220 | (void) BIO_flush(bio_err); | 1220 | (void) BIO_flush(bio_err); |
| @@ -1255,7 +1255,7 @@ start: | |||
| 1255 | (unsigned char *) buf, -1, -1, mval)) | 1255 | (unsigned char *) buf, -1, -1, mval)) |
| 1256 | goto err; | 1256 | goto err; |
| 1257 | ret = 1; | 1257 | ret = 1; |
| 1258 | err: | 1258 | err: |
| 1259 | return (ret); | 1259 | return (ret); |
| 1260 | } | 1260 | } |
| 1261 | 1261 | ||
| @@ -1267,7 +1267,7 @@ add_attribute_object(X509_REQ * req, char *text, const char *def, | |||
| 1267 | int i; | 1267 | int i; |
| 1268 | static char buf[1024]; | 1268 | static char buf[1024]; |
| 1269 | 1269 | ||
| 1270 | start: | 1270 | start: |
| 1271 | if (!batch) | 1271 | if (!batch) |
| 1272 | BIO_printf(bio_err, "%s [%s]:", text, def); | 1272 | BIO_printf(bio_err, "%s [%s]:", text, def); |
| 1273 | (void) BIO_flush(bio_err); | 1273 | (void) BIO_flush(bio_err); |
| @@ -1312,7 +1312,7 @@ start: | |||
| 1312 | goto err; | 1312 | goto err; |
| 1313 | } | 1313 | } |
| 1314 | return (1); | 1314 | return (1); |
| 1315 | err: | 1315 | err: |
| 1316 | return (0); | 1316 | return (0); |
| 1317 | } | 1317 | } |
| 1318 | 1318 | ||
