This commit commit fixes a memory leak in the HMAC verification code found with
the test suite running in valgrind mode. Here is the './test-fwknop.pl --diff'
output showing fko_verify_hmac() removed from the flagged functions list:
[+] fwknop functions (unique view):
- 8 : ???
- 3 : main
- 3 : pcap_capture
- 1 : incoming_spa
+ 7 : ???
+ 2 : pcap_capture
+ 2 : main
1 : pcap_compile
- 1 : fko_new_with_data
- 1 : strndup
- 1 : fko_verify_hmac
[+] fwknop functions (with call line numbers):
- 8 : ??? (in /usr/lib/x86_64-linux-gnu/libpcap.so.1.1.1)
- 3 : main (fwknopd.c:299)
- 1 : fko_new_with_data (fko_funcs.c:220)
- 1 : pcap_capture (pcap_capture.c:105)
- 1 : incoming_spa (incoming_spa.c:376)
- 1 : strndup (strndup.c:46)
+ 7 : ??? (in /usr/lib/x86_64-linux-gnu/libpcap.so.1.1.1)
+ 2 : main (fwknopd.c:299)
1 : pcap_compile (in /usr/lib/x86_64-linux-gnu/libpcap.so.1.1.1)
- 1 : pcap_capture (pcap_capture.c:226)
1 : pcap_capture (pcap_capture.c:97)
- 1 : fko_verify_hmac (fko_hmac.c:54)
+ 1 : pcap_capture (pcap_capture.c:105)
181 lines
4.6 KiB
C
181 lines
4.6 KiB
C
/*
|
|
*****************************************************************************
|
|
*
|
|
* File: fko_hmac.c
|
|
*
|
|
* Author: Michael Rash
|
|
*
|
|
* Purpose: Provide HMAC support to SPA communications
|
|
*
|
|
* Copyright 2012 Michael Rash (mbr@cipherdyne.org)
|
|
*
|
|
* License (GNU Public License):
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
|
* USA
|
|
*
|
|
*****************************************************************************
|
|
*/
|
|
#include "fko_common.h"
|
|
#include "fko.h"
|
|
#include "cipher_funcs.h"
|
|
#include "hmac.h"
|
|
#include "base64.h"
|
|
|
|
int fko_verify_hmac(fko_ctx_t ctx,
|
|
const char *hmac_key, const int hmac_key_len)
|
|
{
|
|
char *hmac_digest_from_data = NULL;
|
|
char *tbuf = NULL;
|
|
int res = FKO_SUCCESS;
|
|
|
|
/* Must be initialized
|
|
*/
|
|
if(!CTX_INITIALIZED(ctx))
|
|
return(FKO_ERROR_CTX_NOT_INITIALIZED);
|
|
|
|
if (! is_valid_encoded_msg_len(ctx->encrypted_msg_len))
|
|
return(FKO_ERROR_INVALID_DATA);
|
|
|
|
/* Get digest value
|
|
*/
|
|
hmac_digest_from_data = strndup((ctx->encrypted_msg
|
|
+ ctx->encrypted_msg_len - SHA256_B64_LEN), SHA256_B64_LEN);
|
|
|
|
if(hmac_digest_from_data == NULL)
|
|
return(FKO_ERROR_MEMORY_ALLOCATION);
|
|
|
|
/* Now we chop the HMAC digest off of the encrypted msg
|
|
*/
|
|
tbuf = strndup(ctx->encrypted_msg, ctx->encrypted_msg_len - SHA256_B64_LEN);
|
|
if(tbuf == NULL)
|
|
{
|
|
free(hmac_digest_from_data);
|
|
return(FKO_ERROR_MEMORY_ALLOCATION);
|
|
}
|
|
|
|
free(ctx->encrypted_msg);
|
|
|
|
ctx->encrypted_msg = tbuf;
|
|
ctx->encrypted_msg_len -= SHA256_B64_LEN;
|
|
|
|
/* See if we need to add the "Salted__" string to the front of the
|
|
* encrypted data.
|
|
*/
|
|
if(! ctx->added_salted_str)
|
|
res = add_salted_str(ctx);
|
|
|
|
if (res != FKO_SUCCESS)
|
|
{
|
|
free(hmac_digest_from_data);
|
|
return(res);
|
|
}
|
|
|
|
/* Calculate the HMAC from the encrypted data and then
|
|
* compare
|
|
*/
|
|
res = fko_set_hmac_mode(ctx, FKO_HMAC_SHA256);
|
|
if(res == FKO_SUCCESS)
|
|
{
|
|
res = fko_calculate_hmac(ctx, hmac_key, hmac_key_len);
|
|
|
|
if(res == FKO_SUCCESS)
|
|
{
|
|
if(strncmp(hmac_digest_from_data,
|
|
ctx->msg_hmac, SHA256_B64_LEN) != 0)
|
|
{
|
|
res = FKO_ERROR_INVALID_DATA;
|
|
}
|
|
}
|
|
}
|
|
|
|
free(hmac_digest_from_data);
|
|
return(res);
|
|
}
|
|
|
|
/* Return the fko HMAC data
|
|
*/
|
|
int
|
|
fko_get_hmac_data(fko_ctx_t ctx, char **hmac_data)
|
|
{
|
|
/* Must be initialized
|
|
*/
|
|
if(!CTX_INITIALIZED(ctx))
|
|
return(FKO_ERROR_CTX_NOT_INITIALIZED);
|
|
|
|
*hmac_data = ctx->msg_hmac;
|
|
|
|
return(FKO_SUCCESS);
|
|
}
|
|
|
|
/* Set the HMAC type
|
|
*/
|
|
int
|
|
fko_set_hmac_mode(fko_ctx_t ctx, const short hmac_mode)
|
|
{
|
|
/* Must be initialized
|
|
*/
|
|
if(!CTX_INITIALIZED(ctx))
|
|
return(FKO_ERROR_CTX_NOT_INITIALIZED);
|
|
|
|
if(hmac_mode < 0 || hmac_mode >= FKO_LAST_HMAC_MODE)
|
|
return(FKO_ERROR_INVALID_DATA);
|
|
|
|
ctx->hmac_mode = hmac_mode;
|
|
|
|
ctx->state |= FKO_HMAC_MODE_MODIFIED;
|
|
|
|
return(FKO_SUCCESS);
|
|
}
|
|
|
|
int fko_calculate_hmac(fko_ctx_t ctx,
|
|
const char *hmac_key, const int hmac_key_len)
|
|
{
|
|
unsigned char hmac[SHA256_DIGEST_STR_LEN] = {0};
|
|
char *hmac_base64 = NULL;
|
|
|
|
/* Must be initialized
|
|
*/
|
|
if(!CTX_INITIALIZED(ctx))
|
|
return(FKO_ERROR_CTX_NOT_INITIALIZED);
|
|
|
|
/* Only HMAC-SHA256 is supported for now
|
|
*/
|
|
if(ctx->hmac_mode != FKO_HMAC_SHA256)
|
|
return(FKO_ERROR_UNSUPPORTED_HMAC_MODE);
|
|
|
|
hmac_base64 = calloc(1, MD_HEX_SIZE(SHA256_DIGEST_LEN)+1);
|
|
if (hmac_base64 == NULL)
|
|
return(FKO_ERROR_MEMORY_ALLOCATION);
|
|
|
|
hmac_sha256(ctx->encrypted_msg,
|
|
ctx->encrypted_msg_len, hmac, hmac_key);
|
|
|
|
b64_encode(hmac, hmac_base64, SHA256_DIGEST_LEN);
|
|
strip_b64_eq(hmac_base64);
|
|
|
|
ctx->msg_hmac = strdup(hmac_base64);
|
|
ctx->msg_hmac_len = strnlen(ctx->msg_hmac, SHA512_DIGEST_STR_LEN);
|
|
|
|
free(hmac_base64);
|
|
|
|
if(! is_valid_digest_len(ctx->msg_hmac_len))
|
|
return(FKO_ERROR_INVALID_DATA);
|
|
|
|
return FKO_SUCCESS;
|
|
}
|
|
|
|
/***EOF***/
|