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

Merge branch 'pr-143'

Browse Source
This commit is contained in:
Klas Lindfors 2018-04-10 10:29:51 +02:00
commit c845c63aec
No known key found for this signature in database
GPG Key ID: BCA00FD4B2168C0A
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pam_yubico.c
View File

@ -362,7 +362,7 @@ authorize_user_token_ldap (struct cfg *cfg,
/* Compare each value for the attribute against the token id. */ /* Compare each value for the attribute against the token id. */
for (i = 0; vals[i] != NULL; i++) for (i = 0; vals[i] != NULL; i++)
{ {
DBG("LDAP : Checking value %i: %s:%s", DBG("LDAP : Checking value %zu: %s:%s",
i + 1, i + 1,
cfg->yubi_attr_prefix ? cfg->yubi_attr_prefix : "", cfg->yubi_attr_prefix ? cfg->yubi_attr_prefix : "",
vals[i]->bv_val); vals[i]->bv_val);
@ -745,7 +745,7 @@ parse_cfg (int flags, int argc, const char **argv, struct cfg *cfg)
for (i = 0; i < argc; i++) for (i = 0; i < argc; i++)
{ {
if (strncmp (argv[i], "id=", 3) == 0) if (strncmp (argv[i], "id=", 3) == 0)
sscanf (argv[i], "id=%d", &cfg->client_id); sscanf (argv[i], "id=%u", &cfg->client_id);
if (strncmp (argv[i], "key=", 4) == 0) if (strncmp (argv[i], "key=", 4) == 0)
cfg->client_key = argv[i] + 4; cfg->client_key = argv[i] + 4;
if (strcmp (argv[i], "debug") == 0) if (strcmp (argv[i], "debug") == 0)
@ -859,7 +859,7 @@ parse_cfg (int flags, int argc, const char **argv, struct cfg *cfg)
DBG ("capath=%s", cfg->capath ? cfg->capath : "(null)"); DBG ("capath=%s", cfg->capath ? cfg->capath : "(null)");
DBG ("cainfo=%s", cfg->cainfo ? cfg->cainfo : "(null)"); DBG ("cainfo=%s", cfg->cainfo ? cfg->cainfo : "(null)");
DBG ("proxy=%s", cfg->proxy ? cfg->proxy : "(null)"); DBG ("proxy=%s", cfg->proxy ? cfg->proxy : "(null)");
DBG ("token_id_length=%d", cfg->token_id_length); DBG ("token_id_length=%u", cfg->token_id_length);
DBG ("mode=%s", cfg->mode == CLIENT ? "client" : "chresp" ); DBG ("mode=%s", cfg->mode == CLIENT ? "client" : "chresp" );
DBG ("chalresp_path=%s", cfg->chalresp_path ? cfg->chalresp_path : "(null)"); DBG ("chalresp_path=%s", cfg->chalresp_path ? cfg->chalresp_path : "(null)");
} }

4
util.c
View File

@ -419,7 +419,7 @@ load_chalresp_state(FILE *f, CR_STATE *state, bool verbose, FILE *debug_file)
* 40 is twice the size of CR_RESPONSE_SIZE * 40 is twice the size of CR_RESPONSE_SIZE
* (twice because we hex encode the challenge and response) * (twice because we hex encode the challenge and response)
*/ */
r = fscanf(f, "v2:%126[0-9a-z]:%40[0-9a-z]:%64[0-9a-z]:%d:%d", challenge_hex, response_hex, salt_hex, &iterations, &slot); r = fscanf(f, "v2:%126[0-9a-z]:%40[0-9a-z]:%64[0-9a-z]:%u:%d", challenge_hex, response_hex, salt_hex, &iterations, &slot);
if(r == 5) { if(r == 5) {
if (! yubikey_hex_p(salt_hex)) { if (! yubikey_hex_p(salt_hex)) {
D(debug_file, "Invalid salt hex input : %s", salt_hex); D(debug_file, "Invalid salt hex input : %s", salt_hex);
@ -427,7 +427,7 @@ load_chalresp_state(FILE *f, CR_STATE *state, bool verbose, FILE *debug_file)
} }
if(verbose) { if(verbose) {
D(debug_file, "Challenge: %s, hashed response: %s, salt: %s, iterations: %d, slot: %d", D(debug_file, "Challenge: %s, hashed response: %s, salt: %s, iterations: %u, slot: %d",
challenge_hex, response_hex, salt_hex, iterations, slot); challenge_hex, response_hex, salt_hex, iterations, slot);
} }