mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

--enable-bump fixed

Browse Source
This commit is contained in:
kaleb-himes 2015-01-05 10:41:22 -07:00
parent db7f7c39e1
commit 15f021c074
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wolfcrypt/src/asn.c
View File

@ -6088,7 +6088,7 @@ int wc_MakeSelfCert(Cert* cert, byte* buffer, word32 buffSz, RsaKey* key, RNG* r
#ifdef WOLFSSL_ALT_NAMES #ifdef WOLFSSL_ALT_NAMES
/* Set Alt Names from der cert, return 0 on success */ /* 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; int ret;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@ -6377,18 +6377,18 @@ int wc_SetSubject(Cert* cert, const char* subjectFile)
#ifdef WOLFSSL_ALT_NAMES #ifdef WOLFSSL_ALT_NAMES
/* Set atl names from file in PEM */ /* 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 ret;
int derSz; int derSz;
byte* der = (byte*)XMALLOC(EIGHTK_BUF, NULL, DYNAMIC_TYPE_CERT); byte* der = (byte*)XMALLOC(EIGHTK_BUF, NULL, DYNAMIC_TYPE_CERT);
if (der == NULL) { if (der == NULL) {
WOLFSSL_MSG("SetAltNames OOF Problem"); WOLFSSL_MSG("wc_SetAltNames OOF Problem");
return MEMORY_E; return MEMORY_E;
} }
derSz = wolfSSL_PemCertToDer(file, der, EIGHTK_BUF); derSz = wolfSSL_PemCertToDer(file, der, EIGHTK_BUF);
ret = SetAltNamesFromCert(cert, der, derSz); ret = wc_SetAltNamesFromCert(cert, der, derSz);
XFREE(der, NULL, DYNAMIC_TYPE_CERT); XFREE(der, NULL, DYNAMIC_TYPE_CERT);
return ret; return ret;
@ -6416,13 +6416,13 @@ int wc_SetSubjectBuffer(Cert* cert, const byte* der, int derSz)
#ifdef WOLFSSL_ALT_NAMES #ifdef WOLFSSL_ALT_NAMES
/* Set cert alt names from DER buffer */ /* 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 */ /* 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); return SetDatesFromCert(cert, der, derSz);
} }

2
wolfcrypt/src/coding.c
View File

@ -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 static
const byte base64Encode[] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', const byte base64Encode[] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',