feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

fixes trailing white spaces.

Browse Source 
adds port mapping in Vagrantfile.
This commit is contained in:
Moisés Guimarães
2015-05-22 20:05:40 -03:00
parent 8fbcd7d74b
commit 67a93a5999
3 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Vagrantfile vendored
View File

@@ -45,4 +45,6 @@ VAGRANTFILE_API_VERSION = "2"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = "hashicorp/precise64" config.vm.box = "hashicorp/precise64"
config.vm.provision "shell", inline: $setup config.vm.provision "shell", inline: $setup
config.vm.network "forwarded_port", guest: 11111, host: 33333
end end

2
src/internal.c
View File

@@ -3669,7 +3669,7 @@ static int MatchDomainName(const char* pattern, int len, const char* str)
break; break;
if (p == '*') { if (p == '*') {
while (--len > 0 && while (--len > 0 &&
(p = (char)XTOLOWER((unsigned char)*pattern++)) == '*') (p = (char)XTOLOWER((unsigned char)*pattern++)) == '*')
; ;

46
src/tls.c
View File

@@ -72,7 +72,7 @@ static int p_hash(byte* result, word32 resLen, const byte* secret,
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
byte* previous; byte* previous;
byte* current; byte* current;
Hmac* hmac; Hmac* hmac;
#else #else
byte previous[P_HASH_MAX_SIZE]; /* max size */ byte previous[P_HASH_MAX_SIZE]; /* max size */
byte current[P_HASH_MAX_SIZE]; /* max size */ byte current[P_HASH_MAX_SIZE]; /* max size */
@@ -147,7 +147,7 @@ static int p_hash(byte* result, word32 resLen, const byte* secret,
break; break;
if ((i == lastTime) && lastLen) if ((i == lastTime) && lastLen)
XMEMCPY(&result[idx], current, XMEMCPY(&result[idx], current,
min(lastLen, P_HASH_MAX_SIZE)); min(lastLen, P_HASH_MAX_SIZE));
else { else {
XMEMCPY(&result[idx], current, len); XMEMCPY(&result[idx], current, len);
@@ -187,7 +187,7 @@ static INLINE void get_xor(byte *digest, word32 digLen, byte* md5, byte* sha)
{ {
word32 i; word32 i;
for (i = 0; i < digLen; i++) for (i = 0; i < digLen; i++)
digest[i] = md5[i] ^ sha[i]; digest[i] = md5[i] ^ sha[i];
} }
@@ -288,7 +288,7 @@ static int PRF(byte* digest, word32 digLen, const byte* secret, word32 secLen,
if (labLen + seedLen > MAX_PRF_LABSEED) if (labLen + seedLen > MAX_PRF_LABSEED)
return BUFFER_E; return BUFFER_E;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
labelSeed = (byte*)XMALLOC(MAX_PRF_LABSEED, NULL, labelSeed = (byte*)XMALLOC(MAX_PRF_LABSEED, NULL,
DYNAMIC_TYPE_TMP_BUFFER); DYNAMIC_TYPE_TMP_BUFFER);
@@ -430,7 +430,7 @@ int wolfSSL_DeriveTlsKeys(byte* key_data, word32 keyLen,
int DeriveTlsKeys(WOLFSSL* ssl) int DeriveTlsKeys(WOLFSSL* ssl)
{ {
int ret; int ret;
int length = 2 * ssl->specs.hash_size + int length = 2 * ssl->specs.hash_size +
2 * ssl->specs.key_size + 2 * ssl->specs.key_size +
2 * ssl->specs.iv_size; 2 * ssl->specs.iv_size;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -586,9 +586,9 @@ static INLINE word32 GetSEQIncrement(WOLFSSL* ssl, int verify)
} }
#endif #endif
if (verify) if (verify)
return ssl->keys.peer_sequence_number++; return ssl->keys.peer_sequence_number++;
else else
return ssl->keys.sequence_number++; return ssl->keys.sequence_number++;
} }
@@ -640,10 +640,10 @@ int wolfSSL_GetHmacType(WOLFSSL* ssl)
return SHA; return SHA;
} }
#endif #endif
#ifdef HAVE_BLAKE2 #ifdef HAVE_BLAKE2
case blake2b_mac: case blake2b_mac:
{ {
return BLAKE2B_ID; return BLAKE2B_ID;
} }
#endif #endif
default: default:
@@ -667,7 +667,7 @@ int wolfSSL_SetTlsHmacInner(WOLFSSL* ssl, byte* inner, word32 sz, int content,
c16toa((word16)GetEpoch(ssl, verify), inner); c16toa((word16)GetEpoch(ssl, verify), inner);
#endif #endif
c32toa(GetSEQIncrement(ssl, verify), &inner[sizeof(word32)]); c32toa(GetSEQIncrement(ssl, verify), &inner[sizeof(word32)]);
inner[SEQ_SZ] = (byte)content; inner[SEQ_SZ] = (byte)content;
inner[SEQ_SZ + ENUM_LEN] = ssl->version.major; inner[SEQ_SZ + ENUM_LEN] = ssl->version.major;
inner[SEQ_SZ + ENUM_LEN + ENUM_LEN] = ssl->version.minor; inner[SEQ_SZ + ENUM_LEN + ENUM_LEN] = ssl->version.minor;
c16toa((word16)sz, inner + SEQ_SZ + ENUM_LEN + VERSION_SZ); c16toa((word16)sz, inner + SEQ_SZ + ENUM_LEN + VERSION_SZ);
@@ -686,7 +686,7 @@ int TLS_hmac(WOLFSSL* ssl, byte* digest, const byte* in, word32 sz,
if (ssl == NULL) if (ssl == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
#ifdef HAVE_FUZZER #ifdef HAVE_FUZZER
if (ssl->fuzzerCb) if (ssl->fuzzerCb)
ssl->fuzzerCb(ssl, in, sz, FUZZ_HMAC, ssl->fuzzerCtx); ssl->fuzzerCb(ssl, in, sz, FUZZ_HMAC, ssl->fuzzerCtx);
@@ -735,7 +735,7 @@ static INLINE word16 TLSX_ToSemaphore(word16 type)
WOLFSSL_MSG("### TLSX semaphore colision or overflow detected!"); WOLFSSL_MSG("### TLSX semaphore colision or overflow detected!");
} }
} }
return type; return type;
} }
@@ -1044,7 +1044,7 @@ int TLSX_UseSNI(TLSX** extensions, byte type, const void* data, word16 size)
return ret; return ret;
if (!extension) { if (!extension) {
if ((ret = TLSX_Push(extensions, SERVER_NAME_INDICATION, (void*)sni)) if ((ret = TLSX_Push(extensions, SERVER_NAME_INDICATION, (void*)sni))
!= 0) { != 0) {
TLSX_SNI_Free(sni); TLSX_SNI_Free(sni);
return ret; return ret;
@@ -1053,7 +1053,7 @@ int TLSX_UseSNI(TLSX** extensions, byte type, const void* data, word16 size)
else { else {
/* push new SNI object to extension data. */ /* push new SNI object to extension data. */
sni->next = (SNI*)extension->data; sni->next = (SNI*)extension->data;
extension->data = (void*)sni; extension->data = (void*)sni;
/* look for another server name of the same type to remove */ /* look for another server name of the same type to remove */
do { do {
@@ -1626,7 +1626,7 @@ int TLSX_UseSupportedCurve(TLSX** extensions, word16 name)
break; break;
} }
} while ((curve = curve->next)); } while ((curve = curve->next));
} }
return SSL_SUCCESS; return SSL_SUCCESS;
@@ -1680,7 +1680,7 @@ static byte TLSX_SecureRenegotiation_GetSize(SecureRenegotiation* data,
static word16 TLSX_SecureRenegotiation_Write(SecureRenegotiation* data, static word16 TLSX_SecureRenegotiation_Write(SecureRenegotiation* data,
byte* output, int isRequest) byte* output, int isRequest)
{ {
word16 offset = OPAQUE8_LEN; /* RenegotiationInfo length */ word16 offset = OPAQUE8_LEN; /* RenegotiationInfo length */
if (data->enabled) { if (data->enabled) {
@@ -1696,11 +1696,11 @@ static word16 TLSX_SecureRenegotiation_Write(SecureRenegotiation* data,
} }
output[0] = offset - 1; /* info length - self */ output[0] = offset - 1; /* info length - self */
return offset; return offset;
} }
static int TLSX_SecureRenegotiation_Parse(WOLFSSL* ssl, byte* input, static int TLSX_SecureRenegotiation_Parse(WOLFSSL* ssl, byte* input,
word16 length, byte isRequest) word16 length, byte isRequest)
{ {
int ret = SECURE_RENEGOTIATION_E; int ret = SECURE_RENEGOTIATION_E;
@@ -1726,7 +1726,7 @@ static int TLSX_SecureRenegotiation_Parse(WOLFSSL* ssl, byte* input,
if (!ssl->secure_renegotiation->enabled) { if (!ssl->secure_renegotiation->enabled) {
if (*input == 0) { if (*input == 0) {
ssl->secure_renegotiation->enabled = 1; ssl->secure_renegotiation->enabled = 1;
ret = 0; ret = 0;
} }
} }
else if (*input == 2 * TLS_FINISHED_SZ) { else if (*input == 2 * TLS_FINISHED_SZ) {
@@ -1749,7 +1749,7 @@ int TLSX_UseSecureRenegotiation(TLSX** extensions)
{ {
int ret = 0; int ret = 0;
SecureRenegotiation* data = NULL; SecureRenegotiation* data = NULL;
data = (SecureRenegotiation*)XMALLOC(sizeof(SecureRenegotiation), NULL, data = (SecureRenegotiation*)XMALLOC(sizeof(SecureRenegotiation), NULL,
DYNAMIC_TYPE_TLSX); DYNAMIC_TYPE_TLSX);
if (data == NULL) if (data == NULL)
@@ -2362,7 +2362,7 @@ int TLSX_Parse(WOLFSSL* ssl, byte* input, word16 length, byte isRequest,
#endif #endif
#ifndef NO_OLD_TLS #ifndef NO_OLD_TLS
method->downgrade = 1; method->downgrade = 1;
#endif #endif
} }
return method; return method;
} }