mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:cyassl/cyassl

Browse Source
This commit is contained in:
John Safranek 2012-08-28 09:37:02 -07:00
commit 820d934ae8
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ctaocrypt/src/asn.c
View File

@ -433,7 +433,9 @@ static int GetInt(mp_int* mpi, const byte* input, word32* inOutIdx,
else else
i--; i--;
mp_init(mpi); if (mp_init(mpi) != MP_OKAY)
return MP_INIT_E;
if (mp_read_unsigned_bin(mpi, (byte*)input + i, length) != 0) { if (mp_read_unsigned_bin(mpi, (byte*)input + i, length) != 0) {
mp_clear(mpi); mp_clear(mpi);
return ASN_GETINT_E; return ASN_GETINT_E;
@ -928,14 +930,19 @@ int DhSetKey(DhKey* key, const byte* p, word32 pSz, const byte* g, word32 gSz)
gSz--; g++; gSz--; g++;
} }
mp_init(&key->p); if (mp_init(&key->p) != MP_OKAY)
return MP_INIT_E;
if (mp_read_unsigned_bin(&key->p, p, pSz) != 0) { if (mp_read_unsigned_bin(&key->p, p, pSz) != 0) {
mp_clear(&key->p); mp_clear(&key->p);
return ASN_DH_KEY_E; return ASN_DH_KEY_E;
} }
mp_init(&key->g); if (mp_init(&key->g) != MP_OKAY) {
mp_clear(&key->p);
return MP_INIT_E;
}
if (mp_read_unsigned_bin(&key->g, g, gSz) != 0) { if (mp_read_unsigned_bin(&key->g, g, gSz) != 0) {
mp_clear(&key->g);
mp_clear(&key->p); mp_clear(&key->p);
return ASN_DH_KEY_E; return ASN_DH_KEY_E;
} }

16
ctaocrypt/src/pwdbased.c
View File

@ -261,11 +261,14 @@ int PKCS12_PBKDF(byte* output, const byte* passwd, int passLen,const byte* salt,
for (i = 0; i < (int)v; i++) for (i = 0; i < (int)v; i++)
B[i] = Ai[i % u]; B[i] = Ai[i % u];
mp_init(&B1); if (mp_init(&B1) != MP_OKAY)
if (mp_read_unsigned_bin(&B1, B, v) != MP_OKAY) ret = MP_INIT_E;
else if (mp_read_unsigned_bin(&B1, B, v) != MP_OKAY)
ret = MP_READ_E; ret = MP_READ_E;
else if (mp_add_d(&B1, (mp_digit)1, &B1) != MP_OKAY) { else if (mp_add_d(&B1, (mp_digit)1, &B1) != MP_OKAY)
ret = MP_ADD_E; ret = MP_ADD_E;
if (ret != 0) {
mp_clear(&B1); mp_clear(&B1);
break; break;
} }
@ -275,9 +278,10 @@ int PKCS12_PBKDF(byte* output, const byte* passwd, int passLen,const byte* salt,
mp_int i1; mp_int i1;
mp_int res; mp_int res;
mp_init(&i1); if (mp_init_multi(&i1, &res, NULL, NULL, NULL, NULL) != MP_OKAY) {
mp_init(&res); ret = MP_INIT_E;
break;
}
if (mp_read_unsigned_bin(&i1, I + i, v) != MP_OKAY) if (mp_read_unsigned_bin(&i1, I + i, v) != MP_OKAY)
ret = MP_READ_E; ret = MP_READ_E;
else if (mp_add(&i1, &B1, &res) != MP_OKAY) else if (mp_add(&i1, &B1, &res) != MP_OKAY)

2
cyassl/ctaocrypt/types.h
View File

@ -30,7 +30,7 @@
#endif #endif
#if defined(WORDS_BIGENDIAN) || (defined(__MWERKS__) && !defined(__INTEL__)) #if defined(WORDS_BIGENDIAN)
#define BIG_ENDIAN_ORDER #define BIG_ENDIAN_ORDER
#endif #endif

5
src/ssl.c
View File

@ -6121,8 +6121,11 @@ static int initGlobalRNG = 0;
} }
InitCyaSSL_BigNum(external); InitCyaSSL_BigNum(external);
mp_init(mpi);
external->internal = mpi; external->internal = mpi;
if (mp_init(mpi) != MP_OKAY) {
CyaSSL_BN_free(external);
return NULL;
}
return external; return external;
} }