From 4346edab2ed56943ea4f7bc61380dfeab65817d4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 1 Mar 2014 13:40:07 +0100 Subject: update to latest upstream, fix x86_64 x32 problems --- package/dropbear/patches/patch-Makefile_in | 34 ------------------ .../patch-libtomcrypt_src_headers_tomcrypt_cfg_h | 14 ++++++++ ...patch-libtomcrypt_src_headers_tomcrypt_macros_h | 41 ++++++++++++++++++++++ .../patch-libtommath_bn_mp_montgomery_setup_c | 14 ++++++++ .../dropbear/patches/patch-libtommath_tommath_h | 14 ++++++++ package/dropbear/patches/patch-options_h | 6 ++-- package/dropbear/patches/patch-svr-authpubkey_c | 12 +++---- 7 files changed, 92 insertions(+), 43 deletions(-) delete mode 100644 package/dropbear/patches/patch-Makefile_in create mode 100644 package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_cfg_h create mode 100644 package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_macros_h create mode 100644 package/dropbear/patches/patch-libtommath_bn_mp_montgomery_setup_c create mode 100644 package/dropbear/patches/patch-libtommath_tommath_h (limited to 'package/dropbear/patches') diff --git a/package/dropbear/patches/patch-Makefile_in b/package/dropbear/patches/patch-Makefile_in deleted file mode 100644 index 890900ee5..000000000 --- a/package/dropbear/patches/patch-Makefile_in +++ /dev/null @@ -1,34 +0,0 @@ ---- dropbear-2013.58.orig/Makefile.in 2013-04-18 16:58:14.000000000 +0200 -+++ dropbear-2013.58/Makefile.in 2013-08-13 14:33:37.000000000 +0200 -@@ -56,7 +56,7 @@ HEADERS=options.h dbutil.h session.h pac - loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \ - listener.h fake-rfc2553.h - --dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@ -+dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) - dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS) - dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS) - dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS) -@@ -75,10 +75,9 @@ AR=@AR@ - RANLIB=@RANLIB@ - STRIP=@STRIP@ - INSTALL=@INSTALL@ --CPPFLAGS=@CPPFLAGS@ --CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@ --LIBS+=@LIBS@ --LDFLAGS=@LDFLAGS@ -+CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir) -+LIBS+=@LIBS@ @CRYPTLIB@ -+LDFLAGS+=@LDFLAGS@ - - EXEEXT=@EXEEXT@ - -@@ -169,7 +168,7 @@ scp: $(SCPOBJS) $(HEADERS) Makefile - # multi-binary compilation. - MULTIOBJS= - ifeq ($(MULTI),1) -- MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@ -+ MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) - CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI - endif - diff --git a/package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_cfg_h b/package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_cfg_h new file mode 100644 index 000000000..ef0231e4c --- /dev/null +++ b/package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_cfg_h @@ -0,0 +1,14 @@ +fix from +http://lists.openembedded.org/pipermail/openembedded-core/2013-May/079000.html + +--- dropbear-2014.63.orig/libtomcrypt/src/headers/tomcrypt_cfg.h 2014-02-19 15:05:24.000000000 +0100 ++++ dropbear-2014.63/libtomcrypt/src/headers/tomcrypt_cfg.h 2014-03-01 12:35:01.000000000 +0100 +@@ -60,7 +60,7 @@ LTC_EXPORT int LTC_CALL XSTRCMP(const + #define ENDIAN_LITTLE + #define ENDIAN_32BITWORD + #define LTC_FAST +- #define LTC_FAST_TYPE unsigned long ++ #define LTC_FAST_TYPE unsigned long long + #endif + + /* detects MIPS R5900 processors (PS2) */ diff --git a/package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_macros_h b/package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_macros_h new file mode 100644 index 000000000..b4db81a06 --- /dev/null +++ b/package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_macros_h @@ -0,0 +1,41 @@ +fix from: +http://lists.openembedded.org/pipermail/openembedded-core/2013-May/079000.html + +--- dropbear-2014.63.orig/libtomcrypt/src/headers/tomcrypt_macros.h 2014-02-19 15:05:24.000000000 +0100 ++++ dropbear-2014.63/libtomcrypt/src/headers/tomcrypt_macros.h 2014-03-01 12:36:23.000000000 +0100 +@@ -343,7 +343,7 @@ static inline unsigned RORc(unsigned wor + /* 64-bit Rotates */ + #if !defined(__STRICT_ANSI__) && defined(__GNUC__) && defined(__x86_64__) && !defined(LTC_NO_ASM) + +-static inline unsigned long ROL64(unsigned long word, int i) ++static inline unsigned long long ROL64(unsigned long long word, int i) + { + asm("rolq %%cl,%0" + :"=r" (word) +@@ -351,7 +351,7 @@ static inline unsigned long ROL64(unsign + return word; + } + +-static inline unsigned long ROR64(unsigned long word, int i) ++static inline unsigned long long ROR64(unsigned long long word, int i) + { + asm("rorq %%cl,%0" + :"=r" (word) +@@ -361,7 +361,7 @@ static inline unsigned long ROR64(unsign + + #ifndef LTC_NO_ROLC + +-static inline unsigned long ROL64c(unsigned long word, const int i) ++static inline unsigned long long ROL64c(unsigned long long word, const int i) + { + asm("rolq %2,%0" + :"=r" (word) +@@ -369,7 +369,7 @@ static inline unsigned long ROL64c(unsig + return word; + } + +-static inline unsigned long ROR64c(unsigned long word, const int i) ++static inline unsigned long long ROR64c(unsigned long long word, const int i) + { + asm("rorq %2,%0" + :"=r" (word) diff --git a/package/dropbear/patches/patch-libtommath_bn_mp_montgomery_setup_c b/package/dropbear/patches/patch-libtommath_bn_mp_montgomery_setup_c new file mode 100644 index 000000000..a821eb2f9 --- /dev/null +++ b/package/dropbear/patches/patch-libtommath_bn_mp_montgomery_setup_c @@ -0,0 +1,14 @@ +fix from +http://lists.openembedded.org/pipermail/openembedded-core/2013-May/079000.html + +--- dropbear-2014.63.orig/libtommath/bn_mp_montgomery_setup.c 2014-02-19 15:05:24.000000000 +0100 ++++ dropbear-2014.63/libtommath/bn_mp_montgomery_setup.c 2014-03-01 12:34:21.000000000 +0100 +@@ -48,7 +48,7 @@ mp_montgomery_setup (mp_int * n, mp_digi + #endif + + /* rho = -1/m mod b */ +- *rho = (unsigned long)(((mp_word)1 << ((mp_word) DIGIT_BIT)) - x) & MP_MASK; ++ *rho = (mp_digit)(((mp_word)1 << ((mp_word) DIGIT_BIT)) - x) & MP_MASK; + + return MP_OKAY; + } diff --git a/package/dropbear/patches/patch-libtommath_tommath_h b/package/dropbear/patches/patch-libtommath_tommath_h new file mode 100644 index 000000000..d4716f2dc --- /dev/null +++ b/package/dropbear/patches/patch-libtommath_tommath_h @@ -0,0 +1,14 @@ +fix from +http://lists.openembedded.org/pipermail/openembedded-core/2013-May/079000.html + +--- dropbear-2014.63.orig/libtommath/tommath.h 2014-02-19 15:05:24.000000000 +0100 ++++ dropbear-2014.63/libtommath/tommath.h 2014-03-01 12:33:13.000000000 +0100 +@@ -73,7 +73,7 @@ extern "C" { + typedef signed long long long64; + #endif + +- typedef unsigned long mp_digit; ++ typedef unsigned long long mp_digit; + typedef unsigned long mp_word __attribute__ ((mode(TI))); + + #define DIGIT_BIT 60 diff --git a/package/dropbear/patches/patch-options_h b/package/dropbear/patches/patch-options_h index 88a081624..201444e68 100644 --- a/package/dropbear/patches/patch-options_h +++ b/package/dropbear/patches/patch-options_h @@ -1,7 +1,7 @@ diff -Nur dropbear-2013.58.orig/options.h dropbear-2013.58/options.h ---- dropbear-2013.58.orig/options.h 2013-04-18 16:58:14.000000000 +0200 -+++ dropbear-2013.58/options.h 2013-08-13 14:29:15.000000000 +0200 -@@ -247,7 +247,7 @@ much traffic. */ +--- dropbear-2014.63.orig/options.h 2014-02-19 15:05:24.000000000 +0100 ++++ dropbear-2014.63/options.h 2014-02-27 16:29:06.000000000 +0100 +@@ -264,7 +264,7 @@ much traffic. */ /* The command to invoke for xauth when using X11 forwarding. * "-q" for quiet */ #ifndef XAUTH_COMMAND diff --git a/package/dropbear/patches/patch-svr-authpubkey_c b/package/dropbear/patches/patch-svr-authpubkey_c index 289471f38..90ec56d9e 100644 --- a/package/dropbear/patches/patch-svr-authpubkey_c +++ b/package/dropbear/patches/patch-svr-authpubkey_c @@ -1,7 +1,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- dropbear-0.52.orig/svr-authpubkey.c 2008-11-11 15:09:03.000000000 +0100 -+++ dropbear-0.52/svr-authpubkey.c 2009-03-19 19:29:53.000000000 +0100 -@@ -209,6 +209,8 @@ static int checkpubkey(unsigned char* al +--- dropbear-2014.63.orig/svr-authpubkey.c 2014-02-19 15:05:24.000000000 +0100 ++++ dropbear-2014.63/svr-authpubkey.c 2014-02-27 16:29:05.000000000 +0100 +@@ -208,6 +208,8 @@ static int checkpubkey(unsigned char* al goto out; } @@ -10,7 +10,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ /* we don't need to check pw and pw_dir for validity, since * its been done in checkpubkeyperms. */ len = strlen(ses.authstate.pw_dir); -@@ -220,6 +222,9 @@ static int checkpubkey(unsigned char* al +@@ -219,6 +221,9 @@ static int checkpubkey(unsigned char* al /* open the file */ authfile = fopen(filename, "r"); @@ -20,7 +20,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ if (authfile == NULL) { goto out; } -@@ -372,6 +377,8 @@ static int checkpubkeyperms() { +@@ -371,6 +376,8 @@ static int checkpubkeyperms() { goto out; } @@ -29,7 +29,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ /* allocate max required pathname storage, * = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */ filename = m_malloc(len + 22); -@@ -393,6 +400,14 @@ static int checkpubkeyperms() { +@@ -392,6 +399,14 @@ static int checkpubkeyperms() { if (checkfileperm(filename) != DROPBEAR_SUCCESS) { goto out; } -- cgit v1.2.3