Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Franck Joncourt 2013-04-27 22:38:27 +02:00
commit 0bf0d8f876
2 changed files with 2 additions and 3 deletions

View File

@ -430,7 +430,7 @@ incoming_spa(fko_srv_options_t *opts)
res = fko_new_with_data(&ctx, (char *)spa_pkt->packet_data, NULL,
0, FKO_ENC_MODE_ASYMMETRIC, acc->hmac_key,
acc->hmac_key_len, acc->hmac_type);
attempted_decrypt = 1;
if(res != FKO_SUCCESS)
{
log_msg(LOG_WARNING,
@ -644,7 +644,6 @@ incoming_spa(fko_srv_options_t *opts)
if(ctx != NULL)
fko_destroy(ctx);
acc = acc->next;
break;
}

View File

@ -159,7 +159,7 @@ dump_ctx(fko_ctx_t ctx)
ndx += cp;
cp = sprintf(ndx, "SPA Data Digest: %s\n", spa_digest == NULL ? "<NULL>" : spa_digest);
ndx += cp;
cp = sprintf(ndx, " HMAC: %s\n", hmac_data == NULL ? "<NULL>" : hmac_data);
sprintf(ndx, " HMAC: %s\n", hmac_data == NULL ? "<NULL>" : hmac_data);
return(buf);
}