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

update to function calls in ecc c file

Browse Source
This commit is contained in:
Jacob Barthelmeh
2015-01-06 13:43:46 -07:00
parent 11a563aa91
commit 8315e76f32
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
wolfcrypt/src/ecc.c
View File

@ -4305,7 +4305,7 @@ int wc_ecc_encrypt(ecc_key* privKey, ecc_key* pubKey, const byte* msg,
if (ret == 0) { if (ret == 0) {
switch (ctx->kdfAlgo) { switch (ctx->kdfAlgo) {
case ecHKDF_SHA256 : case ecHKDF_SHA256 :
ret = HKDF(SHA256, sharedSecret, sharedSz, ctx->kdfSalt, ret = wc_HKDF(SHA256, sharedSecret, sharedSz, ctx->kdfSalt,
ctx->kdfSaltSz, ctx->kdfInfo, ctx->kdfInfoSz, ctx->kdfSaltSz, ctx->kdfInfo, ctx->kdfInfoSz,
keys, keysLen); keys, keysLen);
break; break;
@ -4325,11 +4325,11 @@ int wc_ecc_encrypt(ecc_key* privKey, ecc_key* pubKey, const byte* msg,
case ecAES_128_CBC: case ecAES_128_CBC:
{ {
Aes aes; Aes aes;
ret = AesSetKey(&aes, encKey, KEY_SIZE_128, encIv, ret = wc_AesSetKey(&aes, encKey, KEY_SIZE_128, encIv,
AES_ENCRYPTION); AES_ENCRYPTION);
if (ret != 0) if (ret != 0)
break; break;
ret = AesCbcEncrypt(&aes, out, msg, msgSz); ret = wc_AesCbcEncrypt(&aes, out, msg, msgSz);
} }
break; break;
@ -4344,16 +4344,16 @@ int wc_ecc_encrypt(ecc_key* privKey, ecc_key* pubKey, const byte* msg,
case ecHMAC_SHA256: case ecHMAC_SHA256:
{ {
Hmac hmac; Hmac hmac;
ret = HmacSetKey(&hmac, SHA256, macKey, SHA256_DIGEST_SIZE); ret = wc_HmacSetKey(&hmac, SHA256, macKey, SHA256_DIGEST_SIZE);
if (ret != 0) if (ret != 0)
break; break;
ret = HmacUpdate(&hmac, out, msgSz); ret = wc_HmacUpdate(&hmac, out, msgSz);
if (ret != 0) if (ret != 0)
break; break;
ret = HmacUpdate(&hmac, ctx->macSalt, ctx->macSaltSz); ret = wc_HmacUpdate(&hmac, ctx->macSalt, ctx->macSaltSz);
if (ret != 0) if (ret != 0)
break; break;
ret = HmacFinal(&hmac, out+msgSz); ret = wc_HmacFinal(&hmac, out+msgSz);
} }
break; break;
@ -4457,7 +4457,7 @@ int wc_ecc_decrypt(ecc_key* privKey, ecc_key* pubKey, const byte* msg,
if (ret == 0) { if (ret == 0) {
switch (ctx->kdfAlgo) { switch (ctx->kdfAlgo) {
case ecHKDF_SHA256 : case ecHKDF_SHA256 :
ret = HKDF(SHA256, sharedSecret, sharedSz, ctx->kdfSalt, ret = wc_HKDF(SHA256, sharedSecret, sharedSz, ctx->kdfSalt,
ctx->kdfSaltSz, ctx->kdfInfo, ctx->kdfInfoSz, ctx->kdfSaltSz, ctx->kdfInfo, ctx->kdfInfoSz,
keys, keysLen); keys, keysLen);
break; break;
@ -4478,16 +4478,16 @@ int wc_ecc_decrypt(ecc_key* privKey, ecc_key* pubKey, const byte* msg,
{ {
byte verify[SHA256_DIGEST_SIZE]; byte verify[SHA256_DIGEST_SIZE];
Hmac hmac; Hmac hmac;
ret = HmacSetKey(&hmac, SHA256, macKey, SHA256_DIGEST_SIZE); ret = wc_HmacSetKey(&hmac, SHA256, macKey, SHA256_DIGEST_SIZE);
if (ret != 0) if (ret != 0)
break; break;
ret = HmacUpdate(&hmac, msg, msgSz-digestSz); ret = wc_HmacUpdate(&hmac, msg, msgSz-digestSz);
if (ret != 0) if (ret != 0)
break; break;
ret = HmacUpdate(&hmac, ctx->macSalt, ctx->macSaltSz); ret = wc_HmacUpdate(&hmac, ctx->macSalt, ctx->macSaltSz);
if (ret != 0) if (ret != 0)
break; break;
ret = HmacFinal(&hmac, verify); ret = wc_HmacFinal(&hmac, verify);
if (ret != 0) if (ret != 0)
break; break;
if (memcmp(verify, msg + msgSz - digestSz, digestSz) != 0) if (memcmp(verify, msg + msgSz - digestSz, digestSz) != 0)
@ -4506,11 +4506,11 @@ int wc_ecc_decrypt(ecc_key* privKey, ecc_key* pubKey, const byte* msg,
case ecAES_128_CBC: case ecAES_128_CBC:
{ {
Aes aes; Aes aes;
ret = AesSetKey(&aes, encKey, KEY_SIZE_128, encIv, ret = wc_AesSetKey(&aes, encKey, KEY_SIZE_128, encIv,
AES_DECRYPTION); AES_DECRYPTION);
if (ret != 0) if (ret != 0)
break; break;
ret = AesCbcDecrypt(&aes, out, msg, msgSz-digestSz); ret = wc_AesCbcDecrypt(&aes, out, msg, msgSz-digestSz);
} }
break; break;