diff options
Diffstat (limited to 'src/usr.bin/openssl/x509.c')
| -rw-r--r-- | src/usr.bin/openssl/x509.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/usr.bin/openssl/x509.c b/src/usr.bin/openssl/x509.c index 8d3dc07090..84aeed3c07 100644 --- a/src/usr.bin/openssl/x509.c +++ b/src/usr.bin/openssl/x509.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509.c,v 1.15 2018/02/07 04:57:06 jsing Exp $ */ | 1 | /* $OpenBSD: x509.c,v 1.16 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 | * |
| @@ -429,7 +429,7 @@ x509_main(int argc, char **argv) | |||
| 429 | } | 429 | } |
| 430 | 430 | ||
| 431 | if (badops) { | 431 | if (badops) { |
| 432 | bad: | 432 | bad: |
| 433 | for (pp = x509_usage; (*pp != NULL); pp++) | 433 | for (pp = x509_usage; (*pp != NULL); pp++) |
| 434 | BIO_printf(bio_err, "%s", *pp); | 434 | BIO_printf(bio_err, "%s", *pp); |
| 435 | goto end; | 435 | goto end; |
| @@ -905,7 +905,7 @@ bad: | |||
| 905 | } | 905 | } |
| 906 | ret = 0; | 906 | ret = 0; |
| 907 | 907 | ||
| 908 | end: | 908 | end: |
| 909 | OBJ_cleanup(); | 909 | OBJ_cleanup(); |
| 910 | NCONF_free(extconf); | 910 | NCONF_free(extconf); |
| 911 | BIO_free_all(out); | 911 | BIO_free_all(out); |
| @@ -963,7 +963,7 @@ x509_load_serial(char *CAfile, char *serialfile, int create) | |||
| 963 | if (!save_serial(buf, NULL, serial, &bs)) | 963 | if (!save_serial(buf, NULL, serial, &bs)) |
| 964 | goto end; | 964 | goto end; |
| 965 | 965 | ||
| 966 | end: | 966 | end: |
| 967 | free(buf); | 967 | free(buf); |
| 968 | BN_free(serial); | 968 | BN_free(serial); |
| 969 | 969 | ||
| @@ -1036,7 +1036,7 @@ x509_certify(X509_STORE *ctx, char *CAfile, const EVP_MD *digest, X509 *x, | |||
| 1036 | if (!do_X509_sign(bio_err, x, pkey, digest, sigopts)) | 1036 | if (!do_X509_sign(bio_err, x, pkey, digest, sigopts)) |
| 1037 | goto end; | 1037 | goto end; |
| 1038 | ret = 1; | 1038 | ret = 1; |
| 1039 | end: | 1039 | end: |
| 1040 | X509_STORE_CTX_cleanup(&xsc); | 1040 | X509_STORE_CTX_cleanup(&xsc); |
| 1041 | if (!ret) | 1041 | if (!ret) |
| 1042 | ERR_print_errors(bio_err); | 1042 | ERR_print_errors(bio_err); |
| @@ -1122,7 +1122,7 @@ sign(X509 *x, EVP_PKEY *pkey, int days, int clrext, const EVP_MD *digest, | |||
| 1122 | goto err; | 1122 | goto err; |
| 1123 | return 1; | 1123 | return 1; |
| 1124 | 1124 | ||
| 1125 | err: | 1125 | err: |
| 1126 | ERR_print_errors(bio_err); | 1126 | ERR_print_errors(bio_err); |
| 1127 | return 0; | 1127 | return 0; |
| 1128 | } | 1128 | } |
