From e5b9f0f2ee6e133894307e44e862b66426990733 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 15 May 2014 14:58:07 +1000
Subject: [PATCH]  - (djm) [Makefile.in configure.ac sshbuf-getput-basic.c]   
 [sshbuf-getput-crypto.c sshbuf.c] compilation and portability fixes

---
 ChangeLog              |  2 ++
 Makefile.in            | 12 ++++++++++--
 configure.ac           |  5 +++--
 sshbuf-getput-basic.c  |  2 +-
 sshbuf-getput-crypto.c |  2 +-
 sshbuf.c               |  2 +-
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b82468258..976e4ba1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -89,6 +89,8 @@
      OK from djm@ and dtucker@
  - (djm) [configure.ac] Unconditionally define WITH_OPENSSL until we write
    portability glue to support building without libcrypto
+ - (djm) [Makefile.in configure.ac sshbuf-getput-basic.c]
+   [sshbuf-getput-crypto.c sshbuf.c] compilation and portability fixes
 
 20140430
  - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already
diff --git a/Makefile.in b/Makefile.in
index 28a8ec41b..53f0f1f72 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.356 2014/02/04 00:12:56 djm Exp $
+# $Id: Makefile.in,v 1.357 2014/05/15 04:58:08 djm Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -63,7 +63,15 @@ MANFMT=@MANFMT@
 
 TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT)
 
-LIBSSH_OBJS=authfd.o authfile.o bufaux.o bufbn.o buffer.o \
+LIBOPENSSH_OBJS=\
+	ssherr.o \
+	sshbuf.o \
+	sshbuf-getput-basic.o \
+	sshbuf-misc.o \
+	sshbuf-getput-crypto.o
+
+LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
+	authfd.o authfile.o bufaux.o bufbn.o buffer.o \
 	canohost.o channels.o cipher.o cipher-aes.o \
 	cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
 	compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \
diff --git a/configure.ac b/configure.ac
index 2a30eec60..058cfd090 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.572 2014/05/15 04:43:38 djm Exp $
+# $Id: configure.ac,v 1.573 2014/05/15 04:58:08 djm Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
-AC_REVISION($Revision: 1.572 $)
+AC_REVISION($Revision: 1.573 $)
 AC_CONFIG_SRCDIR([ssh.c])
 AC_LANG([C])
 
@@ -2359,6 +2359,7 @@ AC_RUN_IFELSE(
 
 # XXX make --without-openssl work
 AC_DEFINE_UNQUOTED([WITH_OPENSSL], [1], [use libcrypto for cryptography])
+AC_DEFINE_UNQUOTED([WITH_SSH1], [1], [include SSH protocol version 1 support])
 
 AC_ARG_WITH([openssl-header-check],
 	[  --without-openssl-header-check Disable OpenSSL version consistency check],
diff --git a/sshbuf-getput-basic.c b/sshbuf-getput-basic.c
index 6b16b214d..b7d0758c2 100644
--- a/sshbuf-getput-basic.c
+++ b/sshbuf-getput-basic.c
@@ -15,6 +15,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define SSHBUF_INTERNAL
 #include "includes.h"
 
 #include <sys/types.h>
@@ -23,7 +24,6 @@
 #include <string.h>
 
 #include "ssherr.h"
-#define SSHBUF_INTERNAL
 #include "sshbuf.h"
 
 int
diff --git a/sshbuf-getput-crypto.c b/sshbuf-getput-crypto.c
index 9c801a45f..ca1c7ec65 100644
--- a/sshbuf-getput-crypto.c
+++ b/sshbuf-getput-crypto.c
@@ -15,6 +15,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define SSHBUF_INTERNAL
 #include "includes.h"
 
 #include <sys/types.h>
@@ -26,7 +27,6 @@
 #include <openssl/ec.h>
 
 #include "ssherr.h"
-#define SSHBUF_INTERNAL
 #include "sshbuf.h"
 
 int
diff --git a/sshbuf.c b/sshbuf.c
index 11d8d41df..36a8b92f6 100644
--- a/sshbuf.c
+++ b/sshbuf.c
@@ -15,6 +15,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define SSHBUF_INTERNAL
 #include "includes.h"
 
 #include <sys/types.h>
@@ -25,7 +26,6 @@
 #include <string.h>
 
 #include "ssherr.h"
-#define SSHBUF_INTERNAL
 #include "sshbuf.h"
 
 static inline int