6 files changed, 62 insertions, 6 deletions

diff --git a/src/lib/libcrypto/ct/ct_b64.c b/src/lib/libcrypto/ct/ct_b64.c
index bfc69a7da3..101cd1e2b1 100644
--- a/src/lib/libcrypto/ct/ct_b64.c
+++ b/src/lib/libcrypto/ct/ct_b64.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ct_b64.c,v 1.6 2021/12/20 17:19:19 jsing Exp $ */
+/*      $OpenBSD: ct_b64.c,v 1.7 2023/07/08 07:22:58 beck Exp $ */
 /*
  * Written by Rob Stradling (rob@comodo.com) and Stephen Henson
  * (steve@openssl.org) for the OpenSSL project 2014.
@@ -180,6 +180,7 @@ SCT_new_from_base64(unsigned char version, const char *logid_base64,
         SCT_free(sct);
         return NULL;
 }
+LCRYPTO_ALIAS(SCT_new_from_base64);
 
 /*
  * Allocate, build and returns a new |ct_log| from input |pkey_base64|
@@ -222,3 +223,4 @@ CTLOG_new_from_base64(CTLOG **ct_log, const char *pkey_base64, const char *name)
 
         return 1;
 }
+LCRYPTO_ALIAS(CTLOG_new_from_base64);
diff --git a/src/lib/libcrypto/ct/ct_log.c b/src/lib/libcrypto/ct/ct_log.c
index f6e3aa25d5..eb503a3816 100644
--- a/src/lib/libcrypto/ct/ct_log.c
+++ b/src/lib/libcrypto/ct/ct_log.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ct_log.c,v 1.5 2021/12/18 16:34:52 tb Exp $ */
+/*      $OpenBSD: ct_log.c,v 1.6 2023/07/08 07:22:58 beck Exp $ */
 /* Author: Adam Eijdenberg <adam.eijdenberg@gmail.com>. */
 /* ====================================================================
  * Copyright (c) 1998-2016 The OpenSSL Project.  All rights reserved.
@@ -162,6 +162,7 @@ CTLOG_STORE_new(void)
         free(ret);
         return NULL;
 }
+LCRYPTO_ALIAS(CTLOG_STORE_new);
 
 void
 CTLOG_STORE_free(CTLOG_STORE *store)
@@ -171,6 +172,7 @@ CTLOG_STORE_free(CTLOG_STORE *store)
                 free(store);
         }
 }
+LCRYPTO_ALIAS(CTLOG_STORE_free);
 
 static int
 ctlog_new_from_conf(CTLOG **ct_log, const CONF *conf, const char *section)
@@ -198,6 +200,7 @@ CTLOG_STORE_load_default_file(CTLOG_STORE *store)
 {
         return CTLOG_STORE_load_file(store, CTLOG_FILE);
 }
+LCRYPTO_ALIAS(CTLOG_STORE_load_default_file);
 
 /*
  * Called by CONF_parse_list, which stops if this returns <= 0,
@@ -283,6 +286,7 @@ CTLOG_STORE_load_file(CTLOG_STORE *store, const char *file)
         ctlog_store_load_ctx_free(load_ctx);
         return ret;
 }
+LCRYPTO_ALIAS(CTLOG_STORE_load_file);
 
 /*
  * Initialize a new CTLOG object.
@@ -314,6 +318,7 @@ CTLOG_new(EVP_PKEY *public_key, const char *name)
         CTLOG_free(ret);
         return NULL;
 }
+LCRYPTO_ALIAS(CTLOG_new);
 
 /* Frees CT log and associated structures */
 void
@@ -325,12 +330,14 @@ CTLOG_free(CTLOG *log)
                 free(log);
         }
 }
+LCRYPTO_ALIAS(CTLOG_free);
 
 const char *
 CTLOG_get0_name(const CTLOG *log)
 {
         return log->name;
 }
+LCRYPTO_ALIAS(CTLOG_get0_name);
 
 void
 CTLOG_get0_log_id(const CTLOG *log, const uint8_t **log_id, size_t *log_id_len)
@@ -338,12 +345,14 @@ CTLOG_get0_log_id(const CTLOG *log, const uint8_t **log_id, size_t *log_id_len)
         *log_id = log->log_id;
         *log_id_len = CT_V1_HASHLEN;
 }
+LCRYPTO_ALIAS(CTLOG_get0_log_id);
 
 EVP_PKEY *
 CTLOG_get0_public_key(const CTLOG *log)
 {
         return log->public_key;
 }
