diff options
| author | beck <> | 2017-01-29 17:49:23 +0000 |
|---|---|---|
| committer | beck <> | 2017-01-29 17:49:23 +0000 |
| commit | d1f47bd292f36094480caa49ada36b99a69c59b0 (patch) | |
| tree | 1a54abba678898ee5270ae4f3404a50ee9a92eea /src/lib/libcrypto/ocsp/ocsp_srv.c | |
| parent | f8c627888330b75c2eea8a3c27d0efe947a4f9da (diff) | |
| download | openbsd-d1f47bd292f36094480caa49ada36b99a69c59b0.tar.gz openbsd-d1f47bd292f36094480caa49ada36b99a69c59b0.tar.bz2 openbsd-d1f47bd292f36094480caa49ada36b99a69c59b0.zip | |
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@
Diffstat (limited to 'src/lib/libcrypto/ocsp/ocsp_srv.c')
| -rw-r--r-- | src/lib/libcrypto/ocsp/ocsp_srv.c | 8 |
1 files changed, 3 insertions, 5 deletions
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 @@ | |||
| 1 | /* $OpenBSD: ocsp_srv.c,v 1.9 2016/12/30 15:31:58 jsing Exp $ */ | 1 | /* $OpenBSD: ocsp_srv.c,v 1.10 2017/01/29 17:49:23 beck Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2001. | 3 | * project 2001. |
| 4 | */ | 4 | */ |
| @@ -168,8 +168,7 @@ OCSP_basic_add1_status(OCSP_BASICRESP *rsp, OCSP_CERTID *cid, int status, | |||
| 168 | switch (cs->type = status) { | 168 | switch (cs->type = status) { |
| 169 | case V_OCSP_CERTSTATUS_REVOKED: | 169 | case V_OCSP_CERTSTATUS_REVOKED: |
| 170 | if (!revtime) { | 170 | if (!revtime) { |
| 171 | OCSPerr(OCSP_F_OCSP_BASIC_ADD1_STATUS, | 171 | OCSPerror(OCSP_R_NO_REVOKED_TIME); |
| 172 | OCSP_R_NO_REVOKED_TIME); | ||
| 173 | goto err; | 172 | goto err; |
| 174 | } | 173 | } |
| 175 | if (!(cs->value.revoked = ri = OCSP_REVOKEDINFO_new())) | 174 | if (!(cs->value.revoked = ri = OCSP_REVOKEDINFO_new())) |
| @@ -226,8 +225,7 @@ OCSP_basic_sign(OCSP_BASICRESP *brsp, X509 *signer, EVP_PKEY *key, | |||
| 226 | OCSP_RESPID *rid; | 225 | OCSP_RESPID *rid; |
| 227 | 226 | ||
| 228 | if (!X509_check_private_key(signer, key)) { | 227 | if (!X509_check_private_key(signer, key)) { |
| 229 | OCSPerr(OCSP_F_OCSP_BASIC_SIGN, | 228 | OCSPerror(OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE); |
| 230 | OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE); | ||
| 231 | goto err; | 229 | goto err; |
| 232 | } | 230 | } |
| 233 | 231 | ||
