===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/x509.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** src/usr.bin/openssl/x509.c	2018/02/07 04:57:06	1.15
--- src/usr.bin/openssl/x509.c	2018/02/07 05:47:55	1.16
***************
*** 1,4 ****
! /* $OpenBSD: x509.c,v 1.15 2018/02/07 04:57:06 jsing Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
--- 1,4 ----
! /* $OpenBSD: x509.c,v 1.16 2018/02/07 05:47:55 jsing Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
***************
*** 429,435 ****
  	}
  
  	if (badops) {
! bad:
  		for (pp = x509_usage; (*pp != NULL); pp++)
  			BIO_printf(bio_err, "%s", *pp);
  		goto end;
--- 429,435 ----
  	}
  
  	if (badops) {
!  bad:
  		for (pp = x509_usage; (*pp != NULL); pp++)
  			BIO_printf(bio_err, "%s", *pp);
  		goto end;
***************
*** 905,911 ****
  	}
  	ret = 0;
  
! end:
  	OBJ_cleanup();
  	NCONF_free(extconf);
  	BIO_free_all(out);
--- 905,911 ----
  	}
  	ret = 0;
  
!  end:
  	OBJ_cleanup();
  	NCONF_free(extconf);
  	BIO_free_all(out);
***************
*** 963,969 ****
  	if (!save_serial(buf, NULL, serial, &bs))
  		goto end;
  
! end:
  	free(buf);
  	BN_free(serial);
  
--- 963,969 ----
  	if (!save_serial(buf, NULL, serial, &bs))
  		goto end;
  
!  end:
  	free(buf);
  	BN_free(serial);
  
***************
*** 1036,1042 ****
  	if (!do_X509_sign(bio_err, x, pkey, digest, sigopts))
  		goto end;
  	ret = 1;
! end:
  	X509_STORE_CTX_cleanup(&xsc);
  	if (!ret)
  		ERR_print_errors(bio_err);
--- 1036,1042 ----
  	if (!do_X509_sign(bio_err, x, pkey, digest, sigopts))
  		goto end;
  	ret = 1;
!  end:
  	X509_STORE_CTX_cleanup(&xsc);
  	if (!ret)
  		ERR_print_errors(bio_err);
***************
*** 1122,1128 ****
  		goto err;
  	return 1;
  
! err:
  	ERR_print_errors(bio_err);
  	return 0;
  }
--- 1122,1128 ----
  		goto err;
  	return 1;
  
!  err:
  	ERR_print_errors(bio_err);
  	return 0;
  }