===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/ts.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- src/usr.bin/openssl/ts.c	2017/01/20 08:57:12	1.14
+++ src/usr.bin/openssl/ts.c	2018/02/07 05:47:55	1.15
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts.c,v 1.14 2017/01/20 08:57:12 deraadt Exp $ */
+/* $OpenBSD: ts.c,v 1.15 2018/02/07 05:47:55 jsing Exp $ */
 /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
  * project 2002.
  */
@@ -301,7 +301,7 @@
 
 	goto cleanup;
 
-usage:
+ usage:
 	BIO_printf(bio_err, "usage:\n"
 	    "ts -query [-config configfile] "
 	    "[-data file_to_hash] [-digest digest_bytes]"
@@ -322,7 +322,7 @@
 	    "-CApath ca_path -CAfile ca_file.pem "
 	    "-untrusted cert_file.pem\n");
 
-cleanup:
+ cleanup:
 	/* Clean up. */
 	NCONF_free(conf);
 	free(password);
@@ -435,7 +435,7 @@
 
 	ret = 1;
 
-end:
+ end:
 	ERR_print_errors(bio_err);
 
 	/* Clean up. */
@@ -521,7 +521,7 @@
 
 	ret = 1;
 
-err:
+ err:
 	if (!ret) {
 		TS_REQ_free(ts_req);
 		ts_req = NULL;
@@ -574,7 +574,7 @@
 	}
 
 	return md_value_len;
-err:
+ err:
 	return 0;
 }
 
@@ -605,7 +605,7 @@
 
 	return nonce;
 
-err:
+ err:
 	BIO_printf(bio_err, "could not create nonce\n");
 	ASN1_INTEGER_free(nonce);
 	return NULL;
@@ -680,7 +680,7 @@
 
 	ret = 1;
 
-end:
+ end:
 	ERR_print_errors(bio_err);
 
 	/* Clean up. */
@@ -728,7 +728,7 @@
 	tst_info = NULL;	/* Ownership is lost. */
 
 	ret = 1;
-end:
+ end:
 	PKCS7_free(token);
 	TS_TST_INFO_free(tst_info);
 	if (!ret) {
@@ -813,7 +813,7 @@
 		goto end;
 
 	ret = 1;
-end:
+ end:
 	if (!ret) {
 		TS_RESP_free(response);
 		response = NULL;
@@ -876,7 +876,7 @@
 			goto err;
 	}
 	ret = 1;
-err:
+ err:
 	if (!ret) {
 		ASN1_INTEGER_free(serial);
 		serial = NULL;
@@ -899,7 +899,7 @@
 	if (BIO_puts(out, "\n") <= 0)
 		goto err;
 	ret = 1;
-err:
+ err:
 	if (!ret)
 		BIO_printf(bio_err, "could not save serial number to %s\n",
 		    serialfile);
@@ -941,7 +941,7 @@
 	    TS_RESP_verify_token(verify_ctx, token) :
 	    TS_RESP_verify_response(verify_ctx, response);
 
-end:
+ end:
 	printf("Verification: ");
 	if (ret)
 		printf("OK\n");
@@ -1012,7 +1012,7 @@
 		goto err;
 
 	ret = 1;
-err:
+ err:
 	if (!ret) {
 		TS_VERIFY_CTX_free(ctx);
 		ctx = NULL;
@@ -1064,7 +1064,7 @@
 		}
 	}
 	return cert_ctx;
-err:
+ err:
 	X509_STORE_free(cert_ctx);
 	return NULL;
 }