Merge branch 'master' into ti
This commit is contained in:
commit
71a5aeeb81
@ -1635,6 +1635,13 @@ then
|
||||
fi
|
||||
fi
|
||||
|
||||
# ICC command line warning for non supported warning flags
|
||||
if test "$CC" = "icc"
|
||||
then
|
||||
AM_CFLAGS="$AM_CFLAGS -wd10006"
|
||||
fi
|
||||
|
||||
|
||||
LIB_SOCKET_NSL
|
||||
AX_HARDEN_CC_COMPILER_FLAGS
|
||||
|
||||
|
@ -45,6 +45,8 @@
|
||||
|
||||
#include <stdlib.h> /* get intrinsic definitions */
|
||||
|
||||
/* for non visual studio probably need no long version, 32 bit only
|
||||
* i.e., _rotl and _rotr */
|
||||
#pragma intrinsic(_lrotl, _lrotr)
|
||||
|
||||
STATIC INLINE word32 rotlFixed(word32 x, word32 y)
|
||||
|
@ -702,6 +702,12 @@
|
||||
#define NO_SKID
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef __INTEL_COMPILER
|
||||
#pragma warning(disable:2259) /* explicit casts to smaller sizes, disable */
|
||||
#endif
|
||||
|
||||
|
||||
/* Place any other flags or defines here */
|
||||
|
||||
|
||||
|
@ -180,7 +180,7 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
|
||||
|
||||
word16 port = yasslPort;
|
||||
char* host = (char*)yasslIP;
|
||||
char* domain = (char*)"www.yassl.com";
|
||||
const char* domain = "www.yassl.com";
|
||||
|
||||
int ch;
|
||||
int version = CLIENT_INVALID_VERSION;
|
||||
@ -198,9 +198,9 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
|
||||
int atomicUser = 0;
|
||||
int pkCallbacks = 0;
|
||||
char* cipherList = NULL;
|
||||
char* verifyCert = (char*)caCert;
|
||||
char* ourCert = (char*)cliCert;
|
||||
char* ourKey = (char*)cliKey;
|
||||
const char* verifyCert = caCert;
|
||||
const char* ourCert = cliCert;
|
||||
const char* ourKey = cliKey;
|
||||
|
||||
#ifdef HAVE_SNI
|
||||
char* sniHostName = NULL;
|
||||
|
@ -164,9 +164,9 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
|
||||
int fewerPackets = 0;
|
||||
int pkCallbacks = 0;
|
||||
char* cipherList = NULL;
|
||||
char* verifyCert = (char*)cliCert;
|
||||
char* ourCert = (char*)svrCert;
|
||||
char* ourKey = (char*)svrKey;
|
||||
const char* verifyCert = cliCert;
|
||||
const char* ourCert = svrCert;
|
||||
const char* ourKey = svrKey;
|
||||
int argc = ((func_args*)args)->argc;
|
||||
char** argv = ((func_args*)args)->argv;
|
||||
|
||||
|
@ -2023,8 +2023,8 @@ static int MakeSslMasterSecret(CYASSL* ssl)
|
||||
XMEMCPY(md5Input, ssl->arrays->preMasterSecret, pmsSz);
|
||||
|
||||
for (i = 0; i < MASTER_ROUNDS; ++i) {
|
||||
byte prefix[PREFIX];
|
||||
if (!SetPrefix(prefix, i)) {
|
||||
byte prefix[KEY_PREFIX]; /* only need PREFIX bytes but static */
|
||||
if (!SetPrefix(prefix, i)) { /* analysis thinks will overrun */
|
||||
return PREFIX_ERROR;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user