diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-07-03 03:43:18 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-07-15 15:35:09 +1000 |
commit | c28fc62d789d860c75e23a9fa9fb250eb2beca57 (patch) | |
tree | 9b540db8aed167256bb61cd9df90dbedb31cc79d /authfile.c | |
parent | 564d63e1b4a9637a209d42a9d49646781fc9caef (diff) |
upstream commit
delete support for legacy v00 certificates; "sure"
markus@ dtucker@
Upstream-ID: b5b9bb5f9202d09e88f912989d74928601b6636f
Diffstat (limited to 'authfile.c')
-rw-r--r-- | authfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/authfile.c b/authfile.c index 728b136a7..6ba638098 100644 --- a/authfile.c +++ b/authfile.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: authfile.c,v 1.114 2015/04/17 13:32:09 djm Exp $ */ | 1 | /* $OpenBSD: authfile.c,v 1.115 2015/07/03 03:43:18 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -467,7 +467,7 @@ sshkey_load_private_cert(int type, const char *filename, const char *passphrase, | |||
467 | goto out; | 467 | goto out; |
468 | } | 468 | } |
469 | 469 | ||
470 | if ((r = sshkey_to_certified(key, sshkey_cert_is_legacy(cert))) != 0 || | 470 | if ((r = sshkey_to_certified(key)) != 0 || |
471 | (r = sshkey_cert_copy(cert, key)) != 0) | 471 | (r = sshkey_cert_copy(cert, key)) != 0) |
472 | goto out; | 472 | goto out; |
473 | r = 0; | 473 | r = 0; |