===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/ocsp.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** src/usr.bin/openssl/ocsp.c	2017/11/29 23:47:18	1.13
--- src/usr.bin/openssl/ocsp.c	2018/02/07 05:47:55	1.14
***************
*** 1,4 ****
! /* $OpenBSD: ocsp.c,v 1.13 2017/11/29 23:47:18 guenther Exp $ */
  /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
   * project 2000.
   */
--- 1,4 ----
! /* $OpenBSD: ocsp.c,v 1.14 2018/02/07 05:47:55 jsing Exp $ */
  /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
   * project 2000.
   */
***************
*** 732,738 ****
  
  	ret = 0;
  
! end:
  	ERR_print_errors(bio_err);
  	X509_free(signer);
  	X509_STORE_free(store);
--- 732,738 ----
  
  	ret = 0;
  
!  end:
  	ERR_print_errors(bio_err);
  	X509_free(signer);
  	X509_STORE_free(store);
***************
*** 783,789 ****
  		goto err;
  	return 1;
  
! err:
  	BIO_printf(bio_err, "Error Creating OCSP request\n");
  	return 0;
  }
--- 783,789 ----
  		goto err;
  	return 1;
  
!  err:
  	BIO_printf(bio_err, "Error Creating OCSP request\n");
  	return 0;
  }
***************
*** 819,825 ****
  		goto err;
  	return 1;
  
! err:
  	BIO_printf(bio_err, "Error Creating OCSP request\n");
  	return 0;
  }
--- 819,825 ----
  		goto err;
  	return 1;
  
!  err:
  	BIO_printf(bio_err, "Error Creating OCSP request\n");
  	return 0;
  }
***************
*** 977,983 ****
  
  	*resp = OCSP_response_create(OCSP_RESPONSE_STATUS_SUCCESSFUL, bs);
  
! end:
  	ASN1_TIME_free(thisupd);
  	ASN1_TIME_free(nextupd);
  	OCSP_CERTID_free(ca_id);
--- 977,983 ----
  
  	*resp = OCSP_response_create(OCSP_RESPONSE_STATUS_SUCCESSFUL, bs);
  
!  end:
  	ASN1_TIME_free(thisupd);
  	ASN1_TIME_free(nextupd);
  	OCSP_CERTID_free(ca_id);
***************
*** 1030,1036 ****
  	}
  	return acbio;
  
! err:
  	BIO_free_all(acbio);
  	BIO_free(bufbio);
  	return NULL;
--- 1030,1036 ----
  	}
  	return acbio;
  
!  err:
  	BIO_free_all(acbio);
  	BIO_free(bufbio);
  	return NULL;
***************
*** 1173,1179 ****
  			break;
  		}
  	}
! err:
  	if (ctx)
  		OCSP_REQ_CTX_free(ctx);
  
--- 1173,1179 ----
  			break;
  		}
  	}
!  err:
  	if (ctx)
  		OCSP_REQ_CTX_free(ctx);
  
***************
*** 1210,1216 ****
  	resp = query_responder(err, cbio, path, headers, req, req_timeout);
  	if (!resp)
  		BIO_printf(bio_err, "Error querying OCSP responder\n");
! end:
  	if (cbio)
  		BIO_free_all(cbio);
  	if (ctx)
--- 1210,1216 ----
  	resp = query_responder(err, cbio, path, headers, req, req_timeout);
  	if (!resp)
  		BIO_printf(bio_err, "Error querying OCSP responder\n");
!  end:
  	if (cbio)
  		BIO_free_all(cbio);
  	if (ctx)