upstream: tidy headers; some junk snuck into sshbuf-misc.c and

sshbuf-io.c doesn't need SSHBUF_INTERNAL set

OpenBSD-Commit-ID: 27a724d2e0b2619c1a1490f44093bbd73580d9e6

diff --git a/sshbuf-io.c b/sshbuf-io.c
index 65f745858d71f5d480265b887a21c73dda23e96d..13ef40e7d272b70b52401d3b699a0ad6970cf5eb 100644 (file)
--- a/sshbuf-io.c
+++ b/sshbuf-io.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sshbuf-io.c,v 1.1 2020/01/25 23:02:14 djm Exp $ */
+/*     $OpenBSD: sshbuf-io.c,v 1.2 2020/01/25 23:28:06 djm Exp $ */
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -26,7 +26,6 @@
 #include <string.h>
 
 #include "ssherr.h"
-#define SSHBUF_INTERNAL
 #include "sshbuf.h"
 #include "atomicio.h"
 

diff --git a/sshbuf-misc.c b/sshbuf-misc.c
index 739b19f967905bbbe5e7a095467bb5e0a2b65dd5..c0336e86765922ecfa8ad0faec50b49f69e44ca0 100644 (file)
--- a/sshbuf-misc.c
+++ b/sshbuf-misc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sshbuf-misc.c,v 1.12 2020/01/25 23:02:14 djm Exp $    */
+/*     $OpenBSD: sshbuf-misc.c,v 1.13 2020/01/25 23:28:06 djm Exp $    */
 /*
  * Copyright (c) 2011 Damien Miller
  *