===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/ocsp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/openssl/ocsp.c	2015/08/22 16:36:05	1.3
--- src/usr.bin/openssl/ocsp.c	2015/09/11 14:30:23	1.4
***************
*** 1,4 ****
! /* $OpenBSD: ocsp.c,v 1.3 2015/08/22 16:36:05 jsing Exp $ */
  /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
   * project 2000.
   */
--- 1,4 ----
! /* $OpenBSD: ocsp.c,v 1.4 2015/09/11 14:30:23 bcook Exp $ */
  /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
   * project 2000.
   */
***************
*** 105,111 ****
  int
  ocsp_main(int argc, char **argv)
  {
- 	ENGINE *e = NULL;
  	char **args;
  	char *host = NULL, *port = NULL, *path = "/";
  	char *reqin = NULL, *respin = NULL;
--- 105,110 ----
***************
*** 335,341 ****
  				args++;
  				X509_free(issuer);
  				issuer = load_cert(bio_err, *args, FORMAT_PEM,
! 				    NULL, e, "issuer certificate");
  				if (!issuer)
  					goto end;
  			} else
--- 334,340 ----
  				args++;
  				X509_free(issuer);
  				issuer = load_cert(bio_err, *args, FORMAT_PEM,
! 				    NULL, "issuer certificate");
  				if (!issuer)
  					goto end;
  			} else
***************
*** 345,351 ****
  				args++;
  				X509_free(cert);
  				cert = load_cert(bio_err, *args, FORMAT_PEM,
! 				    NULL, e, "certificate");
  				if (!cert)
  					goto end;
  				if (!cert_id_md)
--- 344,350 ----
  				args++;
  				X509_free(cert);
  				cert = load_cert(bio_err, *args, FORMAT_PEM,
! 				    NULL, "certificate");
  				if (!cert)
  					goto end;
  				if (!cert_id_md)
***************
*** 531,550 ****
  		if (!rkeyfile)
  			rkeyfile = rsignfile;
  		rsigner = load_cert(bio_err, rsignfile, FORMAT_PEM,
! 		    NULL, e, "responder certificate");
  		if (!rsigner) {
  			BIO_printf(bio_err, "Error loading responder certificate\n");
  			goto end;
  		}
  		rca_cert = load_cert(bio_err, rca_filename, FORMAT_PEM,
! 		    NULL, e, "CA certificate");
  		if (rcertfile) {
  			rother = load_certs(bio_err, rcertfile, FORMAT_PEM,
! 			    NULL, e, "responder other certificates");
  			if (!rother)
  				goto end;
  		}
! 		rkey = load_key(bio_err, rkeyfile, FORMAT_PEM, 0, NULL, NULL,
  		    "responder private key");
  		if (!rkey)
  			goto end;
--- 530,549 ----
  		if (!rkeyfile)
  			rkeyfile = rsignfile;
  		rsigner = load_cert(bio_err, rsignfile, FORMAT_PEM,
! 		    NULL, "responder certificate");
  		if (!rsigner) {
  			BIO_printf(bio_err, "Error loading responder certificate\n");
  			goto end;
  		}
  		rca_cert = load_cert(bio_err, rca_filename, FORMAT_PEM,
! 		    NULL, "CA certificate");
  		if (rcertfile) {
  			rother = load_certs(bio_err, rcertfile, FORMAT_PEM,
! 			    NULL, "responder other certificates");
  			if (!rother)
  				goto end;
  		}
! 		rkey = load_key(bio_err, rkeyfile, FORMAT_PEM, 0, NULL,
  		    "responder private key");
  		if (!rkey)
  			goto end;
***************
*** 574,591 ****
  		if (!keyfile)
  			keyfile = signfile;
  		signer = load_cert(bio_err, signfile, FORMAT_PEM,
! 		    NULL, e, "signer certificate");
  		if (!signer) {
  			BIO_printf(bio_err, "Error loading signer certificate\n");
  			goto end;
  		}
  		if (sign_certfile) {
  			sign_other = load_certs(bio_err, sign_certfile, FORMAT_PEM,
! 			    NULL, e, "signer certificates");
  			if (!sign_other)
  				goto end;
  		}
! 		key = load_key(bio_err, keyfile, FORMAT_PEM, 0, NULL, NULL,
  		    "signer private key");
  		if (!key)
  			goto end;
--- 573,590 ----
  		if (!keyfile)
  			keyfile = signfile;
  		signer = load_cert(bio_err, signfile, FORMAT_PEM,
! 		    NULL, "signer certificate");
  		if (!signer) {
  			BIO_printf(bio_err, "Error loading signer certificate\n");
  			goto end;
  		}
  		if (sign_certfile) {
  			sign_other = load_certs(bio_err, sign_certfile, FORMAT_PEM,
! 			    NULL, "signer certificates");
  			if (!sign_other)
  				goto end;
  		}
! 		key = load_key(bio_err, keyfile, FORMAT_PEM, 0, NULL,
  		    "signer private key");
  		if (!key)
  			goto end;
***************
*** 690,696 ****
  		goto end;
  	if (verify_certfile) {
  		verify_other = load_certs(bio_err, verify_certfile, FORMAT_PEM,
! 		    NULL, e, "validator certificate");
  		if (!verify_other)
  			goto end;
  	}
--- 689,695 ----
  		goto end;
  	if (verify_certfile) {
  		verify_other = load_certs(bio_err, verify_certfile, FORMAT_PEM,
! 		    NULL, "validator certificate");
  		if (!verify_other)
  			goto end;
  	}