Browse Source

dropbear: fix issue #10

Waldemar Brodkorb 6 years ago
parent
commit
b8e8656b10
2 changed files with 6 additions and 4 deletions
  1. 1 1
      package/dropbear/Makefile
  2. 5 3
      package/dropbear/patches/patch-svr-authpubkey_c

+ 1 - 1
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

+ 5 - 3
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;
  	}