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

Merge branch 'master' into ti

Browse Source
This commit is contained in:
toddouska
2014-06-04 08:08:52 -07:00
parent 6ae76721f2 d301ab001c
commit e4c33cb51e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cyassl/ctaocrypt/asn_public.h
View File

@@ -75,10 +75,10 @@ enum Ctc_Encoding {
#endif #endif
enum Ctc_Misc { enum Ctc_Misc {
CTC_NAME_SIZE = 64, CTC_NAME_SIZE = 64,
CTC_DATE_SIZE = 32, CTC_DATE_SIZE = 32,
CTC_MAX_ALT_SIZE = 8192, /* may be huge */ CTC_MAX_ALT_SIZE = 16384, /* may be huge */
CTC_SERIAL_SIZE = 8 CTC_SERIAL_SIZE = 8
}; };
typedef struct CertName { typedef struct CertName {

8
src/internal.c
View File

@@ -4111,7 +4111,7 @@ static INLINE int DtlsCheckWindow(DtlsState* state)
if ((next > DTLS_SEQ_BITS) && (cur < next - DTLS_SEQ_BITS)) { if ((next > DTLS_SEQ_BITS) && (cur < next - DTLS_SEQ_BITS)) {
return 0; return 0;
} }
else if ((cur < next) && (window & (1 << (next - cur - 1)))) { else if ((cur < next) && (window & ((DtlsSeq)1 << (next - cur - 1)))) {
return 0; return 0;
} }
@@ -4137,7 +4137,7 @@ static INLINE int DtlsUpdateWindow(DtlsState* state)
cur = state->curSeq; cur = state->curSeq;
if (cur < *next) { if (cur < *next) {
*window |= (1 << (*next - cur - 1)); *window |= ((DtlsSeq)1 << (*next - cur - 1));
} }
else { else {
*window <<= (1 + cur - *next); *window <<= (1 + cur - *next);
@@ -8689,7 +8689,7 @@ static void PickHashSigAlgo(CYASSL* ssl,
if (esSz > MAX_PSK_ID_LEN) if (esSz > MAX_PSK_ID_LEN)
return CLIENT_ID_ERROR; return CLIENT_ID_ERROR;
c16toa(esSz, es); c16toa((word16)esSz, es);
es += OPAQUE16_LEN; es += OPAQUE16_LEN;
XMEMCPY(es, ssl->arrays->client_identity, esSz); XMEMCPY(es, ssl->arrays->client_identity, esSz);
es += esSz; es += esSz;
@@ -11763,7 +11763,7 @@ static void PickHashSigAlgo(CYASSL* ssl,
FreeDhKey(&dhKey); FreeDhKey(&dhKey);
*inOutIdx += clientSz; *inOutIdx += clientSz;
c16toa(ssl->arrays->preMasterSz, pms); c16toa((word16)ssl->arrays->preMasterSz, pms);
ssl->arrays->preMasterSz += OPAQUE16_LEN; ssl->arrays->preMasterSz += OPAQUE16_LEN;
pms += ssl->arrays->preMasterSz; pms += ssl->arrays->preMasterSz;