===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/ca.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -c -r1.25 -r1.26
*** src/usr.bin/openssl/ca.c	2017/05/08 21:12:36	1.25
--- src/usr.bin/openssl/ca.c	2018/02/07 05:47:55	1.26
***************
*** 1,4 ****
! /* $OpenBSD: ca.c,v 1.25 2017/05/08 21:12:36 beck Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
--- 1,4 ----
! /* $OpenBSD: ca.c,v 1.26 2018/02/07 05:47:55 jsing Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
***************
*** 497,503 ****
  			rev_type = REV_CA_COMPROMISE;
  		}
  		else {
! bad:
  			if (errstr)
  				BIO_printf(bio_err, "invalid argument %s: %s\n",
  				    *argv, errstr);
--- 497,503 ----
  			rev_type = REV_CA_COMPROMISE;
  		}
  		else {
!  bad:
  			if (errstr)
  				BIO_printf(bio_err, "invalid argument %s: %s\n",
  				    *argv, errstr);
***************
*** 1310,1316 ****
  	/*****************************************************************/
  	ret = 0;
  
! err:
  	free(tofree);
  
  	BIO_free_all(Cout);
--- 1310,1316 ----
  	/*****************************************************************/
  	ret = 0;
  
!  err:
  	free(tofree);
  
  	BIO_free_all(Cout);
***************
*** 1407,1413 ****
  	    verbose, req, ext_sect, lconf, certopt, nameopt, default_op,
  	    ext_copy, selfsign);
  
! err:
  	if (req != NULL)
  		X509_REQ_free(req);
  	if (in != NULL)
--- 1407,1413 ----
  	    verbose, req, ext_sect, lconf, certopt, nameopt, default_op,
  	    ext_copy, selfsign);
  
!  err:
  	if (req != NULL)
  		X509_REQ_free(req);
  	if (in != NULL)
***************
*** 1464,1470 ****
  	    verbose, rreq, ext_sect, lconf, certopt, nameopt, default_op,
  	    ext_copy, 0);
  
! err:
  	if (rreq != NULL)
  		X509_REQ_free(rreq);
  	if (req != NULL)
--- 1464,1470 ----
  	    verbose, rreq, ext_sect, lconf, certopt, nameopt, default_op,
  	    ext_copy, 0);
  
!  err:
  	if (rreq != NULL)
  		X509_REQ_free(rreq);
  	if (req != NULL)
***************
*** 1969,1975 ****
  		goto err;
  	}
  	ok = 1;
! err:
  	for (i = 0; i < DB_NUMBER; i++)
  		free(row[i]);
  
--- 1969,1975 ----
  		goto err;
  	}
  	ok = 1;
!  err:
  	for (i = 0; i < DB_NUMBER; i++)
  		free(row[i]);
  
***************
*** 2126,2132 ****
  	    verbose, req, ext_sect, lconf, certopt, nameopt, default_op,
  	    ext_copy, 0);
  
! err:
  	if (req != NULL)
  		X509_REQ_free(req);
  	if (parms != NULL)
--- 2126,2132 ----
  	    verbose, req, ext_sect, lconf, certopt, nameopt, default_op,
  	    ext_copy, 0);
  
!  err:
  	if (req != NULL)
  		X509_REQ_free(req);
  	if (parms != NULL)
***************
*** 2248,2254 ****
  	}
  	ok = 1;
  
! err:
  	for (i = 0; i < DB_NUMBER; i++)
  		free(row[i]);
  
--- 2248,2254 ----
  	}
  	ok = 1;
  
!  err:
  	for (i = 0; i < DB_NUMBER; i++)
  		free(row[i]);
  
***************
*** 2320,2326 ****
  		ok = -1;
  	}
  
! err:
  	for (i = 0; i < DB_NUMBER; i++)
  		free(row[i]);
  
--- 2320,2326 ----
  		ok = -1;
  	}
  
!  err:
  	for (i = 0; i < DB_NUMBER; i++)
  		free(row[i]);
  
***************
*** 2383,2389 ****
  		}
  	}
  
! err:
  	ASN1_UTCTIME_free(a_tm);
  	free(a_tm_s);
  
--- 2383,2389 ----
  		}
  	}
  
!  err:
  	ASN1_UTCTIME_free(a_tm);
  	free(a_tm_s);
  
***************
*** 2534,2540 ****
  	else
  		ret = 1;
  
! err:
  	free(tmp);
  
  	ASN1_OBJECT_free(hold);
--- 2534,2540 ----
  	else
  		ret = 1;
  
!  err:
  	free(tmp);
  
  	ASN1_OBJECT_free(hold);
***************
*** 2681,2687 ****
  
  	ret = 1;
  
! err:
  	free(tmp);
  
  	if (!phold)
--- 2681,2687 ----
  
  	ret = 1;
  
!  err:
  	free(tmp);
  
  	if (!phold)