summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2009-01-14 16:21:09 +0000
committerChristian Pointner <equinox@anytun.org>2009-01-14 16:21:09 +0000
commitfa2334561d4a888a94c8c161b2e7d4581061844f (patch)
treebc7d1ab109c15ad47cae2b43ae2e6e5d8d35c603
parentsmall cleanup (diff)
small improvement auth_algo
-rw-r--r--src/auth_algo.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/auth_algo.c b/src/auth_algo.c
index 0193fa6..ae33233 100644
--- a/src/auth_algo.c
+++ b/src/auth_algo.c
@@ -176,6 +176,9 @@ void auth_algo_sha1_close(auth_algo_t* aa)
void auth_algo_sha1_generate(auth_algo_t* aa, key_derivation_t* kd, encrypted_packet_t* packet)
{
+ if(!encrypted_packet_get_auth_tag_length(packet))
+ return;
+
if(!aa || !aa->params_) {
log_printf(ERR, "auth algo not initialized");
return;
@@ -230,6 +233,9 @@ void auth_algo_sha1_generate(auth_algo_t* aa, key_derivation_t* kd, encrypted_pa
int auth_algo_sha1_check_tag(auth_algo_t* aa, key_derivation_t* kd, encrypted_packet_t* packet)
{
+ if(!encrypted_packet_get_auth_tag_length(packet))
+ return 1;
+
if(!aa || !aa->params_) {
log_printf(ERR, "auth algo not initialized");
return 0;
@@ -248,7 +254,7 @@ int auth_algo_sha1_check_tag(auth_algo_t* aa, key_derivation_t* kd, encrypted_pa
gcry_error_t err = gcry_md_setkey(params->handle_, aa->key_.buf_, aa->key_.length_);
if(err) {
log_printf(ERR, "failed to set hmac key: %s", gcry_strerror(err));
- return;
+ return -1;
}
#else
HMAC_Init_ex(&params->ctx_, aa->key_.buf_, aa->key_.length_, EVP_sha1(), NULL);