diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2019-05-03 03:25:18 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-05-08 18:42:43 +1000 |
commit | 99043bd64e5e0f427173f4fa83ef25a4676624a3 (patch) | |
tree | 536ae01baf0d5878030978404016a283e59c9b45 /sshkey.c | |
parent | 8fcfb7789c43a19d24162a7a4055cd09ee951b34 (diff) |
upstream: Wrap XMSS including in ifdef. Patch from markus at
blueflash.cc, ok djm
OpenBSD-Commit-ID: e3b34fc35cf12d33bde91ac03633210a3bc0f8b5
Diffstat (limited to 'sshkey.c')
-rw-r--r-- | sshkey.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.c,v 1.73 2019/01/21 09:54:11 djm Exp $ */ | 1 | /* $OpenBSD: sshkey.c,v 1.74 2019/05/03 03:25:18 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Alexander von Gernler. All rights reserved. | 4 | * Copyright (c) 2008 Alexander von Gernler. All rights reserved. |
@@ -55,10 +55,12 @@ | |||
55 | #include "digest.h" | 55 | #include "digest.h" |
56 | #define SSHKEY_INTERNAL | 56 | #define SSHKEY_INTERNAL |
57 | #include "sshkey.h" | 57 | #include "sshkey.h" |
58 | #include "sshkey-xmss.h" | ||
59 | #include "match.h" | 58 | #include "match.h" |
60 | 59 | ||
60 | #ifdef WITH_XMSS | ||
61 | #include "sshkey-xmss.h" | ||
61 | #include "xmss_fast.h" | 62 | #include "xmss_fast.h" |
63 | #endif | ||
62 | 64 | ||
63 | #include "openbsd-compat/openssl-compat.h" | 65 | #include "openbsd-compat/openssl-compat.h" |
64 | 66 | ||