diff options
| author | djm <> | 2012-10-13 21:25:14 +0000 |
|---|---|---|
| committer | djm <> | 2012-10-13 21:25:14 +0000 |
| commit | 93723b50b639d8dc717bc1bf463fd46e1b321239 (patch) | |
| tree | 281e0a29ae8f87a8c47fbd4deaa1f3d48b8cc5c1 /src/lib/libcrypto/ocsp/ocsp_lib.c | |
| parent | 65e72ac55a6405783db7a12d7e35a7561d46005b (diff) | |
| download | openbsd-93723b50b639d8dc717bc1bf463fd46e1b321239.tar.gz openbsd-93723b50b639d8dc717bc1bf463fd46e1b321239.tar.bz2 openbsd-93723b50b639d8dc717bc1bf463fd46e1b321239.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/ocsp/ocsp_lib.c')
| -rw-r--r-- | src/lib/libcrypto/ocsp/ocsp_lib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libcrypto/ocsp/ocsp_lib.c b/src/lib/libcrypto/ocsp/ocsp_lib.c index e92b86c060..a94dc838ee 100644 --- a/src/lib/libcrypto/ocsp/ocsp_lib.c +++ b/src/lib/libcrypto/ocsp/ocsp_lib.c | |||
| @@ -124,7 +124,8 @@ OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst, | |||
| 124 | if (!(ASN1_OCTET_STRING_set(cid->issuerNameHash, md, i))) goto err; | 124 | if (!(ASN1_OCTET_STRING_set(cid->issuerNameHash, md, i))) goto err; |
| 125 | 125 | ||
| 126 | /* Calculate the issuerKey hash, excluding tag and length */ | 126 | /* Calculate the issuerKey hash, excluding tag and length */ |
| 127 | EVP_Digest(issuerKey->data, issuerKey->length, md, &i, dgst, NULL); | 127 | if (!EVP_Digest(issuerKey->data, issuerKey->length, md, &i, dgst, NULL)) |
| 128 | goto err; | ||
| 128 | 129 | ||
| 129 | if (!(ASN1_OCTET_STRING_set(cid->issuerKeyHash, md, i))) goto err; | 130 | if (!(ASN1_OCTET_STRING_set(cid->issuerKeyHash, md, i))) goto err; |
| 130 | 131 | ||