libtom
diff --git a/‎.gitignore
Lines changed: 2 additions & 0 deletions b/‎.gitignore
Lines changed: 2 additions & 0 deletions
diff --git a/‎Makefile.in
Lines changed: 43 additions & 29 deletions b/‎Makefile.in
Lines changed: 43 additions & 29 deletions
diff --git a/‎configure
Lines changed: 0 additions & 2 deletions b/‎configure
Lines changed: 0 additions & 2 deletions
diff --git a/‎configure.ac
Lines changed: 0 additions & 1 deletion b/‎configure.ac
Lines changed: 0 additions & 1 deletion
diff --git a/‎libtomcrypt/Makefile.in
Lines changed: 1 addition & 1 deletion b/‎libtomcrypt/Makefile.in
Lines changed: 1 addition & 1 deletion
diff --git a/‎libtommath/Makefile.in
Lines changed: 1 addition & 1 deletion b/‎libtommath/Makefile.in
Lines changed: 1 addition & 1 deletion
diff --git a/‎agentfwd.h renamed to ‎src/agentfwd.h b/‎agentfwd.h renamed to ‎src/agentfwd.h
diff --git a/‎algo.h renamed to ‎src/algo.h b/‎algo.h renamed to ‎src/algo.h
diff --git a/‎atomicio.c renamed to ‎src/atomicio.c b/‎atomicio.c renamed to ‎src/atomicio.c
diff --git a/‎atomicio.h renamed to ‎src/atomicio.h b/‎atomicio.h renamed to ‎src/atomicio.h
diff --git a/‎auth.h renamed to ‎src/auth.h b/‎auth.h renamed to ‎src/auth.h
diff --git a/‎bignum.c renamed to ‎src/bignum.c b/‎bignum.c renamed to ‎src/bignum.c
diff --git a/‎bignum.h renamed to ‎src/bignum.h b/‎bignum.h renamed to ‎src/bignum.h
diff --git a/‎buffer.c renamed to ‎src/buffer.c b/‎buffer.c renamed to ‎src/buffer.c
diff --git a/‎buffer.h renamed to ‎src/buffer.h b/‎buffer.h renamed to ‎src/buffer.h
diff --git a/‎chachapoly.c renamed to ‎src/chachapoly.c b/‎chachapoly.c renamed to ‎src/chachapoly.c
diff --git a/‎chachapoly.h renamed to ‎src/chachapoly.h b/‎chachapoly.h renamed to ‎src/chachapoly.h
diff --git a/‎channel.h renamed to ‎src/channel.h b/‎channel.h renamed to ‎src/channel.h
diff --git a/‎chansession.h renamed to ‎src/chansession.h b/‎chansession.h renamed to ‎src/chansession.h
diff --git a/‎circbuffer.c renamed to ‎src/circbuffer.c b/‎circbuffer.c renamed to ‎src/circbuffer.c
diff --git a/‎circbuffer.h renamed to ‎src/circbuffer.h b/‎circbuffer.h renamed to ‎src/circbuffer.h
diff --git a/‎cli-agentfwd.c renamed to ‎src/cli-agentfwd.c b/‎cli-agentfwd.c renamed to ‎src/cli-agentfwd.c
diff --git a/‎cli-auth.c renamed to ‎src/cli-auth.c b/‎cli-auth.c renamed to ‎src/cli-auth.c
diff --git a/‎cli-authinteract.c renamed to ‎src/cli-authinteract.c b/‎cli-authinteract.c renamed to ‎src/cli-authinteract.c
diff --git a/‎cli-authpasswd.c renamed to ‎src/cli-authpasswd.c b/‎cli-authpasswd.c renamed to ‎src/cli-authpasswd.c
diff --git a/‎cli-authpubkey.c renamed to ‎src/cli-authpubkey.c b/‎cli-authpubkey.c renamed to ‎src/cli-authpubkey.c
diff --git a/‎cli-channel.c renamed to ‎src/cli-channel.c b/‎cli-channel.c renamed to ‎src/cli-channel.c
diff --git a/‎cli-chansession.c renamed to ‎src/cli-chansession.c b/‎cli-chansession.c renamed to ‎src/cli-chansession.c
diff --git a/‎cli-kex.c renamed to ‎src/cli-kex.c b/‎cli-kex.c renamed to ‎src/cli-kex.c
diff --git a/‎cli-main.c renamed to ‎src/cli-main.c b/‎cli-main.c renamed to ‎src/cli-main.c
diff --git a/‎cli-runopts.c renamed to ‎src/cli-runopts.c b/‎cli-runopts.c renamed to ‎src/cli-runopts.c
diff --git a/‎cli-session.c renamed to ‎src/cli-session.c b/‎cli-session.c renamed to ‎src/cli-session.c
diff --git a/‎cli-tcpfwd.c renamed to ‎src/cli-tcpfwd.c b/‎cli-tcpfwd.c renamed to ‎src/cli-tcpfwd.c
diff --git a/‎common-algo.c renamed to ‎src/common-algo.c b/‎common-algo.c renamed to ‎src/common-algo.c
diff --git a/‎common-channel.c renamed to ‎src/common-channel.c b/‎common-channel.c renamed to ‎src/common-channel.c
diff --git a/‎common-chansession.c renamed to ‎src/common-chansession.c b/‎common-chansession.c renamed to ‎src/common-chansession.c
diff --git a/‎common-kex.c renamed to ‎src/common-kex.c b/‎common-kex.c renamed to ‎src/common-kex.c
diff --git a/‎common-runopts.c renamed to ‎src/common-runopts.c b/‎common-runopts.c renamed to ‎src/common-runopts.c
diff --git a/‎common-session.c renamed to ‎src/common-session.c b/‎common-session.c renamed to ‎src/common-session.c
diff --git a/‎compat.c renamed to ‎src/compat.c b/‎compat.c renamed to ‎src/compat.c
diff --git a/‎compat.h renamed to ‎src/compat.h b/‎compat.h renamed to ‎src/compat.h
diff --git a/‎crypto_desc.c renamed to ‎src/crypto_desc.c b/‎crypto_desc.c renamed to ‎src/crypto_desc.c
diff --git a/‎crypto_desc.h renamed to ‎src/crypto_desc.h b/‎crypto_desc.h renamed to ‎src/crypto_desc.h
diff --git a/‎curve25519.c renamed to ‎src/curve25519.c b/‎curve25519.c renamed to ‎src/curve25519.c
diff --git a/‎curve25519.h renamed to ‎src/curve25519.h b/‎curve25519.h renamed to ‎src/curve25519.h
diff --git a/‎dbhelpers.c renamed to ‎src/dbhelpers.c b/‎dbhelpers.c renamed to ‎src/dbhelpers.c
diff --git a/‎dbhelpers.h renamed to ‎src/dbhelpers.h b/‎dbhelpers.h renamed to ‎src/dbhelpers.h
diff --git a/‎dbmalloc.c renamed to ‎src/dbmalloc.c b/‎dbmalloc.c renamed to ‎src/dbmalloc.c
diff --git a/‎dbmalloc.h renamed to ‎src/dbmalloc.h b/‎dbmalloc.h renamed to ‎src/dbmalloc.h
diff --git a/‎dbmulti.c renamed to ‎src/dbmulti.c b/‎dbmulti.c renamed to ‎src/dbmulti.c
diff --git a/‎dbrandom.c renamed to ‎src/dbrandom.c b/‎dbrandom.c renamed to ‎src/dbrandom.c
diff --git a/‎dbrandom.h renamed to ‎src/dbrandom.h b/‎dbrandom.h renamed to ‎src/dbrandom.h
diff --git a/‎dbutil.c renamed to ‎src/dbutil.c b/‎dbutil.c renamed to ‎src/dbutil.c
diff --git a/‎dbutil.h renamed to ‎src/dbutil.h b/‎dbutil.h renamed to ‎src/dbutil.h
diff --git a/‎debug.h renamed to ‎src/debug.h b/‎debug.h renamed to ‎src/debug.h
diff --git a/‎default_options.h renamed to ‎src/default_options.h b/‎default_options.h renamed to ‎src/default_options.h
diff --git a/‎dh_groups.c renamed to ‎src/dh_groups.c b/‎dh_groups.c renamed to ‎src/dh_groups.c
diff --git a/‎dh_groups.h renamed to ‎src/dh_groups.h b/‎dh_groups.h renamed to ‎src/dh_groups.h
diff --git a/‎dropbear_lint.sh renamed to ‎src/dropbear_lint.sh b/‎dropbear_lint.sh renamed to ‎src/dropbear_lint.sh
diff --git a/‎dropbearconvert.c renamed to ‎src/dropbearconvert.c b/‎dropbearconvert.c renamed to ‎src/dropbearconvert.c
diff --git a/‎dropbearkey.c renamed to ‎src/dropbearkey.c b/‎dropbearkey.c renamed to ‎src/dropbearkey.c
diff --git a/‎dss.c renamed to ‎src/dss.c b/‎dss.c renamed to ‎src/dss.c
diff --git a/‎dss.h renamed to ‎src/dss.h b/‎dss.h renamed to ‎src/dss.h
diff --git a/‎ecc.c renamed to ‎src/ecc.c b/‎ecc.c renamed to ‎src/ecc.c
diff --git a/‎ecc.h renamed to ‎src/ecc.h b/‎ecc.h renamed to ‎src/ecc.h
diff --git a/‎ecdsa.c renamed to ‎src/ecdsa.c b/‎ecdsa.c renamed to ‎src/ecdsa.c
diff --git a/‎ecdsa.h renamed to ‎src/ecdsa.h b/‎ecdsa.h renamed to ‎src/ecdsa.h
diff --git a/‎ed25519.c renamed to ‎src/ed25519.c b/‎ed25519.c renamed to ‎src/ed25519.c
diff --git a/‎ed25519.h renamed to ‎src/ed25519.h b/‎ed25519.h renamed to ‎src/ed25519.h
diff --git a/‎fake-rfc2553.c renamed to ‎src/fake-rfc2553.c b/‎fake-rfc2553.c renamed to ‎src/fake-rfc2553.c
diff --git a/‎fake-rfc2553.h renamed to ‎src/fake-rfc2553.h b/‎fake-rfc2553.h renamed to ‎src/fake-rfc2553.h
diff --git a/‎filelist.txt renamed to ‎src/filelist.txt b/‎filelist.txt renamed to ‎src/filelist.txt
diff --git a/‎fuzz-wrapfd.h renamed to ‎src/fuzz-wrapfd.h b/‎fuzz-wrapfd.h renamed to ‎src/fuzz-wrapfd.h
diff --git a/‎fuzz.h renamed to ‎src/fuzz.h b/‎fuzz.h renamed to ‎src/fuzz.h
diff --git a/‎gcm.c renamed to ‎src/gcm.c b/‎gcm.c renamed to ‎src/gcm.c
diff --git a/‎gcm.h renamed to ‎src/gcm.h b/‎gcm.h renamed to ‎src/gcm.h
diff --git a/‎gendss.c renamed to ‎src/gendss.c b/‎gendss.c renamed to ‎src/gendss.c
diff --git a/‎gendss.h renamed to ‎src/gendss.h b/‎gendss.h renamed to ‎src/gendss.h
diff --git a/‎gened25519.c renamed to ‎src/gened25519.c b/‎gened25519.c renamed to ‎src/gened25519.c
diff --git a/‎gened25519.h renamed to ‎src/gened25519.h b/‎gened25519.h renamed to ‎src/gened25519.h
diff --git a/‎genrsa.c renamed to ‎src/genrsa.c b/‎genrsa.c renamed to ‎src/genrsa.c
diff --git a/‎genrsa.h renamed to ‎src/genrsa.h b/‎genrsa.h renamed to ‎src/genrsa.h
diff --git a/‎gensignkey.c renamed to ‎src/gensignkey.c b/‎gensignkey.c renamed to ‎src/gensignkey.c
diff --git a/‎gensignkey.h renamed to ‎src/gensignkey.h b/‎gensignkey.h renamed to ‎src/gensignkey.h
diff --git a/‎includes.h renamed to ‎src/includes.h
Lines changed: 2 additions & 2 deletions b/‎includes.h renamed to ‎src/includes.h
Lines changed: 2 additions & 2 deletions
diff --git a/‎kex.h renamed to ‎src/kex.h b/‎kex.h renamed to ‎src/kex.h
diff --git a/‎keyimport.c renamed to ‎src/keyimport.c b/‎keyimport.c renamed to ‎src/keyimport.c
diff --git a/‎keyimport.h renamed to ‎src/keyimport.h b/‎keyimport.h renamed to ‎src/keyimport.h
diff --git a/‎list.c renamed to ‎src/list.c b/‎list.c renamed to ‎src/list.c
diff --git a/‎list.h renamed to ‎src/list.h b/‎list.h renamed to ‎src/list.h
diff --git a/‎listener.c renamed to ‎src/listener.c b/‎listener.c renamed to ‎src/listener.c
diff --git a/‎listener.h renamed to ‎src/listener.h b/‎listener.h renamed to ‎src/listener.h
diff --git a/‎loginrec.c renamed to ‎src/loginrec.c b/‎loginrec.c renamed to ‎src/loginrec.c
diff --git a/‎loginrec.h renamed to ‎src/loginrec.h b/‎loginrec.h renamed to ‎src/loginrec.h
diff --git a/‎ltc_prng.c renamed to ‎src/ltc_prng.c b/‎ltc_prng.c renamed to ‎src/ltc_prng.c
diff --git a/‎ltc_prng.h renamed to ‎src/ltc_prng.h b/‎ltc_prng.h renamed to ‎src/ltc_prng.h
diff --git a/‎netio.c renamed to ‎src/netio.c b/‎netio.c renamed to ‎src/netio.c
diff --git a/‎netio.h renamed to ‎src/netio.h b/‎netio.h renamed to ‎src/netio.h
diff --git a/‎options.h renamed to ‎src/options.h b/‎options.h renamed to ‎src/options.h
diff --git a/‎packet.c renamed to ‎src/packet.c b/‎packet.c renamed to ‎src/packet.c
diff --git a/‎packet.h renamed to ‎src/packet.h b/‎packet.h renamed to ‎src/packet.h
diff --git a/‎process-packet.c renamed to ‎src/process-packet.c b/‎process-packet.c renamed to ‎src/process-packet.c
diff --git a/‎progressmeter.c renamed to ‎src/progressmeter.c b/‎progressmeter.c renamed to ‎src/progressmeter.c
diff --git a/‎progressmeter.h renamed to ‎src/progressmeter.h b/‎progressmeter.h renamed to ‎src/progressmeter.h
diff --git a/‎pubkeyapi.h renamed to ‎src/pubkeyapi.h b/‎pubkeyapi.h renamed to ‎src/pubkeyapi.h
diff --git a/‎queue.c renamed to ‎src/queue.c b/‎queue.c renamed to ‎src/queue.c
diff --git a/‎queue.h renamed to ‎src/queue.h b/‎queue.h renamed to ‎src/queue.h
diff --git a/‎rsa.c renamed to ‎src/rsa.c b/‎rsa.c renamed to ‎src/rsa.c
diff --git a/‎rsa.h renamed to ‎src/rsa.h b/‎rsa.h renamed to ‎src/rsa.h
diff --git a/‎runopts.h renamed to ‎src/runopts.h b/‎runopts.h renamed to ‎src/runopts.h
diff --git a/‎scp.c renamed to ‎src/scp.c b/‎scp.c renamed to ‎src/scp.c
diff --git a/‎scpmisc.c renamed to ‎src/scpmisc.c b/‎scpmisc.c renamed to ‎src/scpmisc.c
diff --git a/‎scpmisc.h renamed to ‎src/scpmisc.h b/‎scpmisc.h renamed to ‎src/scpmisc.h
diff --git a/‎service.h renamed to ‎src/service.h b/‎service.h renamed to ‎src/service.h
diff --git a/‎session.h renamed to ‎src/session.h b/‎session.h renamed to ‎src/session.h
diff --git a/‎signkey.c renamed to ‎src/signkey.c b/‎signkey.c renamed to ‎src/signkey.c
diff --git a/‎signkey.h renamed to ‎src/signkey.h b/‎signkey.h renamed to ‎src/signkey.h
diff --git a/‎signkey_ossh.c renamed to ‎src/signkey_ossh.c b/‎signkey_ossh.c renamed to ‎src/signkey_ossh.c
diff --git a/‎signkey_ossh.h renamed to ‎src/signkey_ossh.h b/‎signkey_ossh.h renamed to ‎src/signkey_ossh.h
diff --git a/‎sk-ecdsa.c renamed to ‎src/sk-ecdsa.c b/‎sk-ecdsa.c renamed to ‎src/sk-ecdsa.c
diff --git a/‎sk-ecdsa.h renamed to ‎src/sk-ecdsa.h b/‎sk-ecdsa.h renamed to ‎src/sk-ecdsa.h
diff --git a/‎sk-ed25519.c renamed to ‎src/sk-ed25519.c b/‎sk-ed25519.c renamed to ‎src/sk-ed25519.c
diff --git a/‎sk-ed25519.h renamed to ‎src/sk-ed25519.h b/‎sk-ed25519.h renamed to ‎src/sk-ed25519.h
diff --git a/‎ssh.h renamed to ‎src/ssh.h b/‎ssh.h renamed to ‎src/ssh.h
diff --git a/‎sshpty.c renamed to ‎src/sshpty.c b/‎sshpty.c renamed to ‎src/sshpty.c
diff --git a/‎sshpty.h renamed to ‎src/sshpty.h b/‎sshpty.h renamed to ‎src/sshpty.h
diff --git a/‎svr-agentfwd.c renamed to ‎src/svr-agentfwd.c b/‎svr-agentfwd.c renamed to ‎src/svr-agentfwd.c
diff --git a/‎svr-auth.c renamed to ‎src/svr-auth.c b/‎svr-auth.c renamed to ‎src/svr-auth.c
diff --git a/‎svr-authpam.c renamed to ‎src/svr-authpam.c b/‎svr-authpam.c renamed to ‎src/svr-authpam.c
diff --git a/‎svr-authpasswd.c renamed to ‎src/svr-authpasswd.c b/‎svr-authpasswd.c renamed to ‎src/svr-authpasswd.c
diff --git a/‎svr-authpubkey.c renamed to ‎src/svr-authpubkey.c b/‎svr-authpubkey.c renamed to ‎src/svr-authpubkey.c
diff --git a/‎svr-authpubkeyoptions.c renamed to ‎src/svr-authpubkeyoptions.c b/‎svr-authpubkeyoptions.c renamed to ‎src/svr-authpubkeyoptions.c
diff --git a/‎svr-chansession.c renamed to ‎src/svr-chansession.c b/‎svr-chansession.c renamed to ‎src/svr-chansession.c
diff --git a/‎svr-kex.c renamed to ‎src/svr-kex.c b/‎svr-kex.c renamed to ‎src/svr-kex.c
diff --git a/‎svr-main.c renamed to ‎src/svr-main.c b/‎svr-main.c renamed to ‎src/svr-main.c
diff --git a/‎svr-runopts.c renamed to ‎src/svr-runopts.c b/‎svr-runopts.c renamed to ‎src/svr-runopts.c
diff --git a/‎svr-service.c renamed to ‎src/svr-service.c b/‎svr-service.c renamed to ‎src/svr-service.c
diff --git a/‎svr-session.c renamed to ‎src/svr-session.c b/‎svr-session.c renamed to ‎src/svr-session.c
diff --git a/‎svr-tcpfwd.c renamed to ‎src/svr-tcpfwd.c b/‎svr-tcpfwd.c renamed to ‎src/svr-tcpfwd.c
diff --git a/‎svr-x11fwd.c renamed to ‎src/svr-x11fwd.c b/‎svr-x11fwd.c renamed to ‎src/svr-x11fwd.c
diff --git a/‎sysoptions.h renamed to ‎src/sysoptions.h b/‎sysoptions.h renamed to ‎src/sysoptions.h
diff --git a/‎tcp-accept.c renamed to ‎src/tcp-accept.c b/‎tcp-accept.c renamed to ‎src/tcp-accept.c
diff --git a/‎tcpfwd.h renamed to ‎src/tcpfwd.h b/‎tcpfwd.h renamed to ‎src/tcpfwd.h
diff --git a/‎termcodes.c renamed to ‎src/termcodes.c b/‎termcodes.c renamed to ‎src/termcodes.c
diff --git a/‎termcodes.h renamed to ‎src/termcodes.h b/‎termcodes.h renamed to ‎src/termcodes.h
diff --git a/‎x11fwd.h renamed to ‎src/x11fwd.h b/‎x11fwd.h renamed to ‎src/x11fwd.h
@@ -6,6 +6,7 @@
 *.bbg
 *.prof
 .*.swp
