rooty/yubico-pam
1
0
Fork 0
mirror of https://github.com/Yubico/yubico-pam.git synced 2025-02-26 21:54:15 +01:00
Code Issues Projects Releases Wiki Activity

load_chalresp_state: Debug message was always shown.

Browse Source
This commit is contained in:
Fredrik Thulin 2012-02-13 14:24:31 +01:00
parent 5627bba2ba
commit da246e240c
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pam_yubico.c
View File

@ -529,7 +529,7 @@ do_challenge_response(pam_handle_t *pamh, struct cfg *cfg, const char *username)
goto out;
}
if (! load_chalresp_state(f, &state))
if (! load_chalresp_state(f, &state, cfg->debug))
goto out;
if (fclose(f) < 0) {

7
util.c
View File

@ -241,7 +241,7 @@ get_user_challenge_file(YK_KEY *yk, const char *chalresp_path, const char *usern
}
int
load_chalresp_state(FILE *f, CR_STATE *state)
load_chalresp_state(FILE *f, CR_STATE *state, bool verbose)
{
/*
* Load the current challenge and expected response information from a file handle.
@ -262,11 +262,12 @@ load_chalresp_state(FILE *f, CR_STATE *state)
*/
r = fscanf(f, "v1:%126[0-9a-z]:%40[0-9a-z]:%d", &challenge_hex[0], &response_hex[0], &slot);
if (r != 3) {
D(("Could not parse contents of chalres_state file (%i)", r));
D(("Could not parse contents of chalresp_state file (%i)", r));
goto out;
}
D(("Challenge: %s, response: %s, slot: %d", challenge_hex, response_hex, slot));
if (verbose)
D(("Challenge: %s, expected response: %s, slot: %d", challenge_hex, response_hex, slot));
if (! yubikey_hex_p(challenge_hex)) {
D(("Invalid challenge hex input : %s", challenge_hex));

2
util.h
View File

@ -82,7 +82,7 @@ int generate_random(void *buf, int len);
int get_user_challenge_file(YK_KEY *yk, const char *chalresp_path, const char *username, char **fn);
int load_chalresp_state(FILE *f, CR_STATE *state);
int load_chalresp_state(FILE *f, CR_STATE *state, bool verbose);
int write_chalresp_state(FILE *f, CR_STATE *state);
int init_yubikey(YK_KEY **yk);