From 15f021c074a3299b34525942271f2bdfae748e38 Mon Sep 17 00:00:00 2001
From: kaleb-himes <kaleb.himes@gmail.com>
Date: Mon, 5 Jan 2015 10:41:22 -0700
Subject: [PATCH] --enable-bump fixed

---
 wolfcrypt/src/asn.c    | 14 +++++++-------
 wolfcrypt/src/coding.c |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index 28337f310..80f3f0506 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -6088,7 +6088,7 @@ int wc_MakeSelfCert(Cert* cert, byte* buffer, word32 buffSz, RsaKey* key, RNG* r
 #ifdef WOLFSSL_ALT_NAMES 
 
 /* Set Alt Names from der cert, return 0 on success */
-static int SetAltNamesFromCert(Cert* cert, const byte* der, int derSz)
+static int wc_SetAltNamesFromCert(Cert* cert, const byte* der, int derSz)
 {
     int ret;
 #ifdef WOLFSSL_SMALL_STACK
@@ -6377,18 +6377,18 @@ int wc_SetSubject(Cert* cert, const char* subjectFile)
 #ifdef WOLFSSL_ALT_NAMES
 
 /* Set atl names from file in PEM */
-int SetAltNames(Cert* cert, const char* file)
+int wc_SetAltNames(Cert* cert, const char* file)
 {
     int         ret;
     int         derSz;
     byte*       der = (byte*)XMALLOC(EIGHTK_BUF, NULL, DYNAMIC_TYPE_CERT);
 
     if (der == NULL) {
-        WOLFSSL_MSG("SetAltNames OOF Problem");
+        WOLFSSL_MSG("wc_SetAltNames OOF Problem");
         return MEMORY_E;
     }
     derSz = wolfSSL_PemCertToDer(file, der, EIGHTK_BUF);
-    ret = SetAltNamesFromCert(cert, der, derSz);
+    ret = wc_SetAltNamesFromCert(cert, der, derSz);
     XFREE(der, NULL, DYNAMIC_TYPE_CERT);
 
     return ret;
@@ -6416,13 +6416,13 @@ int wc_SetSubjectBuffer(Cert* cert, const byte* der, int derSz)
 #ifdef WOLFSSL_ALT_NAMES
 
 /* Set cert alt names from DER buffer */
-int SetAltNamesBuffer(Cert* cert, const byte* der, int derSz)
+int wc_SetAltNamesBuffer(Cert* cert, const byte* der, int derSz)
 {
-    return SetAltNamesFromCert(cert, der, derSz);
+    return wc_SetAltNamesFromCert(cert, der, derSz);
 }
 
 /* Set cert dates from DER buffer */
-int SetDatesBuffer(Cert* cert, const byte* der, int derSz)
+int wc_SetDatesBuffer(Cert* cert, const byte* der, int derSz)
 {
     return SetDatesFromCert(cert, der, derSz);
 }
diff --git a/wolfcrypt/src/coding.c b/wolfcrypt/src/coding.c
index ffffa4eaf..f4096c82f 100644
--- a/wolfcrypt/src/coding.c
+++ b/wolfcrypt/src/coding.c
@@ -133,7 +133,7 @@ int Base64_Decode(const byte* in, word32 inLen, byte* out, word32* outLen)
 }
 
 
-#if defined(OPENSSL_EXTRA) || defined (SESSION_CERTS) || defined(WOLFSSL_KEY_GEN) || defined(CYASSL_CERT_GEN) || defined(HAVE_WEBSERVER)
+#if defined(OPENSSL_EXTRA) || defined (SESSION_CERTS) || defined(WOLFSSL_KEY_GEN) || defined(WOLFSSL_CERT_GEN) || defined(HAVE_WEBSERVER)
 
 static
 const byte base64Encode[] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',