+/obj
 /autom4te.cache
 /config.log
 /config.status
@@ -27,3 +28,4 @@ tags
 .pytest*
 *.pyc
 /test/venv
+.vscode/
@@ -12,25 +12,30 @@ ifndef PROGRAMS
 	PROGRAMS=dropbear dbclient dropbearkey dropbearconvert
 endif
 
+srcdir=./src
+VPATH=$(srcdir)
+
 STATIC_LTC=libtomcrypt/libtomcrypt.a
 STATIC_LTM=libtommath/libtommath.a
 
 LIBTOM_LIBS=@LIBTOM_LIBS@
 
 ifeq (@BUNDLED_LIBTOM@, 1)
-LIBTOM_DEPS=$(STATIC_LTC) $(STATIC_LTM) 
-LIBTOM_CLEAN=ltc-clean ltm-clean
-CPPFLAGS+=-I$(srcdir)/libtomcrypt/src/headers/
-LIBTOM_LIBS=$(STATIC_LTC) $(STATIC_LTM)
+	LIBTOM_DEPS=$(STATIC_LTC) $(STATIC_LTM) 
+	LIBTOM_CLEAN=ltc-clean ltm-clean
+	CPPFLAGS+=-I./libtomcrypt/src/headers/ -I./libtommath
+	LIBTOM_LIBS=$(STATIC_LTC) $(STATIC_LTM)
 endif
 
