summaryrefslogtreecommitdiff
path: root/packet.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-01-21 10:35:09 +0000
committerDamien Miller <djm@mindrot.org>2019-01-21 23:13:03 +1100
commit71e67fff946396caa110a7964da23480757258ff (patch)
tree07cae7bce377241a7b61195d0810ec91d953685e /packet.c
parent4b83e2a2cc0c12e671a77eaba1c1245894f4e884 (diff)
upstream: pass values used in KEX hash computation as sshbuf
rather than pointer+len suggested by me; implemented by markus@ ok me OpenBSD-Commit-ID: 994f33c464f4a9e0f1d21909fa3e379f5a0910f0
Diffstat (limited to 'packet.c')
-rw-r--r--packet.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/packet.c b/packet.c
index a162791b1..ec03301b9 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.c,v 1.281 2019/01/21 09:54:11 djm Exp $ */ 1/* $OpenBSD: packet.c,v 1.282 2019/01/21 10:35:09 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2483,6 +2483,12 @@ sshpkt_put_stringb(struct ssh *ssh, const struct sshbuf *v)
2483 return sshbuf_put_stringb(ssh->state->outgoing_packet, v); 2483 return sshbuf_put_stringb(ssh->state->outgoing_packet, v);
2484} 2484}
2485 2485
2486int
2487sshpkt_getb_froms(struct ssh *ssh, struct sshbuf **valp)
2488{
2489 return sshbuf_froms(ssh->state->incoming_packet, valp);
2490}
2491
2486#ifdef WITH_OPENSSL 2492#ifdef WITH_OPENSSL
2487#ifdef OPENSSL_HAS_ECC 2493#ifdef OPENSSL_HAS_ECC
2488int 2494int