wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-02-03 23:45:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

wrapped the min() inline functions with better preprocessor checks

Browse Source
This commit is contained in:
John Safranek
2015-05-13 14:53:11 -07:00
parent 69b4b37e86
commit 4e482a348e
16 changed files with 60 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wolfcrypt/src/asn.c
View File

@@ -4773,14 +4773,15 @@ int wc_RsaKeyToDer(RsaKey* key, byte* output, word32 inLen)
#if defined(WOLFSSL_CERT_GEN) && !defined(NO_RSA)
#ifndef min
#ifndef WOLFSSL_HAVE_MIN
#define WOLFSSL_HAVE_MIN
static INLINE word32 min(word32 a, word32 b)
{
return a > b ? b : a;
}
#endif /* min */
#endif /* WOLFSSL_HAVE_MIN */
/* Initialize and Set Certficate defaults:

5
wolfcrypt/src/dh.c
View File

@@ -39,14 +39,15 @@
#endif
#ifndef min
#ifndef WOLFSSL_HAVE_MIN
#define WOLFSSL_HAVE_MIN
static INLINE word32 min(word32 a, word32 b)
{
return a > b ? b : a;
}
#endif /* min */
#endif /* WOLFSSL_HAVE_MIN */
void wc_InitDhKey(DhKey* key)

5
wolfcrypt/src/dsa.c
View File

@@ -39,14 +39,15 @@ enum {
};
#ifndef min
#ifndef WOLFSSL_HAVE_MIN
#define WOLFSSL_HAVE_MIN
static INLINE word32 min(word32 a, word32 b)
{
return a > b ? b : a;
}
#endif /* min */
#endif /* WOLFSSL_HAVE_MIN */
void wc_InitDsaKey(DsaKey* key)

5
wolfcrypt/src/hmac.c
View File

@@ -722,14 +722,15 @@ int wolfSSL_GetHmacMaxSize(void)
#ifdef HAVE_HKDF
#ifndef min
#ifndef WOLFSSL_HAVE_MIN
#define WOLFSSL_HAVE_MIN
static INLINE word32 min(word32 a, word32 b)
{
return a > b ? b : a;
}
#endif /* min */
#endif /* WOLFSSL_HAVE_MIN */
static INLINE int GetHashSizeByType(int type)

5
wolfcrypt/src/md4.c
View File

@@ -35,14 +35,15 @@
#endif
#ifndef min
#ifndef WOLFSSL_HAVE_MIN
#define WOLFSSL_HAVE_MIN
static INLINE word32 min(word32 a, word32 b)
{
return a > b ? b : a;
}
#endif /* min */
#endif /* WOLFSSL_HAVE_MIN */
void wc_InitMd4(Md4* md4)

5
wolfcrypt/src/md5.c
View File

@@ -166,14 +166,15 @@
#else /* CTaoCrypt software implementation */
#ifndef min
#ifndef WOLFSSL_HAVE_MIN
#define WOLFSSL_HAVE_MIN
static INLINE word32 min(word32 a, word32 b)
{
return a > b ? b : a;
}
#endif /* min */
#endif /* WOLFSSL_HAVE_MIN */
void wc_InitMd5(Md5* md5)

7
wolfcrypt/src/pkcs7.c
View File

@@ -36,12 +36,15 @@
#include <wolfcrypt/src/misc.c>
#endif
#ifndef min
#ifndef WOLFSSL_HAVE_MIN
#define WOLFSSL_HAVE_MIN
static INLINE word32 min(word32 a, word32 b)
{
return a > b ? b : a;
}
#endif
#endif /* WOLFSSL_HAVE_MIN */
/* placed ASN.1 contentType OID into *output, return idx on success,

5
wolfcrypt/src/pwdbased.c
View File

@@ -57,14 +57,15 @@
#include <wolfcrypt/src/misc.c>
#endif
#ifndef min
#ifndef WOLFSSL_HAVE_MIN
#define WOLFSSL_HAVE_MIN
static INLINE word32 min(word32 a, word32 b)
{
return a > b ? b : a;
}
#endif /* min */
#endif /* WOLFSSL_HAVE_MIN */
/* PBKDF1 needs at least SHA available */

6
wolfcrypt/src/ripemd.c
View File

@@ -36,15 +36,15 @@
#endif
#ifndef min
#ifndef WOLFSSL_HAVE_MIN
#define WOLFSSL_HAVE_MIN
static INLINE word32 min(word32 a, word32 b)
{
return a > b ? b : a;
}
#endif /* min */
#endif /* WOLFSSL_HAVE_MIN */
void wc_InitRipeMd(RipeMd* ripemd)
{

13
wolfcrypt/src/sha.c
View File

@@ -198,14 +198,15 @@ int wc_ShaFinal(Sha* sha, byte* hash)
#else /* wc_ software implementation */
#ifndef min
#ifndef WOLFSSL_HAVE_MIN
#define WOLFSSL_HAVE_MIN
static INLINE word32 min(word32 a, word32 b)
{
return a > b ? b : a;
}
static INLINE word32 min(word32 a, word32 b)
{
return a > b ? b : a;
}
#endif /* min */
#endif /* WOLFSSL_HAVE_MIN */
int wc_InitSha(Sha* sha)

5
wolfcrypt/src/sha256.c
View File

@@ -289,14 +289,15 @@ static void set_Transform(void) {
#include "cau_api.h"
#endif
#ifndef min
#ifndef WOLFSSL_HAVE_MIN
#define WOLFSSL_HAVE_MIN
static INLINE word32 min(word32 a, word32 b)
{
return a > b ? b : a;
}
#endif /* min */
#endif /* WOLFSSL_HAVE_MIN */
int wc_InitSha256(Sha256* sha256)

5
wolfcrypt/src/sha512.c
View File

@@ -88,14 +88,15 @@ int wc_Sha384Hash(const byte* data, word32 len, byte* out)
#endif
#ifndef min
#ifndef WOLFSSL_HAVE_MIN
#define WOLFSSL_HAVE_MIN
static INLINE word32 min(word32 a, word32 b)
{
return a > b ? b : a;
}
#endif /* min */
#endif /* WOLFSSL_HAVE_MIN */
#if defined(USE_INTEL_SPEEDUP)
#define HAVE_INTEL_AVX1