-OPTION_HEADERS = default_options_guard.h sysoptions.h
-ifneq ($(wildcard localoptions.h),)
-CPPFLAGS+=-DLOCALOPTIONS_H_EXISTS
-OPTION_HEADERS += localoptions.h
+OPTION_HEADERS = $(srcdir)/default_options_guard.h $(srcdir)/sysoptions.h
+ifneq ($(wildcard $(srcdir)/localoptions.h),)
+	CPPFLAGS+=-DLOCALOPTIONS_H_EXISTS
+	OPTION_HEADERS += $(srcdir)/localoptions.h
 endif
 
-COMMONOBJS=dbutil.o buffer.o dbhelpers.o \
+OBJ_DIR=./obj
+
+_COMMONOBJS=dbutil.o buffer.o dbhelpers.o \
 		dss.o bignum.o \
 		signkey.o rsa.o dbrandom.o \
 		queue.o \
@@ -39,27 +44,34 @@ COMMONOBJS=dbutil.o buffer.o dbhelpers.o \
 		curve25519.o ed25519.o sk-ed25519.o \
 		dbmalloc.o \
 		gensignkey.o gendss.o genrsa.o gened25519.o
+COMMONOBJS = $(patsubst %,$(OBJ_DIR)/%,$(_COMMONOBJS))
 
