version 1.45, 2015/01/13 07:39:19 |
version 1.46, 2015/01/28 22:36:00 |
|
|
} |
} |
|
|
if (key_is_cert(key)) { |
if (key_is_cert(key)) { |
fp = key_fingerprint(key->cert->signature_key, |
fp = sshkey_fingerprint(key->cert->signature_key, |
options.fingerprint_hash, SSH_FP_DEFAULT); |
options.fingerprint_hash, SSH_FP_DEFAULT); |
auth_info(authctxt, "%s ID %s (serial %llu) CA %s %s%s%s", |
auth_info(authctxt, "%s ID %s (serial %llu) CA %s %s%s%s", |
key_type(key), key->cert->key_id, |
key_type(key), key->cert->key_id, |
(unsigned long long)key->cert->serial, |
(unsigned long long)key->cert->serial, |
key_type(key->cert->signature_key), fp, |
key_type(key->cert->signature_key), |
|
fp == NULL ? "(null)" : "", |
extra == NULL ? "" : ", ", extra == NULL ? "" : extra); |
extra == NULL ? "" : ", ", extra == NULL ? "" : extra); |
free(fp); |
free(fp); |
} else { |
} else { |
fp = key_fingerprint(key, options.fingerprint_hash, |
fp = sshkey_fingerprint(key, options.fingerprint_hash, |
SSH_FP_DEFAULT); |
SSH_FP_DEFAULT); |
auth_info(authctxt, "%s %s%s%s", key_type(key), fp, |
auth_info(authctxt, "%s %s%s%s", key_type(key), |
|
fp == NULL ? "(null)" : "", |
extra == NULL ? "" : ", ", extra == NULL ? "" : extra); |
extra == NULL ? "" : ", ", extra == NULL ? "" : extra); |
free(fp); |
free(fp); |
} |
} |
|
|
continue; |
continue; |
if (!key_is_cert_authority) |
if (!key_is_cert_authority) |
continue; |
continue; |
fp = key_fingerprint(found, options.fingerprint_hash, |
if ((fp = sshkey_fingerprint(found, |
SSH_FP_DEFAULT); |
options.fingerprint_hash, SSH_FP_DEFAULT)) == NULL) |
|
continue; |
debug("matching CA found: file %s, line %lu, %s %s", |
debug("matching CA found: file %s, line %lu, %s %s", |
file, linenum, key_type(found), fp); |
file, linenum, key_type(found), fp); |
/* |
/* |
|
|
continue; |
continue; |
if (key_is_cert_authority) |
if (key_is_cert_authority) |
continue; |
continue; |
found_key = 1; |
if ((fp = sshkey_fingerprint(found, |
fp = key_fingerprint(found, options.fingerprint_hash, |
options.fingerprint_hash, SSH_FP_DEFAULT)) == NULL) |
SSH_FP_DEFAULT); |
continue; |
debug("matching key found: file %s, line %lu %s %s", |
debug("matching key found: file %s, line %lu %s %s", |
file, linenum, key_type(found), fp); |
file, linenum, key_type(found), fp); |
free(fp); |
free(fp); |
|
found_key = 1; |
break; |
break; |
} |
} |
} |
} |
|
|
if (!key_is_cert(key) || options.trusted_user_ca_keys == NULL) |
if (!key_is_cert(key) || options.trusted_user_ca_keys == NULL) |
return 0; |
return 0; |
|
|
ca_fp = key_fingerprint(key->cert->signature_key, |
if ((ca_fp = sshkey_fingerprint(key->cert->signature_key, |
options.fingerprint_hash, SSH_FP_DEFAULT); |
options.fingerprint_hash, SSH_FP_DEFAULT)) == NULL) |
|
return 0; |
|
|
if (sshkey_in_file(key->cert->signature_key, |
if (sshkey_in_file(key->cert->signature_key, |
options.trusted_user_ca_keys, 1, 0) != 0) { |
options.trusted_user_ca_keys, 1, 0) != 0) { |