View | Details | Raw Unified | Return to bug 1765
Collapse All | Expand All

(-)auth2-pubkey.c (-5 / +11 lines)
Lines 290-302 user_key_allowed2(struct passwd *pw, Key Link Here
290
				continue;
290
				continue;
291
			}
291
			}
292
		}
292
		}
293
		if (auth_parse_options(pw, key_options, file, linenum) != 1)
294
			continue;
295
		if (key_is_cert(key)) {
293
		if (key_is_cert(key)) {
296
			if (!key_is_cert_authority)
297
				continue;
298
			if (!key_equal(found, key->cert->signature_key))
294
			if (!key_equal(found, key->cert->signature_key))
299
				continue;
295
				continue;
296
			if (auth_parse_options(pw, key_options, file,
297
			    linenum) != 1)
298
				continue;
299
			if (!key_is_cert_authority)
300
				continue;
300
			fp = key_fingerprint(found, SSH_FP_MD5,
301
			fp = key_fingerprint(found, SSH_FP_MD5,
301
			    SSH_FP_HEX);
302
			    SSH_FP_HEX);
302
			debug("matching CA found: file %s, line %lu, %s %s",
303
			debug("matching CA found: file %s, line %lu, %s %s",
Lines 331-337 user_key_allowed2(struct passwd *pw, Key Link Here
331
			xfree(fp);
332
			xfree(fp);
332
			found_key = 1;
333
			found_key = 1;
333
			break;
334
			break;
334
		} else if (!key_is_cert_authority && key_equal(found, key)) {
335
		} else if (key_equal(found, key)) {
336
			if (auth_parse_options(pw, key_options, file,
337
			    linenum) != 1)
338
				continue;
339
			if (key_is_cert_authority)
340
				continue;
335
			found_key = 1;
341
			found_key = 1;
336
			debug("matching key found: file %s, line %lu",
342
			debug("matching key found: file %s, line %lu",
337
			    file, linenum);
343
			    file, linenum);

Return to bug 1765