-SVROBJS=svr-kex.o svr-auth.o sshpty.o \
+_SVROBJS=svr-kex.o svr-auth.o sshpty.o \
 		svr-authpasswd.o svr-authpubkey.o svr-authpubkeyoptions.o svr-session.o svr-service.o \
 		svr-chansession.o svr-runopts.o svr-agentfwd.o svr-main.o svr-x11fwd.o\
 		svr-tcpfwd.o svr-authpam.o
+SVROBJS = $(patsubst %,$(OBJ_DIR)/%,$(_SVROBJS))
 
-CLIOBJS=cli-main.o cli-auth.o cli-authpasswd.o cli-kex.o \
+_CLIOBJS=cli-main.o cli-auth.o cli-authpasswd.o cli-kex.o \
 		cli-session.o cli-runopts.o cli-chansession.o \
 		cli-authpubkey.o cli-tcpfwd.o cli-channel.o cli-authinteract.o \
 		cli-agentfwd.o 
+CLIOBJS = $(patsubst %,$(OBJ_DIR)/%,$(_CLIOBJS))
 
-CLISVROBJS=common-session.o packet.o common-algo.o common-kex.o \
-			common-channel.o common-chansession.o termcodes.o loginrec.o \
-			tcp-accept.o listener.o process-packet.o dh_groups.o \
-			common-runopts.o circbuffer.o list.o netio.o chachapoly.o gcm.o
+_CLISVROBJS=common-session.o packet.o common-algo.o common-kex.o \
+		common-channel.o common-chansession.o termcodes.o loginrec.o \
+		tcp-accept.o listener.o process-packet.o dh_groups.o \
+		common-runopts.o circbuffer.o list.o netio.o chachapoly.o gcm.o
+CLISVROBJS = $(patsubst %,$(OBJ_DIR)/%,$(_CLISVROBJS))
 
