DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

added msg_hmac_len and removed additional strlen() calls

Browse Source
This commit is contained in:
Michael Rash
2012-07-27 21:29:26 -04:00
parent 10195cf29a
commit 482e6f974c
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/fko_context.h
+1
View File
@@ -85,6 +85,7 @@ struct fko_context {
char *encrypted_msg;
int encrypted_msg_len;
char *msg_hmac;
int msg_hmac_len;
/* State info */
unsigned short state;
lib/fko_encryption.c
+10 -2
View File
@@ -88,7 +88,8 @@ _rijndael_encrypt(fko_ctx_t ctx, const char *enc_key, const int enc_key_len)
b64_encode(ciphertext, b64ciphertext, cipher_len);
strip_b64_eq(b64ciphertext);
ctx->encrypted_msg = strdup(b64ciphertext);
ctx->encrypted_msg = strdup(b64ciphertext);
ctx->encrypted_msg_len = strnlen(ctx->encrypted_msg, MAX_SPA_ENCODED_MSG_SIZE);
/* Clean-up
*/
@@ -99,6 +100,9 @@ _rijndael_encrypt(fko_ctx_t ctx, const char *enc_key, const int enc_key_len)
if(ctx->encrypted_msg == NULL)
return(FKO_ERROR_MEMORY_ALLOCATION);
if(! is_valid_encoded_msg_len(ctx->encrypted_msg_len))
return(FKO_ERROR_INVALID_DATA);
return(FKO_SUCCESS);
}
@@ -271,7 +275,8 @@ gpg_encrypt(fko_ctx_t ctx, const char *enc_key)
b64_encode(cipher, b64cipher, cipher_len);
strip_b64_eq(b64cipher);
ctx->encrypted_msg = strdup(b64cipher);
ctx->encrypted_msg = strdup(b64cipher);
ctx->encrypted_msg_len = strnlen(ctx->encrypted_msg, MAX_SPA_ENCODED_MSG_SIZE);
/* Clean-up
*/
@@ -282,6 +287,9 @@ gpg_encrypt(fko_ctx_t ctx, const char *enc_key)
if(ctx->encrypted_msg == NULL)
return(FKO_ERROR_MEMORY_ALLOCATION);
if(! is_valid_encoded_msg_len(ctx->encrypted_msg_len))
return(FKO_ERROR_INVALID_DATA);
return(FKO_SUCCESS);
}
lib/fko_funcs.c
+1 -1
View File
@@ -426,7 +426,7 @@ fko_spa_data_final(fko_ctx_t ctx,
* and the trailing '=' chars stripped off).
*/
data_with_hmac_len
= strlen(ctx->encrypted_msg)+1+strlen(ctx->msg_hmac)+1;
= ctx->encrypted_msg_len+1+ctx->msg_hmac_len+1;
tbuf = realloc(ctx->encrypted_msg, data_with_hmac_len);
if (tbuf == NULL)
lib/fko_hmac.c
+6 -2
View File
@@ -102,15 +102,19 @@ int fko_calculate_hmac(fko_ctx_t ctx,
return(FKO_ERROR_MEMORY_ALLOCATION);
hmac_sha256(ctx->encrypted_msg,
strlen(ctx->encrypted_msg), hmac, hmac_key);
ctx->encrypted_msg_len, hmac, hmac_key);
b64_encode(hmac, hmac_base64, SHA256_DIGEST_LENGTH);
strip_b64_eq(hmac_base64);
ctx->msg_hmac = strdup(hmac_base64);
ctx->msg_hmac = strdup(hmac_base64);
ctx->msg_hmac_len = strnlen(ctx->msg_hmac, SHA512_DIGEST_STRING_LENGTH);
free(hmac_base64);
if(! is_valid_digest_len(ctx->msg_hmac_len))
return(FKO_ERROR_INVALID_DATA);
return FKO_SUCCESS;
}