diff options
Diffstat (limited to 'src/usr.bin/openssl/ts.c')
-rw-r--r-- | src/usr.bin/openssl/ts.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/usr.bin/openssl/ts.c b/src/usr.bin/openssl/ts.c index 28462430a2..cac10d0d3f 100644 --- a/src/usr.bin/openssl/ts.c +++ b/src/usr.bin/openssl/ts.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ts.c,v 1.14 2017/01/20 08:57:12 deraadt Exp $ */ | 1 | /* $OpenBSD: ts.c,v 1.15 2018/02/07 05:47:55 jsing Exp $ */ |
2 | /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL | 2 | /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL |
3 | * project 2002. | 3 | * project 2002. |
4 | */ | 4 | */ |
@@ -301,7 +301,7 @@ ts_main(int argc, char **argv) | |||
301 | 301 | ||
302 | goto cleanup; | 302 | goto cleanup; |
303 | 303 | ||
304 | usage: | 304 | usage: |
305 | BIO_printf(bio_err, "usage:\n" | 305 | BIO_printf(bio_err, "usage:\n" |
306 | "ts -query [-config configfile] " | 306 | "ts -query [-config configfile] " |
307 | "[-data file_to_hash] [-digest digest_bytes]" | 307 | "[-data file_to_hash] [-digest digest_bytes]" |
@@ -322,7 +322,7 @@ usage: | |||
322 | "-CApath ca_path -CAfile ca_file.pem " | 322 | "-CApath ca_path -CAfile ca_file.pem " |
323 | "-untrusted cert_file.pem\n"); | 323 | "-untrusted cert_file.pem\n"); |
324 | 324 | ||
325 | cleanup: | 325 | cleanup: |
326 | /* Clean up. */ | 326 | /* Clean up. */ |
327 | NCONF_free(conf); | 327 | NCONF_free(conf); |
328 | free(password); | 328 | free(password); |
@@ -435,7 +435,7 @@ query_command(const char *data, char *digest, const EVP_MD * md, | |||
435 | 435 | ||
436 | ret = 1; | 436 | ret = 1; |
437 | 437 | ||
438 | end: | 438 | end: |
439 | ERR_print_errors(bio_err); | 439 | ERR_print_errors(bio_err); |
440 | 440 | ||
441 | /* Clean up. */ | 441 | /* Clean up. */ |
@@ -521,7 +521,7 @@ create_query(BIO * data_bio, char *digest, const EVP_MD * md, | |||
521 | 521 | ||
522 | ret = 1; | 522 | ret = 1; |
523 | 523 | ||
524 | err: | 524 | err: |
525 | if (!ret) { | 525 | if (!ret) { |
526 | TS_REQ_free(ts_req); | 526 | TS_REQ_free(ts_req); |
527 | ts_req = NULL; | 527 | ts_req = NULL; |
@@ -574,7 +574,7 @@ create_digest(BIO * input, char *digest, const EVP_MD * md, | |||
574 | } | 574 | } |
575 | 575 | ||
576 | return md_value_len; | 576 | return md_value_len; |
577 | err: | 577 | err: |
578 | return 0; | 578 | return 0; |
579 | } | 579 | } |
580 | 580 | ||
@@ -605,7 +605,7 @@ create_nonce(int bits) | |||
605 | 605 | ||
606 | return nonce; | 606 | return nonce; |
607 | 607 | ||
608 | err: | 608 | err: |
609 | BIO_printf(bio_err, "could not create nonce\n"); | 609 | BIO_printf(bio_err, "could not create nonce\n"); |
610 | ASN1_INTEGER_free(nonce); | 610 | ASN1_INTEGER_free(nonce); |
611 | return NULL; | 611 | return NULL; |
@@ -680,7 +680,7 @@ reply_command(CONF * conf, char *section, char *queryfile, | |||
680 | 680 | ||
681 | ret = 1; | 681 | ret = 1; |
682 | 682 | ||
683 | end: | 683 | end: |
684 | ERR_print_errors(bio_err); | 684 | ERR_print_errors(bio_err); |
685 | 685 | ||
686 | /* Clean up. */ | 686 | /* Clean up. */ |
@@ -728,7 +728,7 @@ read_PKCS7(BIO * in_bio) | |||
728 | tst_info = NULL; /* Ownership is lost. */ | 728 | tst_info = NULL; /* Ownership is lost. */ |
729 | 729 | ||
730 | ret = 1; | 730 | ret = 1; |
731 | end: | 731 | end: |
732 | PKCS7_free(token); | 732 | PKCS7_free(token); |
733 | TS_TST_INFO_free(tst_info); | 733 | TS_TST_INFO_free(tst_info); |
734 | if (!ret) { | 734 | if (!ret) { |
@@ -813,7 +813,7 @@ create_response(CONF * conf, const char *section, | |||
813 | goto end; | 813 | goto end; |
814 | 814 | ||
815 | ret = 1; | 815 | ret = 1; |
816 | end: | 816 | end: |
817 | if (!ret) { | 817 | if (!ret) { |
818 | TS_RESP_free(response); | 818 | TS_RESP_free(response); |
819 | response = NULL; | 819 | response = NULL; |
@@ -876,7 +876,7 @@ next_serial(const char *serialfile) | |||
876 | goto err; | 876 | goto err; |
877 | } | 877 | } |
878 | ret = 1; | 878 | ret = 1; |
879 | err: | 879 | err: |
880 | if (!ret) { | 880 | if (!ret) { |
881 | ASN1_INTEGER_free(serial); | 881 | ASN1_INTEGER_free(serial); |
882 | serial = NULL; | 882 | serial = NULL; |
@@ -899,7 +899,7 @@ save_ts_serial(const char *serialfile, ASN1_INTEGER * serial) | |||
899 | if (BIO_puts(out, "\n") <= 0) | 899 | if (BIO_puts(out, "\n") <= 0) |
900 | goto err; | 900 | goto err; |
901 | ret = 1; | 901 | ret = 1; |
902 | err: | 902 | err: |
903 | if (!ret) | 903 | if (!ret) |
904 | BIO_printf(bio_err, "could not save serial number to %s\n", | 904 | BIO_printf(bio_err, "could not save serial number to %s\n", |
905 | serialfile); | 905 | serialfile); |
@@ -941,7 +941,7 @@ verify_command(char *data, char *digest, char *queryfile, char *in, | |||
941 | TS_RESP_verify_token(verify_ctx, token) : | 941 | TS_RESP_verify_token(verify_ctx, token) : |
942 | TS_RESP_verify_response(verify_ctx, response); | 942 | TS_RESP_verify_response(verify_ctx, response); |
943 | 943 | ||
944 | end: | 944 | end: |
945 | printf("Verification: "); | 945 | printf("Verification: "); |
946 | if (ret) | 946 | if (ret) |
947 | printf("OK\n"); | 947 | printf("OK\n"); |
@@ -1012,7 +1012,7 @@ create_verify_ctx(char *data, char *digest, char *queryfile, char *ca_path, | |||
1012 | goto err; | 1012 | goto err; |
1013 | 1013 | ||
1014 | ret = 1; | 1014 | ret = 1; |
1015 | err: | 1015 | err: |
1016 | if (!ret) { | 1016 | if (!ret) { |
1017 | TS_VERIFY_CTX_free(ctx); | 1017 | TS_VERIFY_CTX_free(ctx); |
1018 | ctx = NULL; | 1018 | ctx = NULL; |
@@ -1064,7 +1064,7 @@ create_cert_store(char *ca_path, char *ca_file) | |||
1064 | } | 1064 | } |
1065 | } | 1065 | } |
1066 | return cert_ctx; | 1066 | return cert_ctx; |
1067 | err: | 1067 | err: |
1068 | X509_STORE_free(cert_ctx); | 1068 | X509_STORE_free(cert_ctx); |
1069 | return NULL; | 1069 | return NULL; |
1070 | } | 1070 | } |