From e3c4c974cbd313f453bb7d151e461951df399ebe Mon Sep 17 00:00:00 2001 From: Klas Lindfors Date: Thu, 9 Jan 2014 08:51:01 +0100 Subject: [PATCH] fix logic of ykp_get_supported_key_length() was reporting wrong size for yubico-challenge --- ykpers.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ykpers.c b/ykpers.c index cb1bbb8..6e8fee5 100644 --- a/ykpers.c +++ b/ykpers.c @@ -236,11 +236,10 @@ int ykp_get_supported_key_length(const YKP_CONFIG *cfg) /* OATH-HOTP and HMAC-SHA1 challenge response support 20 byte (160 bits) * keys, holding the last four bytes in the uid field. */ - if ((cfg->ykcore_config.tktFlags & TKTFLAG_OATH_HOTP) == TKTFLAG_OATH_HOTP) - return 20; - - if ((cfg->ykcore_config.tktFlags & TKTFLAG_CHAL_RESP) == TKTFLAG_CHAL_RESP && - (cfg->ykcore_config.cfgFlags & CFGFLAG_CHAL_HMAC) == CFGFLAG_CHAL_HMAC) { + if((ykp_get_tktflag_OATH_HOTP(cfg) && + !ykp_get_cfgflag_CHAL_YUBICO(cfg)) || + (ykp_get_tktflag_CHAL_RESP(cfg) && + ykp_get_cfgflag_CHAL_HMAC(cfg))) { return 20; } -- 2.39.5