wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-04 05:04:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for clang builds with configs not using inline funcs

Browse Source
This commit is contained in:
Sean Parkinson
2018-08-22 11:16:57 +10:00
parent 776fd51720
commit 31bd844d6f
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/internal.c
View File

@@ -199,6 +199,7 @@ static WC_INLINE int IsEncryptionOn(WOLFSSL* ssl, int isSend)
} }
#if defined(WOLFSSL_DTLS) || !defined(WOLFSSL_NO_TLS12)
/* If SCTP is not enabled returns the state of the dtls option. /* If SCTP is not enabled returns the state of the dtls option.
* If SCTP is enabled returns dtls && !sctp. */ * If SCTP is enabled returns dtls && !sctp. */
static WC_INLINE int IsDtlsNotSctpMode(WOLFSSL* ssl) static WC_INLINE int IsDtlsNotSctpMode(WOLFSSL* ssl)
@@ -213,6 +214,7 @@ static WC_INLINE int IsDtlsNotSctpMode(WOLFSSL* ssl)
return result; return result;
} }
#endif /* DTLS || !WOLFSSL_NO_TLS12 */
#ifdef HAVE_QSH #ifdef HAVE_QSH
@@ -2902,6 +2904,7 @@ void FreeX509(WOLFSSL_X509* x509)
#if !defined(NO_WOLFSSL_SERVER) || !defined(NO_WOLFSSL_CLIENT) #if !defined(NO_WOLFSSL_SERVER) || !defined(NO_WOLFSSL_CLIENT)
#if !defined(WOLFSSL_NO_TLS12) && !defined(WOLFSSL_NO_CLIENT_AUTH)
/* Encode the signature algorithm into buffer. /* Encode the signature algorithm into buffer.
* *
* hashalgo The hash algorithm. * hashalgo The hash algorithm.
@@ -2943,7 +2946,6 @@ static WC_INLINE void EncodeSigAlg(byte hashAlgo, byte hsType, byte* output)
(void)output; (void)output;
} }
#if !defined(WOLFSSL_NO_TLS12) && !defined(WOLFSSL_NO_CLIENT_AUTH)
static void SetDigest(WOLFSSL* ssl, int hashAlgo) static void SetDigest(WOLFSSL* ssl, int hashAlgo)
{ {
switch (hashAlgo) { switch (hashAlgo) {
@@ -5485,6 +5487,8 @@ void FreeSSL(WOLFSSL* ssl, void* heap)
#if !defined(NO_OLD_TLS) || defined(WOLFSSL_DTLS) || \ #if !defined(NO_OLD_TLS) || defined(WOLFSSL_DTLS) || \
((defined(HAVE_CHACHA) || defined(HAVE_AESCCM) || defined(HAVE_AESGCM)) \ ((defined(HAVE_CHACHA) || defined(HAVE_AESCCM) || defined(HAVE_AESGCM)) \
&& defined(HAVE_AEAD)) && defined(HAVE_AEAD))
#if defined(WOLFSSL_DTLS) || !defined(WOLFSSL_NO_TLS12)
static WC_INLINE void GetSEQIncrement(WOLFSSL* ssl, int verify, word32 seq[2]) static WC_INLINE void GetSEQIncrement(WOLFSSL* ssl, int verify, word32 seq[2])
{ {
if (verify) { if (verify) {
@@ -5504,6 +5508,7 @@ static WC_INLINE void GetSEQIncrement(WOLFSSL* ssl, int verify, word32 seq[2])
} }
} }
} }
#endif /* WOLFSSL_DTLS || !WOLFSSL_NO_TLS12 */
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
@@ -5579,7 +5584,7 @@ static WC_INLINE void DtlsSEQIncrement(WOLFSSL* ssl, int order)
} }
#endif /* WOLFSSL_DTLS */ #endif /* WOLFSSL_DTLS */
#if defined(WOLFSSL_DTLS) || !defined(WOLFSSL_NO_TLS12)
static WC_INLINE void WriteSEQ(WOLFSSL* ssl, int verifyOrder, byte* out) static WC_INLINE void WriteSEQ(WOLFSSL* ssl, int verifyOrder, byte* out)
{ {
word32 seq[2] = {0, 0}; word32 seq[2] = {0, 0};
@@ -5596,7 +5601,9 @@ static WC_INLINE void WriteSEQ(WOLFSSL* ssl, int verifyOrder, byte* out)
c32toa(seq[0], out); c32toa(seq[0], out);
c32toa(seq[1], out + OPAQUE32_LEN); c32toa(seq[1], out + OPAQUE32_LEN);
} }
#endif #endif /* WOLFSSL_DTLS || !WOLFSSL_NO_TLS12 */
#endif /* !NO_OLD_TLS || WOLFSSL_DTLS ||
* ((HAVE_CHACHA || HAVE_AESCCM || HAVE_AESGCM) && HAVE_AEAD) */
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS

2
src/ssl.c
View File

@@ -8715,6 +8715,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
} }
#endif #endif
#if defined(WOLFSSL_DTLS) || !defined(WOLFSSL_NO_TLS12)
/* If SCTP is not enabled returns the state of the dtls option. /* If SCTP is not enabled returns the state of the dtls option.
* If SCTP is enabled returns dtls && !sctp. */ * If SCTP is enabled returns dtls && !sctp. */
static WC_INLINE int IsDtlsNotSctpMode(WOLFSSL* ssl) static WC_INLINE int IsDtlsNotSctpMode(WOLFSSL* ssl)
@@ -8729,6 +8730,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
return result; return result;
} }
#endif /* WOLFSSL_DTLS || !WOLFSSL_NO_TLS12 */
/* please see note at top of README if you get an error from connect */ /* please see note at top of README if you get an error from connect */

2
wolfcrypt/src/aes.c
View File

@@ -1283,6 +1283,7 @@ static const word32 Td[4][256] = {
}; };
#if defined(HAVE_AES_CBC) || defined(WOLFSSL_AES_DIRECT)
static const byte Td4[256] = static const byte Td4[256] =
{ {
0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U, 0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U,
@@ -1318,6 +1319,7 @@ static const byte Td4[256] =
0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U, 0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U,
0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU, 0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU,
}; };
#endif /* HAVE_AES_CBC || WOLFSSL_AES_DIRECT */
#endif /* HAVE_AES_DECRYPT */ #endif /* HAVE_AES_DECRYPT */
#define GETBYTE(x, y) (word32)((byte)((x) >> (8 * (y)))) #define GETBYTE(x, y) (word32)((byte)((x) >> (8 * (y))))