From b0aaf4a23d607984f419f4da7a95d68d97393516 Mon Sep 17 00:00:00 2001
From: Uriah Pollock <uriah@wolfssl.com>
Date: Mon, 8 Aug 2022 10:16:05 -0500
Subject: [PATCH] Minor ABI updates.

---
 wolfcrypt/src/asn.c            | 1 +
 wolfcrypt/src/random.c         | 3 ++-
 wolfssl/wolfcrypt/asn_public.h | 2 +-
 wolfssl/wolfcrypt/ecc.h        | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index 99c9abb30..2aaa7e31c 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -22314,6 +22314,7 @@ static word32 SetUTF8String(word32 len, byte* output)
 /* wc_SetCert_Free is only public when WOLFSSL_CERT_GEN_CACHE is not defined */
 static
 #endif
+WOLFSSL_ABI
 void wc_SetCert_Free(Cert* cert)
 {
     if (cert != NULL) {
diff --git a/wolfcrypt/src/random.c b/wolfcrypt/src/random.c
index 2407e805b..05de07d80 100644
--- a/wolfcrypt/src/random.c
+++ b/wolfcrypt/src/random.c
@@ -70,6 +70,7 @@ int wc_InitRng_ex(WC_RNG* rng, void* heap, int devId)
     return InitRng_fips(rng);
 }
 
+WOLFSSL_ABI
 int wc_InitRng(WC_RNG* rng)
 {
     return InitRng_fips(rng);
@@ -951,7 +952,7 @@ void wc_rng_free(WC_RNG* rng)
     }
 }
 
-
+WOLFSSL_ABI
 int wc_InitRng(WC_RNG* rng)
 {
     return _InitRng(rng, NULL, 0, NULL, INVALID_DEVID);
diff --git a/wolfssl/wolfcrypt/asn_public.h b/wolfssl/wolfcrypt/asn_public.h
index da508799a..b487c4f41 100644
--- a/wolfssl/wolfcrypt/asn_public.h
+++ b/wolfssl/wolfcrypt/asn_public.h
@@ -504,7 +504,7 @@ WOLFSSL_API int wc_SetSubject(Cert* cert, const char* subjectFile);
 #endif
 
 #ifdef WOLFSSL_CERT_GEN_CACHE
-WOLFSSL_API void wc_SetCert_Free(Cert* cert);
+WOLFSSL_ABI WOLFSSL_API void wc_SetCert_Free(Cert* cert);
 #endif
 
 WOLFSSL_API int wc_SetIssuerBuffer(Cert* cert, const byte* der, int derSz);
diff --git a/wolfssl/wolfcrypt/ecc.h b/wolfssl/wolfcrypt/ecc.h
index 8fccf494a..d25e4fb4b 100644
--- a/wolfssl/wolfcrypt/ecc.h
+++ b/wolfssl/wolfcrypt/ecc.h
@@ -627,7 +627,7 @@ int wc_ecc_verify_hash_ex(mp_int *r, mp_int *s, const byte* hash,
                           word32 hashlen, int* res, ecc_key* key);
 #endif /* HAVE_ECC_VERIFY */
 
-WOLFSSL_API
+WOLFSSL_ABI WOLFSSL_API
 int wc_ecc_init(ecc_key* key);
 WOLFSSL_ABI WOLFSSL_API
 int wc_ecc_init_ex(ecc_key* key, void* heap, int devId);