diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2018-02-23 16:58:37 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-02-26 01:40:41 +0100 |
| commit | 1b11ea7c58cd5c59838b5fa574cd456d6047b2d4 (patch) | |
| tree | 7e96cb41b5234b9d327f7c8f41392f09aed0994e /authfile.c | |
| parent | upstream: some cleanup for BindInterface and ssh-keyscan; (diff) | |
| download | openssh-1b11ea7c58cd5c59838b5fa574cd456d6047b2d4.tar.xz openssh-1b11ea7c58cd5c59838b5fa574cd456d6047b2d4.zip | |
upstream: Add experimental support for PQC XMSS keys (Extended
Hash-Based Signatures) The code is not compiled in by default (see WITH_XMSS
in Makefile.inc) Joint work with stefan-lukas_gazdag at genua.eu See
https://tools.ietf.org/html/draft-irtf-cfrg-xmss-hash-based-signatures-12 ok
djm@
OpenBSD-Commit-ID: ef3eccb96762a5d6f135d7daeef608df7776a7ac
Diffstat (limited to 'authfile.c')
| -rw-r--r-- | authfile.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/authfile.c b/authfile.c index d09b700d2..57dcd808c 100644 --- a/authfile.c +++ b/authfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: authfile.c,v 1.127 2017/07/01 13:50:45 djm Exp $ */ +/* $OpenBSD: authfile.c,v 1.128 2018/02/23 15:58:37 markus Exp $ */ /* * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved. * @@ -191,6 +191,8 @@ sshkey_load_private_type(int type, const char *filename, const char *passphrase, *perm_ok = 1; r = sshkey_load_private_type_fd(fd, type, passphrase, keyp, commentp); + if (r == 0 && keyp && *keyp) + r = sshkey_set_filename(*keyp, filename); out: close(fd); return r; @@ -249,6 +251,9 @@ sshkey_load_private(const char *filename, const char *passphrase, (r = sshkey_parse_private_fileblob(buffer, passphrase, keyp, commentp)) != 0) goto out; + if (keyp && *keyp && + (r = sshkey_set_filename(*keyp, filename)) != 0) + goto out; r = 0; out: close(fd); @@ -397,6 +402,7 @@ sshkey_load_private_cert(int type, const char *filename, const char *passphrase, case KEY_ECDSA: #endif /* WITH_OPENSSL */ case KEY_ED25519: + case KEY_XMSS: case KEY_UNSPEC: break; default: |