diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-07-06 20:08:26 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-07-06 20:08:26 +0200 |
| commit | b8e8656b109de2dec2e754f962cac6ff4da874d5 (patch) | |
| tree | d4842d8a22e50db029595dbb66ebd3cfd72c97ae /package | |
| parent | 870a6458fe6acfb1646f68e54bec413685cfce49 (diff) | |
dropbear: fix issue #10
Diffstat (limited to 'package')
| -rw-r--r-- | package/dropbear/Makefile | 2 | ||||
| -rw-r--r-- | package/dropbear/patches/patch-svr-authpubkey_c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 7a3f2b074..51b90d007 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= dropbear PKG_VERSION:= 2017.75 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= 6cbc1dcb1c9709d226dff669e5604172a18cf5dbf9a201474d5618ae4465098c PKG_DESCR:= ssh server/client designed for embedded systems PKG_SECTION:= net/security diff --git a/package/dropbear/patches/patch-svr-authpubkey_c b/package/dropbear/patches/patch-svr-authpubkey_c index fe63792f7..0de885cfb 100644 --- a/package/dropbear/patches/patch-svr-authpubkey_c +++ b/package/dropbear/patches/patch-svr-authpubkey_c @@ -1,6 +1,6 @@ --- dropbear-2017.75.orig/svr-authpubkey.c 2017-05-18 16:47:02.000000000 +0200 -+++ dropbear-2017.75/svr-authpubkey.c 2017-05-24 00:12:02.175883130 +0200 -@@ -220,24 +220,31 @@ static int checkpubkey(char* algo, unsig ++++ dropbear-2017.75/svr-authpubkey.c 2017-07-06 19:45:36.765143131 +0200 +@@ -220,24 +220,33 @@ static int checkpubkey(char* algo, unsig goto out; } @@ -43,12 +43,14 @@ + authfile = fopen(filename, "r"); + + } else { ++ origuid = getuid(); ++ origgid = getgid(); + authfile = fopen("/etc/dropbear/authorized_keys","r"); + } if ((seteuid(origuid)) < 0 || (setegid(origgid)) < 0) { -@@ -396,26 +403,39 @@ static int checkpubkeyperms() { +@@ -396,26 +405,39 @@ static int checkpubkeyperms() { goto out; } |