DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

have encryption calls use encoded_msg_len

Browse Source
This commit is contained in:
Michael Rash
2012-07-26 12:21:24 -04:00
parent 661991b747
commit e733f4aa4f
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/fko_encryption.c
View File

@@ -53,7 +53,7 @@ _rijndael_encrypt(fko_ctx_t ctx, const char *enc_key, const int enc_key_len)
/* Make a bucket big enough to hold the enc msg + digest (plaintext)
* and populate it appropriately.
*/
plaintext = calloc(1, strlen(ctx->encoded_msg)
plaintext = calloc(1, ctx->encoded_msg_len
+ strlen(ctx->digest) + RIJNDAEL_BLOCKSIZE + 2);
if(plaintext == NULL)
@@ -219,7 +219,7 @@ gpg_encrypt(fko_ctx_t ctx, const char *enc_key)
/* Make a bucket big enough to hold the enc msg + digest (plaintext)
* and populate it appropriately.
*/
plain = malloc(strlen(ctx->encoded_msg) + strlen(ctx->digest) + 2);
plain = malloc(ctx->encoded_msg_len + strlen(ctx->digest) + 2);
if(plain == NULL)
return(FKO_ERROR_MEMORY_ALLOCATION);
@@ -485,8 +485,6 @@ fko_decrypt_spa_data(fko_ctx_t ctx, const char *dec_key, const int key_len)
*/
enc_type = fko_encryption_type(ctx->encrypted_msg);
//strlen(ctx->encrypted_msg) < MIN_SPA_ENCODED_MSG_SIZE)
if(enc_type == FKO_ENCRYPTION_GPG)
{
ctx->encryption_type = FKO_ENCRYPTION_GPG;