diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | dbutil.c | 2 | ||||
| -rw-r--r-- | libtomcrypt/Makefile.in | 3 | ||||
| -rw-r--r-- | libtommath/Makefile.in | 5 | ||||
| -rw-r--r-- | svr-authpubkey.c | 10 |
5 files changed, 11 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 8be542a..a3b61b3 100644 --- a/configure.ac +++ b/configure.ac @@ -828,6 +828,7 @@ AS_MKDIR_P(libtomcrypt/src/modes/ecb) AS_MKDIR_P(libtomcrypt/src/modes/ofb) AS_MKDIR_P(libtomcrypt/src/modes/f8) AS_MKDIR_P(libtomcrypt/src/modes/lrw) +AS_MKDIR_P(libtomcrypt/src/modes/xts) AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/bit) AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/boolean) AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/choice) @@ -506,7 +506,7 @@ out: void m_close(int fd) { int val; - if (fd == -1) { + if (fd < 0) { return; } diff --git a/libtomcrypt/Makefile.in b/libtomcrypt/Makefile.in index d9b3668..1c45186 100644 --- a/libtomcrypt/Makefile.in +++ b/libtomcrypt/Makefile.in @@ -9,7 +9,8 @@ VERSION=1.17 PLATFORM := $(shell uname | sed -e 's/_.*//') -srcdir=. +VPATH=@srcdir@ +srcdir=@srcdir@ # Compiler and Linker Names #CC=gcc diff --git a/libtommath/Makefile.in b/libtommath/Makefile.in index dbcd2a0..d2e78fc 100644 --- a/libtommath/Makefile.in +++ b/libtommath/Makefile.in @@ -2,7 +2,8 @@ # #Tom St Denis -srcdir=. +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)/../ @@ -26,8 +27,6 @@ endif coverage: LIBNAME:=-Wl,--whole-archive $(LIBNAME) -Wl,--no-whole-archive -include makefile.include - LCOV_ARGS=--directory . #START_INS diff --git a/svr-authpubkey.c b/svr-authpubkey.c index f6e89ee..8905ac9 100644 --- a/svr-authpubkey.c +++ b/svr-authpubkey.c @@ -196,7 +196,7 @@ static int checkpubkey_line(buffer* line, int line_num, const char* filename, int ret = DROPBEAR_FAILURE; if (line->len < MIN_AUTHKEYS_LINE || line->len > MAX_AUTHKEYS_LINE) { - TRACE(("checkpubkey: bad line length %d", line->len)) + TRACE(("checkpubkey_line: bad line length %d", line->len)) return DROPBEAR_FAILURE; } @@ -261,7 +261,7 @@ static int checkpubkey_line(buffer* line, int line_num, const char* filename, /* check for space (' ') character */ if (buf_getbyte(line) != ' ') { - TRACE(("checkpubkey: space character expected, isn't there")) + TRACE(("checkpubkey_line: space character expected, isn't there")) goto out; } @@ -273,7 +273,7 @@ static int checkpubkey_line(buffer* line, int line_num, const char* filename, buf_setpos(line, pos); buf_setlen(line, line->pos + len); - TRACE(("checkpubkey: line pos = %d len = %d", line->pos, line->len)) + TRACE(("checkpubkey_line: line pos = %d len = %d", line->pos, line->len)) ret = cmp_base64_key(keyblob, keybloblen, (const unsigned char *) algo, algolen, line, NULL); @@ -361,8 +361,8 @@ static int checkpubkey(const char* algo, unsigned int algolen, } line_num++; - if (checkpubkey_line(line, line_num, filename, - algo, algolen, keyblob, keybloblen) == DROPBEAR_SUCCESS) { + ret = checkpubkey_line(line, line_num, filename, algo, algolen, keyblob, keybloblen); + if (ret == DROPBEAR_SUCCESS) { break; } |