From 957b11334a7afb14537322f0e4795b2e368b3f59 Mon Sep 17 00:00:00 2001
From: beck <>
Date: Sun, 29 Jan 2017 17:49:23 +0000
Subject: Send the function codes from the error functions to the bit bucket,
 as was done earlier in libssl. Thanks inoguchi@ for noticing libssl had more
 reacharounds into this. ok jsing@ inoguchi@

---
 src/lib/libcrypto/ocsp/ocsp_srv.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/lib/libcrypto/ocsp/ocsp_srv.c')

diff --git a/src/lib/libcrypto/ocsp/ocsp_srv.c b/src/lib/libcrypto/ocsp/ocsp_srv.c
index ee4a5dd6db..a9e0aaab2f 100644
--- a/src/lib/libcrypto/ocsp/ocsp_srv.c
+++ b/src/lib/libcrypto/ocsp/ocsp_srv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ocsp_srv.c,v 1.9 2016/12/30 15:31:58 jsing Exp $ */
+/* $OpenBSD: ocsp_srv.c,v 1.10 2017/01/29 17:49:23 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -168,8 +168,7 @@ OCSP_basic_add1_status(OCSP_BASICRESP *rsp, OCSP_CERTID *cid, int status,
 	switch (cs->type = status) {
 	case V_OCSP_CERTSTATUS_REVOKED:
 		if (!revtime) {
-			OCSPerr(OCSP_F_OCSP_BASIC_ADD1_STATUS,
-			    OCSP_R_NO_REVOKED_TIME);
+			OCSPerror(OCSP_R_NO_REVOKED_TIME);
 			goto err;
 		}
 		if (!(cs->value.revoked = ri = OCSP_REVOKEDINFO_new()))
@@ -226,8 +225,7 @@ OCSP_basic_sign(OCSP_BASICRESP *brsp, X509 *signer, EVP_PKEY *key,
 	OCSP_RESPID *rid;
 
 	if (!X509_check_private_key(signer, key)) {
-		OCSPerr(OCSP_F_OCSP_BASIC_SIGN,
-		    OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
+		OCSPerror(OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
 		goto err;
 	}
 
-- 
cgit v1.2.3-55-g6feb