This commit was manufactured by cvs2svn to create branch

[openssl.git] / crypto / ts / ts_rsp_verify.c

diff --git a/crypto/ts/ts_rsp_verify.c b/crypto/ts/ts_rsp_verify.c
index dcc09bc16a4369dfbccf467d9ad208fbc34e83f2..afe16afbe454f7d1e38c7c651b81a30b60649479 100644 (file)
--- a/crypto/ts/ts_rsp_verify.c
+++ b/crypto/ts/ts_rsp_verify.c
@@ -70,7 +70,7 @@ static int TS_check_signing_certs(PKCS7_SIGNER_INFO *si, STACK_OF(X509) *chain);
 static ESS_SIGNING_CERT *ESS_get_signing_cert(PKCS7_SIGNER_INFO *si);
 static int TS_find_cert(STACK_OF(ESS_CERT_ID) *cert_ids, X509 *cert);
 static int TS_issuer_serial_cmp(ESS_ISSUER_SERIAL *is, X509_CINF *cinfo);
-static int _TS_RESP_verify_token(TS_VERIFY_CTX *ctx, 
+static int int_TS_RESP_verify_token(TS_VERIFY_CTX *ctx, 
                                 PKCS7 *token, TS_TST_INFO *tst_info);
 static int TS_check_status_info(TS_RESP *response);
 static char *TS_get_status_text(STACK_OF(ASN1_UTF8STRING) *text);
@@ -369,7 +369,7 @@ int TS_RESP_verify_response(TS_VERIFY_CTX *ctx, TS_RESP *response)
        if (!TS_check_status_info(response)) goto err;
 
        /* Check the contents of the time stamp token. */
-       if (!_TS_RESP_verify_token(ctx, token, tst_info))
+       if (!int_TS_RESP_verify_token(ctx, token, tst_info))
                goto err;
 
        ret = 1;
@@ -379,7 +379,7 @@ int TS_RESP_verify_response(TS_VERIFY_CTX *ctx, TS_RESP *response)
 
 /*
  * Tries to extract a TS_TST_INFO structure from the PKCS7 token and
- * calls the internal _TS_RESP_verify_token function for verifying it.
+ * calls the internal int_TS_RESP_verify_token function for verifying it.
  */
 int TS_RESP_verify_token(TS_VERIFY_CTX *ctx, PKCS7 *token)
        {
@@ -387,7 +387,7 @@ int TS_RESP_verify_token(TS_VERIFY_CTX *ctx, PKCS7 *token)
        int ret = 0;
        if (tst_info)
                {
-               ret = _TS_RESP_verify_token(ctx, token, tst_info);
+               ret = int_TS_RESP_verify_token(ctx, token, tst_info);
                TS_TST_INFO_free(tst_info);
                }
        return ret;
@@ -405,7 +405,7 @@ int TS_RESP_verify_token(TS_VERIFY_CTX *ctx, PKCS7 *token)
  *     - Check if the TSA name matches the signer.
  *     - Check if the TSA name is the expected TSA.
  */
-static int _TS_RESP_verify_token(TS_VERIFY_CTX *ctx, 
+static int int_TS_RESP_verify_token(TS_VERIFY_CTX *ctx, 
                                 PKCS7 *token, TS_TST_INFO *tst_info)
        {
        X509 *signer = NULL;
@@ -425,7 +425,7 @@ static int _TS_RESP_verify_token(TS_VERIFY_CTX *ctx,
        if ((ctx->flags & TS_VFY_VERSION)
            && TS_TST_INFO_get_version(tst_info) != 1)
                {
-               TSerr(TS_F_TS_VERIFY, TS_R_UNSUPPORTED_VERSION);
+               TSerr(TS_F_INT_TS_RESP_VERIFY_TOKEN, TS_R_UNSUPPORTED_VERSION);
                goto err;
                }
 
@@ -456,7 +456,7 @@ static int _TS_RESP_verify_token(TS_VERIFY_CTX *ctx,
        if ((ctx->flags & TS_VFY_SIGNER)
            && tsa_name && !TS_check_signer_name(tsa_name, signer))
                {
-               TSerr(TS_F_TS_RESP_VERIFY_TOKEN, TS_R_TSA_NAME_MISMATCH);
+               TSerr(TS_F_INT_TS_RESP_VERIFY_TOKEN, TS_R_TSA_NAME_MISMATCH);
                goto err;
                }
 
@@ -464,7 +464,7 @@ static int _TS_RESP_verify_token(TS_VERIFY_CTX *ctx,
        if ((ctx->flags & TS_VFY_TSA_NAME)
            && !TS_check_signer_name(ctx->tsa_name, signer))
                {
-               TSerr(TS_F_TS_RESP_VERIFY_TOKEN, TS_R_TSA_UNTRUSTED);
+               TSerr(TS_F_INT_TS_RESP_VERIFY_TOKEN, TS_R_TSA_UNTRUSTED);
                goto err;
                }
 
@@ -604,19 +604,25 @@ static int TS_compute_imprint(BIO *data, TS_TST_INFO *tst_info,
                }
 
        /* Compute message digest. */
-       *imprint_len = EVP_MD_size(md);
+       length = EVP_MD_size(md);
+       if (length < 0)
+           goto err;
+       *imprint_len = length;
        if (!(*imprint = OPENSSL_malloc(*imprint_len))) 
                {
                TSerr(TS_F_TS_COMPUTE_IMPRINT, ERR_R_MALLOC_FAILURE);
                goto err;
                }
 
-       EVP_DigestInit(&md_ctx, md);
+       if (!EVP_DigestInit(&md_ctx, md))
+               goto err;
        while ((length = BIO_read(data, buffer, sizeof(buffer))) > 0)
                {
-               EVP_DigestUpdate(&md_ctx, buffer, length);
+               if (!EVP_DigestUpdate(&md_ctx, buffer, length))
+                       goto err;
                }
-       EVP_DigestFinal(&md_ctx, *imprint, NULL);
+       if (!EVP_DigestFinal(&md_ctx, *imprint, NULL))
+               goto err;
 
        return 1;
  err: