===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/req.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/openssl/req.c	2017/01/20 08:57:12	1.14
--- src/usr.bin/openssl/req.c	2018/02/07 05:47:55	1.15
***************
*** 1,4 ****
! /* $OpenBSD: req.c,v 1.14 2017/01/20 08:57:12 deraadt Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
--- 1,4 ----
! /* $OpenBSD: req.c,v 1.15 2018/02/07 05:47:55 jsing Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
***************
*** 340,346 ****
  	}
  
  	if (badops) {
! bad:
  		BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
  		BIO_printf(bio_err, "where options  are\n");
  		BIO_printf(bio_err, " -inform arg    input format - DER or PEM\n");
--- 340,346 ----
  	}
  
  	if (badops) {
!  bad:
  		BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
  		BIO_printf(bio_err, "where options  are\n");
  		BIO_printf(bio_err, " -inform arg    input format - DER or PEM\n");
***************
*** 591,597 ****
  			cipher = NULL;
  
  		i = 0;
! loop:
  		if (!PEM_write_bio_PrivateKey(out, pkey, cipher,
  			NULL, 0, NULL, passout)) {
  			if ((ERR_GET_REASON(ERR_peek_error()) ==
--- 591,597 ----
  			cipher = NULL;
  
  		i = 0;
!  loop:
  		if (!PEM_write_bio_PrivateKey(out, pkey, cipher,
  			NULL, 0, NULL, passout)) {
  			if ((ERR_GET_REASON(ERR_peek_error()) ==
***************
*** 858,864 ****
  		}
  	}
  	ex = 0;
! end:
  	if (ex) {
  		ERR_print_errors(bio_err);
  	}
--- 858,864 ----
  		}
  	}
  	ex = 0;
!  end:
  	if (ex) {
  		ERR_print_errors(bio_err);
  	}
***************
*** 943,949 ****
  		goto err;
  
  	ret = 1;
! err:
  	return (ret);
  }
  
--- 943,949 ----
  		goto err;
  
  	ret = 1;
!  err:
  	return (ret);
  }
  
***************
*** 996,1002 ****
  	}
  	if (sk_CONF_VALUE_num(dn_sk)) {
  		i = -1;
! start:		for (;;) {
  			int ret;
  			i++;
  			if (sk_CONF_VALUE_num(dn_sk) <= i)
--- 996,1002 ----
  	}
  	if (sk_CONF_VALUE_num(dn_sk)) {
  		i = -1;
!  start:		for (;;) {
  			int ret;
  			i++;
  			if (sk_CONF_VALUE_num(dn_sk) <= i)
***************
*** 1214,1220 ****
  {
  	int i, ret = 0;
  	char buf[1024];
! start:
  	if (!batch)
  		BIO_printf(bio_err, "%s [%s]:", text, def);
  	(void) BIO_flush(bio_err);
--- 1214,1220 ----
  {
  	int i, ret = 0;
  	char buf[1024];
!  start:
  	if (!batch)
  		BIO_printf(bio_err, "%s [%s]:", text, def);
  	(void) BIO_flush(bio_err);
***************
*** 1255,1261 ****
  		(unsigned char *) buf, -1, -1, mval))
  		goto err;
  	ret = 1;
! err:
  	return (ret);
  }
  
--- 1255,1261 ----
  		(unsigned char *) buf, -1, -1, mval))
  		goto err;
  	ret = 1;
!  err:
  	return (ret);
  }
  
***************
*** 1267,1273 ****
  	int i;
  	static char buf[1024];
  
! start:
  	if (!batch)
  		BIO_printf(bio_err, "%s [%s]:", text, def);
  	(void) BIO_flush(bio_err);
--- 1267,1273 ----
  	int i;
  	static char buf[1024];
  
!  start:
  	if (!batch)
  		BIO_printf(bio_err, "%s [%s]:", text, def);
  	(void) BIO_flush(bio_err);
***************
*** 1312,1318 ****
  		goto err;
  	}
  	return (1);
! err:
  	return (0);
  }
  
--- 1312,1318 ----
  		goto err;
  	}
  	return (1);
!  err:
  	return (0);
  }