+LCRYPTO_ALIAS(CTLOG_get0_public_key);
 
 /*
  * Given a log ID, finds the matching log.
@@ -363,3 +372,4 @@ CTLOG_STORE_get0_log_by_id(const CTLOG_STORE *store, const uint8_t *log_id,
 
         return NULL;
 }
+LCRYPTO_ALIAS(CTLOG_STORE_get0_log_by_id);
diff --git a/src/lib/libcrypto/ct/ct_oct.c b/src/lib/libcrypto/ct/ct_oct.c
index 94e67c6bc3..1f5e5c75d0 100644
--- a/src/lib/libcrypto/ct/ct_oct.c
+++ b/src/lib/libcrypto/ct/ct_oct.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ct_oct.c,v 1.8 2021/12/20 17:23:07 jsing Exp $ */
+/*      $OpenBSD: ct_oct.c,v 1.9 2023/07/08 07:22:58 beck Exp $ */
 /*
  * Written by Rob Stradling (rob@comodo.com) and Stephen Henson
  * (steve@openssl.org) for the OpenSSL project 2014.
@@ -208,6 +208,7 @@ o2i_SCT(SCT **psct, const unsigned char **in, size_t len)
 
         return sct;
 }
+LCRYPTO_ALIAS(o2i_SCT);
 
 int
 i2o_SCT_signature(const SCT *sct, unsigned char **out)
@@ -314,6 +315,7 @@ i2o_SCT(const SCT *sct, unsigned char **out)
         free(pstart);
         return -1;
 }
+LCRYPTO_ALIAS(i2o_SCT);
 
 STACK_OF(SCT) *
 o2i_SCT_LIST(STACK_OF(SCT) **out_scts, const unsigned char **pp, size_t len)
@@ -366,6 +368,7 @@ o2i_SCT_LIST(STACK_OF(SCT) **out_scts, const unsigned char **pp, size_t len)
 
         return NULL;
 }
+LCRYPTO_ALIAS(o2i_SCT_LIST);
 
 int
 i2o_SCT_LIST(const STACK_OF(SCT) *a, unsigned char **pp)
@@ -422,6 +425,7 @@ i2o_SCT_LIST(const STACK_OF(SCT) *a, unsigned char **pp)
         }
         return -1;
 }
+LCRYPTO_ALIAS(i2o_SCT_LIST);
 
 STACK_OF(SCT) *
 d2i_SCT_LIST(STACK_OF(SCT) **a, const unsigned char **pp, long len)
@@ -441,6 +445,7 @@ d2i_SCT_LIST(STACK_OF(SCT) **a, const unsigned char **pp, long len)
         ASN1_OCTET_STRING_free(oct);
         return sk;
 }
+LCRYPTO_ALIAS(d2i_SCT_LIST);
 
 int
 i2d_SCT_LIST(const STACK_OF(SCT) *a, unsigned char **out)
@@ -456,3 +461,4 @@ i2d_SCT_LIST(const STACK_OF(SCT) *a, unsigned char **out)
         free(oct.data);
         return len;
 }
+LCRYPTO_ALIAS(i2d_SCT_LIST);
diff --git a/src/lib/libcrypto/ct/ct_policy.c b/src/lib/libcrypto/ct/ct_policy.c
index 2cb3e69333..eb2b312019 100644
--- a/src/lib/libcrypto/ct/ct_policy.c
+++ b/src/lib/libcrypto/ct/ct_policy.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ct_policy.c,v 1.5 2021/12/18 16:34:52 tb Exp $ */
+/*      $OpenBSD: ct_policy.c,v 1.6 2023/07/08 07:22:58 beck Exp $ */
 /*
  * Implementations of Certificate Transparency SCT policies.
  * Written by Rob Percival (robpercival@google.com) for the OpenSSL project.
@@ -86,6 +86,7 @@ CT_POLICY_EVAL_CTX_new(void)
 
         return ctx;
 }
+LCRYPTO_ALIAS(CT_POLICY_EVAL_CTX_new);
 
 void
 CT_POLICY_EVAL_CTX_free(CT_POLICY_EVAL_CTX *ctx)
@@ -96,6 +97,7 @@ CT_POLICY_EVAL_CTX_free(CT_POLICY_EVAL_CTX *ctx)
         X509_free(ctx->issuer);
         free(ctx);
 }
+LCRYPTO_ALIAS(CT_POLICY_EVAL_CTX_free);
 
 int
 CT_POLICY_EVAL_CTX_set1_cert(CT_POLICY_EVAL_CTX *ctx, X509 *cert)
@@ -105,6 +107,7 @@ CT_POLICY_EVAL_CTX_set1_cert(CT_POLICY_EVAL_CTX *ctx, X509 *cert)
         ctx->cert = cert;
         return 1;
 }
+LCRYPTO_ALIAS(CT_POLICY_EVAL_CTX_set1_cert);
 
 int
 CT_POLICY_EVAL_CTX_set1_issuer(CT_POLICY_EVAL_CTX *ctx, X509 *issuer)
@@ -114,6 +117,7 @@ CT_POLICY_EVAL_CTX_set1_issuer(CT_POLICY_EVAL_CTX *ctx, X509 *issuer)
         ctx->issuer = issuer;
         return 1;
 }
+LCRYPTO_ALIAS(CT_POLICY_EVAL_CTX_set1_issuer);
 
 void
 CT_POLICY_EVAL_CTX_set_shared_CTLOG_STORE(CT_POLICY_EVAL_CTX *ctx,
@@ -121,33 +125,39 @@ CT_POLICY_EVAL_CTX_set_shared_CTLOG_STORE(CT_POLICY_EVAL_CTX *ctx,
 {
         ctx->log_store = log_store;
 }
+LCRYPTO_ALIAS(CT_POLICY_EVAL_CTX_set_shared_CTLOG_STORE);
 
 void
 CT_POLICY_EVAL_CTX_set_time(CT_POLICY_EVAL_CTX *ctx, uint64_t time_in_ms)
 {
         ctx->epoch_time_in_ms = time_in_ms;
 }
+LCRYPTO_ALIAS(CT_POLICY_EVAL_CTX_set_time);
 
 X509 *
 CT_POLICY_EVAL_CTX_get0_cert(const CT_POLICY_EVAL_CTX *ctx)
 {
         return ctx->cert;
 }
+LCRYPTO_ALIAS(CT_POLICY_EVAL_CTX_get0_cert);
 
 X509 *
 CT_POLICY_EVAL_CTX_get0_issuer(const CT_POLICY_EVAL_CTX *ctx)
 {
         return ctx->issuer;
 }
+LCRYPTO_ALIAS(CT_POLICY_EVAL_CTX_get0_issuer);
 
 const CTLOG_STORE *
 CT_POLICY_EVAL_CTX_get0_log_store(const CT_POLICY_EVAL_CTX *ctx)
 {
         return ctx->log_store;
 }
+LCRYPTO_ALIAS(CT_POLICY_EVAL_CTX_get0_log_store);
 
 uint64_t
 CT_POLICY_EVAL_CTX_get_time(const CT_POLICY_EVAL_CTX *ctx)
 {
         return ctx->epoch_time_in_ms;
 }
+LCRYPTO_ALIAS(CT_POLICY_EVAL_CTX_get_time);
diff --git a/src/lib/libcrypto/ct/ct_prn.c b/src/lib/libcrypto/ct/ct_prn.c
index ea4f3b2474..e6931eeb09 100644
--- a/src/lib/libcrypto/ct/ct_prn.c
+++ b/src/lib/libcrypto/ct/ct_prn.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ct_prn.c,v 1.6 2021/12/18 16:34:52 tb Exp $ */
+/*      $OpenBSD: ct_prn.c,v 1.7 2023/07/08 07:22:58 beck Exp $ */
 /*
  * Written by Rob Stradling (rob@comodo.com) and Stephen Henson
  * (steve@openssl.org) for the OpenSSL project 2014.
@@ -146,6 +146,7 @@ SCT_validation_status_string(const SCT *sct)
         }
         return "unknown status";
 }
+LCRYPTO_ALIAS(SCT_validation_status_string);
 
 void
 SCT_print(const SCT *sct, BIO *out, int indent, const CTLOG_STORE *log_store)
@@ -190,6 +191,7 @@ SCT_print(const SCT *sct, BIO *out, int indent, const CTLOG_STORE *log_store)
         BIO_printf(out, "\n%*s            ", indent + 4, "");
         BIO_hex_string(out, indent + 16, 16, sct->sig, sct->sig_len);
 }
+LCRYPTO_ALIAS(SCT_print);
 
 void
 SCT_LIST_print(const STACK_OF(SCT) *sct_list, BIO *out, int indent,
@@ -206,3 +208,4 @@ SCT_LIST_print(const STACK_OF(SCT) *sct_list, BIO *out, int indent,
                         BIO_printf(out, "%s", separator);
         }
 }
+LCRYPTO_ALIAS(SCT_LIST_print);
diff --git a/src/lib/libcrypto/ct/ct_sct.c b/src/lib/libcrypto/ct/ct_sct.c
index a05b0f92a2..16ee8d5576 100644
--- a/src/lib/libcrypto/ct/ct_sct.c
+++ b/src/lib/libcrypto/ct/ct_sct.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ct_sct.c,v 1.8 2022/01/22 00:29:59 inoguchi Exp $ */
+/*      $OpenBSD: ct_sct.c,v 1.9 2023/07/08 07:22:58 beck Exp $ */
 /*
  * Written by Rob Stradling (rob@comodo.com), Stephen Henson (steve@openssl.org)
  * and Adam Eijdenberg (adam.eijdenberg@gmail.com) for the OpenSSL project 2016.
@@ -85,6 +85,7 @@ SCT_new(void)
         sct->version = SCT_VERSION_NOT_SET;
         return sct;
 }
+LCRYPTO_ALIAS(SCT_new);
 
 void
 SCT_free(SCT *sct)
@@ -98,12 +99,14 @@ SCT_free(SCT *sct)
         free(sct->sct);
         free(sct);
 }
+LCRYPTO_ALIAS(SCT_free);
 
 void
 SCT_LIST_free(STACK_OF(SCT) *scts)
 {
         sk_SCT_pop_free(scts, SCT_free);
 }
+LCRYPTO_ALIAS(SCT_LIST_free);
 
 int
 SCT_set_version(SCT *sct, sct_version_t version)
@@ -116,6 +119,7 @@ SCT_set_version(SCT *sct, sct_version_t version)
         sct->validation_status = SCT_VALIDATION_STATUS_NOT_SET;
         return 1;
 }
+LCRYPTO_ALIAS(SCT_set_version);
 
 int
 SCT_set_log_entry_type(SCT *sct, ct_log_entry_type_t entry_type)
@@ -133,6 +137,7 @@ SCT_set_log_entry_type(SCT *sct, ct_log_entry_type_t entry_type)
         CTerror(CT_R_UNSUPPORTED_ENTRY_TYPE);
         return 0;
 }
+LCRYPTO_ALIAS(SCT_set_log_entry_type);
 
 int
 SCT_set0_log_id(SCT *sct, unsigned char *log_id, size_t log_id_len)
@@ -148,6 +153,7 @@ SCT_set0_log_id(SCT *sct, unsigned char *log_id, size_t log_id_len)
         sct->validation_status = SCT_VALIDATION_STATUS_NOT_SET;
         return 1;
 }
+LCRYPTO_ALIAS(SCT_set0_log_id);
 
 int
 SCT_set1_log_id(SCT *sct, const unsigned char *log_id, size_t log_id_len)
@@ -173,6 +179,7 @@ SCT_set1_log_id(SCT *sct, const unsigned char *log_id, size_t log_id_len)
         }
         return 1;
 }
+LCRYPTO_ALIAS(SCT_set1_log_id);
 
 
 void
@@ -181,6 +188,7 @@ SCT_set_timestamp(SCT *sct, uint64_t timestamp)
         sct->timestamp = timestamp;
         sct->validation_status = SCT_VALIDATION_STATUS_NOT_SET;
 }
+LCRYPTO_ALIAS(SCT_set_timestamp);
 
 int
 SCT_set_signature_nid(SCT *sct, int nid)
@@ -201,6 +209,7 @@ SCT_set_signature_nid(SCT *sct, int nid)
                 return 0;
         }
 }
+LCRYPTO_ALIAS(SCT_set_signature_nid);
 
 void
 SCT_set0_extensions(SCT *sct, unsigned char *ext, size_t ext_len)
@@ -210,6 +219,7 @@ SCT_set0_extensions(SCT *sct, unsigned char *ext, size_t ext_len)
         sct->ext_len = ext_len;
         sct->validation_status = SCT_VALIDATION_STATUS_NOT_SET;
 }
+LCRYPTO_ALIAS(SCT_set0_extensions);
 
 int
 SCT_set1_extensions(SCT *sct, const unsigned char *ext, size_t ext_len)
@@ -230,6 +240,7 @@ SCT_set1_extensions(SCT *sct, const unsigned char *ext, size_t ext_len)
         }
         return 1;
 }
+LCRYPTO_ALIAS(SCT_set1_extensions);
 
 void
 SCT_set0_signature(SCT *sct, unsigned char *sig, size_t sig_len)
@@ -239,6 +250,7 @@ SCT_set0_signature(SCT *sct, unsigned char *sig, size_t sig_len)
         sct->sig_len = sig_len;
         sct->validation_status = SCT_VALIDATION_STATUS_NOT_SET;
 }
+LCRYPTO_ALIAS(SCT_set0_signature);
 
 int
 SCT_set1_signature(SCT *sct, const unsigned char *sig, size_t sig_len)
@@ -259,18 +271,21 @@ SCT_set1_signature(SCT *sct, const unsigned char *sig, size_t sig_len)
         }
         return 1;
 }
+LCRYPTO_ALIAS(SCT_set1_signature);
 
 sct_version_t
 SCT_get_version(const SCT *sct)
 {
         return sct->version;
 }
+LCRYPTO_ALIAS(SCT_get_version);
 
 ct_log_entry_type_t
 SCT_get_log_entry_type(const SCT *sct)
 {
         return sct->entry_type;
 }
+LCRYPTO_ALIAS(SCT_get_log_entry_type);
 
 size_t
 SCT_get0_log_id(const SCT *sct, unsigned char **log_id)
@@ -278,12 +293,14 @@ SCT_get0_log_id(const SCT *sct, unsigned char **log_id)
         *log_id = sct->log_id;
         return sct->log_id_len;
 }
+LCRYPTO_ALIAS(SCT_get0_log_id);
 
 uint64_t
 SCT_get_timestamp(const SCT *sct)
 {
         return sct->timestamp;
 }
+LCRYPTO_ALIAS(SCT_get_timestamp);
 
 int
 SCT_get_signature_nid(const SCT *sct)
@@ -303,6 +320,7 @@ SCT_get_signature_nid(const SCT *sct)
         }
         return NID_undef;
 }
+LCRYPTO_ALIAS(SCT_get_signature_nid);
 
 size_t
 SCT_get0_extensions(const SCT *sct, unsigned char **ext)
@@ -310,6 +328,7 @@ SCT_get0_extensions(const SCT *sct, unsigned char **ext)
         *ext = sct->ext;
         return sct->ext_len;
 }
+LCRYPTO_ALIAS(SCT_get0_extensions);
 
 size_t
 SCT_get0_signature(const SCT *sct, unsigned char **sig)
@@ -317,6 +336,7 @@ SCT_get0_signature(const SCT *sct, unsigned char **sig)
         *sig = sct->sig;
         return sct->sig_len;
 }
+LCRYPTO_ALIAS(SCT_get0_signature);
 
 int
 SCT_is_complete(const SCT *sct)
@@ -343,6 +363,7 @@ SCT_get_source(const SCT *sct)
 {
         return sct->source;
 }
+LCRYPTO_ALIAS(SCT_get_source);
 
 int
 SCT_set_source(SCT *sct, sct_source_t source)
@@ -361,12 +382,14 @@ SCT_set_source(SCT *sct, sct_source_t source)
         /* if we aren't sure, leave the log entry type alone */
         return 1;
 }
+LCRYPTO_ALIAS(SCT_set_source);
 
 sct_validation_status_t
 SCT_get_validation_status(const SCT *sct)
 {
         return sct->validation_status;
 }
+LCRYPTO_ALIAS(SCT_get_validation_status);
 
 int
 SCT_validate(SCT *sct, const CT_POLICY_EVAL_CTX *ctx)
@@ -455,6 +478,7 @@ SCT_validate(SCT *sct, const CT_POLICY_EVAL_CTX *ctx)
 
         return is_sct_valid;
 }
+LCRYPTO_ALIAS(SCT_validate);
 
 int
 SCT_LIST_validate(const STACK_OF(SCT) *scts, CT_POLICY_EVAL_CTX *ctx)
@@ -478,3 +502,4 @@ SCT_LIST_validate(const STACK_OF(SCT) *scts, CT_POLICY_EVAL_CTX *ctx)
 
         return are_scts_valid;
 }
+LCRYPTO_ALIAS(SCT_LIST_validate);