-KEYOBJS=dropbearkey.o
+_KEYOBJS=dropbearkey.o
+KEYOBJS = $(patsubst %,$(OBJ_DIR)/%,$(_KEYOBJS))
 
-CONVERTOBJS=dropbearconvert.o keyimport.o signkey_ossh.o
+_CONVERTOBJS=dropbearconvert.o keyimport.o signkey_ossh.o
+CONVERTOBJS = $(patsubst %,$(OBJ_DIR)/%,$(_CONVERTOBJS))
 
-SCPOBJS=scp.o progressmeter.o atomicio.o scpmisc.o compat.o
+_SCPOBJS=scp.o progressmeter.o atomicio.o scpmisc.o compat.o
+SCPOBJS = $(patsubst %,$(OBJ_DIR)/%,$(_SCPOBJS))
 
 ifeq (@DROPBEAR_FUZZ@, 1)
 	allobjs = $(COMMONOBJS) fuzz/fuzz-common.o  fuzz/fuzz-wrapfd.o $(CLISVROBJS) $(CLIOBJS) $(SVROBJS) @CRYPTLIB@
@@ -82,17 +94,14 @@ else
 endif
 
 ifeq (@DROPBEAR_PLUGIN@, 1)
-    # rdynamic makes all the global symbols of dropbear available to all the loaded shared libraries
-    # this allow a plugin to reuse existing crypto/utilities like base64_decode/base64_encode without
-    # the need to rewrite them.
-    PLUGIN_LIBS=-ldl -rdynamic
+	# rdynamic makes all the global symbols of dropbear available to all the loaded shared libraries
+	# this allow a plugin to reuse existing crypto/utilities like base64_decode/base64_encode without
+	# the need to rewrite them.
+	PLUGIN_LIBS=-ldl -rdynamic
 else
