Make these files compile - not hooked up to build yet.

ok jsing@ tb@

1 files changed, 8 insertions, 6 deletions

diff --git a/src/lib/libcrypto/ct/ct_vfy.c b/src/lib/libcrypto/ct/ct_vfy.c
index 74642a9304..bde3534c97 100644
--- a/src/lib/libcrypto/ct/ct_vfy.c
+++ b/src/lib/libcrypto/ct/ct_vfy.c
@@ -32,6 +32,7 @@ sct_ctx_update(EVP_MD_CTX *ctx, const SCT_CTX *sctx, const SCT *sct)
         unsigned char tmpbuf[12];
         unsigned char *p, *der;
         size_t derlen;
+
         /*+
          * digitally-signed struct {
          *   (1 byte) Version sct_version;
@@ -102,21 +103,22 @@ SCT_CTX_verify(const SCT_CTX *sctx, const SCT *sct)
 
         if (!SCT_is_complete(sct) || sctx->pkey == NULL ||
             sct->entry_type == CT_LOG_ENTRY_TYPE_NOT_SET ||
-            (sct->entry_type == CT_LOG_ENTRY_TYPE_PRECERT && sctx->ihash == NULL)) {
-                CTerr(CT_F_SCT_CTX_VERIFY, CT_R_SCT_NOT_SET);
+            (sct->entry_type == CT_LOG_ENTRY_TYPE_PRECERT &&
+            sctx->ihash == NULL)) {
+                CTerror(CT_R_SCT_NOT_SET);
                 return 0;
         }
         if (sct->version != SCT_VERSION_V1) {
-                CTerr(CT_F_SCT_CTX_VERIFY, CT_R_SCT_UNSUPPORTED_VERSION);
+                CTerror(CT_R_SCT_UNSUPPORTED_VERSION);
                 return 0;
         }
         if (sct->log_id_len != sctx->pkeyhashlen ||
             memcmp(sct->log_id, sctx->pkeyhash, sctx->pkeyhashlen) != 0) {
-                CTerr(CT_F_SCT_CTX_VERIFY, CT_R_SCT_LOG_ID_MISMATCH);
+                CTerror(CT_R_SCT_LOG_ID_MISMATCH);
                 return 0;
         }
         if (sct->timestamp > sctx->epoch_time_in_ms) {
-                CTerr(CT_F_SCT_CTX_VERIFY, CT_R_SCT_FUTURE_TIMESTAMP);
+                CTerror(CT_R_SCT_FUTURE_TIMESTAMP);
                 return 0;
         }
 
@@ -134,7 +136,7 @@ SCT_CTX_verify(const SCT_CTX *sctx, const SCT *sct)
         ret = EVP_DigestVerifyFinal(ctx, sct->sig, sct->sig_len);
         /* If ret < 0 some other error: fall through without setting error */
         if (ret == 0)
-                CTerr(CT_F_SCT_CTX_VERIFY, CT_R_SCT_INVALID_SIGNATURE);
+                CTerror(CT_R_SCT_INVALID_SIGNATURE);
 
  end:
         EVP_MD_CTX_free(ctx);