diff options
| author | djm <> | 2010-10-01 22:59:01 +0000 |
|---|---|---|
| committer | djm <> | 2010-10-01 22:59:01 +0000 |
| commit | fe047d8b632246cb2db3234a0a4f32e5c318857b (patch) | |
| tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libcrypto/ocsp/ocsp_cl.c | |
| parent | 2ea67f4aa254b09ded62e6e14fc893bbe6381579 (diff) | |
| download | openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.gz openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.bz2 openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.zip | |
resolve conflicts, fix local changes
Diffstat (limited to 'src/lib/libcrypto/ocsp/ocsp_cl.c')
| -rw-r--r-- | src/lib/libcrypto/ocsp/ocsp_cl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lib/libcrypto/ocsp/ocsp_cl.c b/src/lib/libcrypto/ocsp/ocsp_cl.c index 17bab5fc59..9c14d9da27 100644 --- a/src/lib/libcrypto/ocsp/ocsp_cl.c +++ b/src/lib/libcrypto/ocsp/ocsp_cl.c | |||
| @@ -155,7 +155,6 @@ int OCSP_request_sign(OCSP_REQUEST *req, | |||
| 155 | goto err; | 155 | goto err; |
| 156 | 156 | ||
| 157 | if (!(req->optionalSignature = sig = OCSP_SIGNATURE_new())) goto err; | 157 | if (!(req->optionalSignature = sig = OCSP_SIGNATURE_new())) goto err; |
| 158 | if (!dgst) dgst = EVP_sha1(); | ||
| 159 | if (key) | 158 | if (key) |
| 160 | { | 159 | { |
| 161 | if (!X509_check_private_key(signer, key)) | 160 | if (!X509_check_private_key(signer, key)) |