diff options
author | markus@openbsd.org <markus@openbsd.org> | 2018-02-23 15:58:37 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-02-26 11:40:41 +1100 |
commit | 1b11ea7c58cd5c59838b5fa574cd456d6047b2d4 (patch) | |
tree | 7e96cb41b5234b9d327f7c8f41392f09aed0994e /ssh-keysign.c | |
parent | 7d330a1ac02076de98cfc8fda05353d57b603755 (diff) |
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 'ssh-keysign.c')
-rw-r--r-- | ssh-keysign.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ssh-keysign.c b/ssh-keysign.c index 17e87a281..78bb66b08 100644 --- a/ssh-keysign.c +++ b/ssh-keysign.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keysign.c,v 1.53 2018/02/07 22:52:45 dtucker Exp $ */ | 1 | /* $OpenBSD: ssh-keysign.c,v 1.54 2018/02/23 15:58:38 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2002 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2002 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -171,7 +171,7 @@ main(int argc, char **argv) | |||
171 | { | 171 | { |
172 | struct sshbuf *b; | 172 | struct sshbuf *b; |
173 | Options options; | 173 | Options options; |
174 | #define NUM_KEYTYPES 4 | 174 | #define NUM_KEYTYPES 5 |
175 | struct sshkey *keys[NUM_KEYTYPES], *key = NULL; | 175 | struct sshkey *keys[NUM_KEYTYPES], *key = NULL; |
176 | struct passwd *pw; | 176 | struct passwd *pw; |
177 | int r, key_fd[NUM_KEYTYPES], i, found, version = 2, fd; | 177 | int r, key_fd[NUM_KEYTYPES], i, found, version = 2, fd; |
@@ -198,6 +198,7 @@ main(int argc, char **argv) | |||
198 | key_fd[i++] = open(_PATH_HOST_DSA_KEY_FILE, O_RDONLY); | 198 | key_fd[i++] = open(_PATH_HOST_DSA_KEY_FILE, O_RDONLY); |
199 | key_fd[i++] = open(_PATH_HOST_ECDSA_KEY_FILE, O_RDONLY); | 199 | key_fd[i++] = open(_PATH_HOST_ECDSA_KEY_FILE, O_RDONLY); |
200 | key_fd[i++] = open(_PATH_HOST_ED25519_KEY_FILE, O_RDONLY); | 200 | key_fd[i++] = open(_PATH_HOST_ED25519_KEY_FILE, O_RDONLY); |
201 | key_fd[i++] = open(_PATH_HOST_XMSS_KEY_FILE, O_RDONLY); | ||
201 | key_fd[i++] = open(_PATH_HOST_RSA_KEY_FILE, O_RDONLY); | 202 | key_fd[i++] = open(_PATH_HOST_RSA_KEY_FILE, O_RDONLY); |
202 | 203 | ||
203 | original_real_uid = getuid(); /* XXX readconf.c needs this */ | 204 | original_real_uid = getuid(); /* XXX readconf.c needs this */ |