summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2019-12-13 19:09:37 +0000
committerdjm <djm@openbsd.org>2019-12-13 19:09:37 +0000
commite62314d421640897d4a53b4a16155fc73b35a9c5 (patch)
tree128afc141ff30aeaadd554e23738369a45f4c325
parentuse ssh-sk-helper for all security key signing operations (diff)
downloadwireguard-openbsd-e62314d421640897d4a53b4a16155fc73b35a9c5.tar.xz
wireguard-openbsd-e62314d421640897d4a53b4a16155fc73b35a9c5.zip
allow sshbuf_put_stringb(buf, NULL); ok markus@
-rw-r--r--usr.bin/ssh/sshbuf-getput-basic.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/ssh/sshbuf-getput-basic.c b/usr.bin/ssh/sshbuf-getput-basic.c
index 6687fb2a6b2..2bd8e51a49c 100644
--- a/usr.bin/ssh/sshbuf-getput-basic.c
+++ b/usr.bin/ssh/sshbuf-getput-basic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshbuf-getput-basic.c,v 1.9 2019/09/06 04:53:27 djm Exp $ */
+/* $OpenBSD: sshbuf-getput-basic.c,v 1.10 2019/12/13 19:09:37 djm Exp $ */
/*
* Copyright (c) 2011 Damien Miller
*
@@ -531,6 +531,9 @@ sshbuf_put_cstring(struct sshbuf *buf, const char *v)
int
sshbuf_put_stringb(struct sshbuf *buf, const struct sshbuf *v)
{
+ if (v == NULL)
+ return sshbuf_put_string(buf, NULL, 0);
+
return sshbuf_put_string(buf, sshbuf_ptr(v), sshbuf_len(v));
}