summaryrefslogtreecommitdiffstats
path: root/package/dropbear/patches
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-03-06 03:53:29 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-03-06 03:53:29 +0000
commita4d8c8e5caa11cb5301bedeb4aa29c880f599a2c (patch)
treedbb734891c63f90aa68df75bc65d4dee436c1640 /package/dropbear/patches
parentf77b88d124ea1c900f9cf5e04046939aad48bbe1 (diff)
bring up to date with nbd's br2_test20.tar.bz2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@308 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/dropbear/patches')
-rw-r--r--package/dropbear/patches/change-user.patch15
-rw-r--r--package/dropbear/patches/use-dev-urandom.patch12
2 files changed, 27 insertions, 0 deletions
diff --git a/package/dropbear/patches/change-user.patch b/package/dropbear/patches/change-user.patch
new file mode 100644
index 000000000..3dc068f8b
--- /dev/null
+++ b/package/dropbear/patches/change-user.patch
@@ -0,0 +1,15 @@
+--- dropbear-0.44.old/svr-chansession.c 2005-02-03 02:29:44.000000000 +0100
++++ dropbear-0.44/svr-chansession.c 2005-02-03 02:31:05.000000000 +0100
+@@ -859,10 +859,10 @@
+ /* We can only change uid/gid as root ... */
+ if (getuid() == 0) {
+
+- if ((setgid(ses.authstate.pw->pw_gid) < 0) ||
++ if ((ses.authstate.pw->pw_uid != 0) && ((setgid(ses.authstate.pw->pw_gid) < 0) ||
+ (initgroups(ses.authstate.pw->pw_name,
+ ses.authstate.pw->pw_gid) < 0) ||
+- (setuid(ses.authstate.pw->pw_uid) < 0)) {
++ (setuid(ses.authstate.pw->pw_uid) < 0))) {
+ dropbear_exit("error changing user");
+ }
+ } else {
diff --git a/package/dropbear/patches/use-dev-urandom.patch b/package/dropbear/patches/use-dev-urandom.patch
new file mode 100644
index 000000000..139728308
--- /dev/null
+++ b/package/dropbear/patches/use-dev-urandom.patch
@@ -0,0 +1,12 @@
+diff -urN dropbear-0.44.old/options.h dropbear-0.44/options.h
+--- dropbear-0.44.old/options.h 2005-03-02 23:08:07.000000000 +0100
++++ dropbear-0.44/options.h 2005-03-03 01:12:21.000000000 +0100
+@@ -139,7 +139,7 @@
+ * will prevent Dropbear from blocking on the device. This could
+ * however significantly reduce the security of your ssh connections
+ * if the PRNG state becomes simpler. */
+-#define DROPBEAR_RANDOM_DEV "/dev/random"
++#define DROPBEAR_RANDOM_DEV "/dev/urandom"
+
+ /* prngd must be manually set up to produce output */
+ /*#define DROPBEAR_PRNGD_SOCKET "/var/run/dropbear-rng"*/