summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/cipher.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2018-02-23 15:58:37 +0000
committermarkus <markus@openbsd.org>2018-02-23 15:58:37 +0000
commita6be8e7c63a6251fb97b03b4d58d70655939876a (patch)
treeab23f1b6a9ec810f9e6bd2601cc73cd5e2ae3b4b /usr.bin/ssh/cipher.c
parentDrop redundant bzero() calls. ses_ghash is allocated with M_ZERO, so (diff)
downloadwireguard-openbsd-a6be8e7c63a6251fb97b03b4d58d70655939876a.tar.xz
wireguard-openbsd-a6be8e7c63a6251fb97b03b4d58d70655939876a.zip
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@
Diffstat (limited to 'usr.bin/ssh/cipher.c')
-rw-r--r--usr.bin/ssh/cipher.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/cipher.c b/usr.bin/ssh/cipher.c
index d1db1b5c691..b3587b55ff3 100644
--- a/usr.bin/ssh/cipher.c
+++ b/usr.bin/ssh/cipher.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cipher.c,v 1.110 2018/02/13 03:36:56 djm Exp $ */
+/* $OpenBSD: cipher.c,v 1.111 2018/02/23 15:58:37 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -395,7 +395,7 @@ cipher_get_length(struct sshcipher_ctx *cc, u_int *plenp, u_int seqnr,
cp, len);
if (len < 4)
return SSH_ERR_MESSAGE_INCOMPLETE;
- *plenp = get_u32(cp);
+ *plenp = PEEK_U32(cp);
return 0;
}