src/usr.bin/ssh/auth2-pubkey.c - diff

Return to auth2-pubkey.c CVS log

Up to [local] / src / usr.bin / ssh

version 1.59, 2016/09/21 17:44:20

version 1.60, 2016/11/30 02:57:40

Line 754

check_authkeys_file(FILE *f, char *file, Key* key, struct passwd *pw)

{

char line[SSH_MAX_PUBKEY_BYTES];

const char *reason;

int found_key = 0;

u_long linenum = 0;

Key *found;

char *fp;

found_key = 0;

found = NULL;

while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) {

char *cp, *key_options = NULL;

char *cp, *key_options = NULL, *fp = NULL;

const char *reason = NULL;

if (found != NULL)

key_free(found);

found = key_new(key_is_cert(key) ? KEY_UNSPEC : key->type);

Line 829

authorized_principals == NULL ? pw->pw_name : NULL,

&reason) != 0)

goto fail_reason;

if (auth_cert_options(key, pw) != 0) {

if (auth_cert_options(key, pw, &reason) != 0)

free(fp);

goto fail_reason;

continue;

}

verbose("Accepted certificate ID \"%s\" (serial %llu) "

"signed by %s CA %s via %s", key->cert->key_id,

(unsigned long long)key->cert->serial,

Line 910

Line 908

if (key_cert_check_authority(key, 0, 1,

use_authorized_principals ? NULL : pw->pw_name, &reason) != 0)

goto fail_reason;

if (auth_cert_options(key, pw) != 0)

if (auth_cert_options(key, pw, &reason) != 0)

goto out;

goto fail_reason;

verbose("Accepted certificate ID \"%s\" (serial %llu) signed by "

"%s CA %s via %s", key->cert->key_id,