diff options
author | djm <> | 2012-10-13 21:23:50 +0000 |
---|---|---|
committer | djm <> | 2012-10-13 21:23:50 +0000 |
commit | 228cae30b117c2493f69ad3c195341cd6ec8d430 (patch) | |
tree | 29ff00b10d52c0978077c4fd83c33b065bade73e /src/lib/libcrypto/ts | |
parent | 731838c66b52c0ae5888333005b74115a620aa96 (diff) | |
download | openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.tar.gz openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.tar.bz2 openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.zip |
import OpenSSL-1.0.1c
Diffstat (limited to 'src/lib/libcrypto/ts')
-rw-r--r-- | src/lib/libcrypto/ts/ts.h | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/ts/ts_rsp_verify.c | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/ts/ts.h b/src/lib/libcrypto/ts/ts.h index 190e8a1bf2..c2448e3c3b 100644 --- a/src/lib/libcrypto/ts/ts.h +++ b/src/lib/libcrypto/ts/ts.h | |||
@@ -86,9 +86,6 @@ | |||
86 | #include <openssl/dh.h> | 86 | #include <openssl/dh.h> |
87 | #endif | 87 | #endif |
88 | 88 | ||
89 | #include <openssl/evp.h> | ||
90 | |||
91 | |||
92 | #ifdef __cplusplus | 89 | #ifdef __cplusplus |
93 | extern "C" { | 90 | extern "C" { |
94 | #endif | 91 | #endif |
diff --git a/src/lib/libcrypto/ts/ts_rsp_verify.c b/src/lib/libcrypto/ts/ts_rsp_verify.c index e1f3b534af..afe16afbe4 100644 --- a/src/lib/libcrypto/ts/ts_rsp_verify.c +++ b/src/lib/libcrypto/ts/ts_rsp_verify.c | |||
@@ -614,12 +614,15 @@ static int TS_compute_imprint(BIO *data, TS_TST_INFO *tst_info, | |||
614 | goto err; | 614 | goto err; |
615 | } | 615 | } |
616 | 616 | ||
617 | EVP_DigestInit(&md_ctx, md); | 617 | if (!EVP_DigestInit(&md_ctx, md)) |
618 | goto err; | ||
618 | while ((length = BIO_read(data, buffer, sizeof(buffer))) > 0) | 619 | while ((length = BIO_read(data, buffer, sizeof(buffer))) > 0) |
619 | { | 620 | { |
620 | EVP_DigestUpdate(&md_ctx, buffer, length); | 621 | if (!EVP_DigestUpdate(&md_ctx, buffer, length)) |
622 | goto err; | ||
621 | } | 623 | } |
622 | EVP_DigestFinal(&md_ctx, *imprint, NULL); | 624 | if (!EVP_DigestFinal(&md_ctx, *imprint, NULL)) |
625 | goto err; | ||
623 | 626 | ||
624 | return 1; | 627 | return 1; |
625 | err: | 628 | err: |