summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2019-10-08 22:40:39 +0000
committerDamien Miller <djm@mindrot.org>2019-10-09 11:11:41 +1100
commitc2cc25480ba36ab48c1a577bebb12493865aad87 (patch)
tree0ae8c5b76b5dee92172f655dcd892f7b666c9b6e
parente827aedf8818e75c0016b47ed8fc231427457c43 (diff)
upstream: Correct type for end-of-list sentinel; fixes initializer
warnings on some platforms. ok deraadt. OpenBSD-Commit-ID: a990dbc2dac25bdfa07e79321349c73fd991efa2
-rw-r--r--kex.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kex.c b/kex.c
index 5a8a03aad..49d701568 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.c,v 1.154 2019/09/06 14:45:34 naddy Exp $ */ 1/* $OpenBSD: kex.c,v 1.155 2019/10/08 22:40:39 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 * 4 *
@@ -111,7 +111,7 @@ static const struct kexalg kexalgs[] = {
111 { KEX_SNTRUP4591761X25519_SHA512, KEX_KEM_SNTRUP4591761X25519_SHA512, 0, 111 { KEX_SNTRUP4591761X25519_SHA512, KEX_KEM_SNTRUP4591761X25519_SHA512, 0,
112 SSH_DIGEST_SHA512 }, 112 SSH_DIGEST_SHA512 },
113#endif /* HAVE_EVP_SHA256 || !WITH_OPENSSL */ 113#endif /* HAVE_EVP_SHA256 || !WITH_OPENSSL */
114 { NULL, -1, -1, -1}, 114 { NULL, 0, -1, -1},
115}; 115};
116 116
117char * 117char *