-    PLUGIN_LIBS=
+	PLUGIN_LIBS=
 endif
 
-VPATH=@srcdir@
-srcdir=@srcdir@
-
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 datarootdir = @datarootdir@
@@ -107,7 +116,7 @@ AR=@AR@
 RANLIB=@RANLIB@
 STRIP=@STRIP@
 INSTALL=@INSTALL@
-CPPFLAGS+=@CPPFLAGS@ -I. -I$(srcdir)
+CPPFLAGS+=@CPPFLAGS@ -I$(srcdir)
 CFLAGS+=@CFLAGS@
 LIBS+=@LIBS@
 LDFLAGS=@LDFLAGS@
@@ -150,7 +159,11 @@ all: $(TARGETS)
 
 # for simplicity assume all source depends on all headers
 HEADERS=$(wildcard $(srcdir)/*.h *.h) $(OPTION_HEADERS)
-%.o : %.c $(HEADERS)
+
+$(OBJ_DIR):
+	mkdir -p $@
+
+$(OBJ_DIR)/%.o: $(srcdir)/%.c $(HEADERS) | $(OBJ_DIR)
 	$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
 
 default_options_guard.h: default_options.h
@@ -253,7 +266,8 @@ clean: $(LIBTOM_CLEAN) $(FUZZ_CLEAN) thisclean
 thisclean:
 	-rm -f dropbear$(EXEEXT) dbclient$(EXEEXT) dropbearkey$(EXEEXT) \
 			dropbearconvert$(EXEEXT) scp$(EXEEXT) scp-progress$(EXEEXT) \
-			dropbearmulti$(EXEEXT) *.o *.da *.bb *.bbg *.prof
+			dropbearmulti$(EXEEXT) *.o *.da *.bb *.bbg *.prof \
+			$(OBJ_DIR)/*
 
 distclean: clean tidy
 	-rm -f config.h
 
@@ -613,7 +613,6 @@ PACKAGE_STRING=''
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
-ac_unique_file="buffer.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stddef.h>
@@ -2974,7 +2973,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
 # Record which revision is being built
 if test -s "`which hg`" && test -d "$srcdir/.hg"; then
 	hgrev=`hg id -i -R "$srcdir"`
 
@@ -7,7 +7,6 @@
 
 AC_PREREQ([2.59])
 AC_INIT
-AC_CONFIG_SRCDIR(buffer.c)
 
 # Record which revision is being built
 if test -s "`which hg`" && test -d "$srcdir/.hg"; then
 
@@ -42,7 +42,7 @@ ARFLAGS   = r
 EXTRALIBS = ../libtommath/libtommath.a
 
 #Compilation flags
-LTC_CFLAGS  = -Isrc/headers/ -I$(srcdir)/src/headers/ -I../ -I$(srcdir)/../ -DLTC_SOURCE -I../libtommath/ -I$(srcdir)/../libtommath/ $(CFLAGS) $(CPPFLAGS)
+LTC_CFLAGS  = -Isrc/headers/ -I$(srcdir)/src/headers/ -I$(srcdir)/../src -DLTC_SOURCE -I../libtommath/ -I$(srcdir)/../libtommath/ $(CFLAGS) $(CPPFLAGS)
 LTC_LDFLAGS = $(LDFLAGS) $(EXTRALIBS)
 VERSION=1.18.1
 
 
@@ -6,7 +6,7 @@ VPATH=@srcdir@
 srcdir=@srcdir@
 
 # So that libtommath can include Dropbear headers for options and m_burn()
-CFLAGS += -I$(srcdir) -I../libtomcrypt/src/headers/ -I$(srcdir)/../libtomcrypt/src/headers/ -I../ -I$(srcdir)/../
+CFLAGS += -I$(srcdir) -I../libtomcrypt/src/headers/ -I$(srcdir)/../libtomcrypt/src/headers/ -I$(srcdir)/../src
 CFLAGS += -Wno-deprecated
 CFLAGS += $(CPPFLAGS)
 
 
@@ -132,8 +132,8 @@
 #endif
 
 #ifdef BUNDLED_LIBTOM
-#include "libtomcrypt/src/headers/tomcrypt.h"
-#include "libtommath/tommath.h"
+#include "../libtomcrypt/src/headers/tomcrypt.h"
+#include "../libtommath/tommath.h"
 #else
 #include <tomcrypt.h>
 #include <tommath.h>