1
0
mirror of http://galexander.org/git/simplesshd.git synced 2025-01-01 02:40:52 +00:00
Commit Graph

66 Commits

Author SHA1 Message Date
Greg Alexander
a382cafacc fix "Non-matching signing type" 2021-01-17 19:33:53 -05:00
Greg Alexander
1e9500c97e Define the filename for ed25519 keys, instead of using the default
/etc/dropbear path (which won't work on Android).
2020-12-29 10:35:26 -05:00
Greg Alexander
fd81eb7897 Remove #ifndef guards around host key filenames because they are
essential #defines.  I think they just were there from an ancient cut and
paste?
2020-12-29 10:12:07 -05:00
Greg Alexander
ecf6efb562 After a warning audit, fix the one warning that is my fault. The other
warnings all come from dropbear being sloppy about char* vs unsigned char*.
I've got a variety of opinions about what should be done about it but I'm
not going to interfere with it because they'll surely fix it upstream
sooner or later.
2020-12-29 00:35:35 -05:00
Greg Alexander
62dcaa750a Enable GCM, too. I'm not clear on what it is but default_options.h says
it should be enabled for compatibility if you can spare 6kB of executable
size.  Anyways, it's new.
2020-12-28 23:32:15 -05:00
Greg Alexander
d59d79da18 Enable ed25519, which is the main attraction for dropbear 2020.81. 2020-12-28 23:21:45 -05:00
Greg Alexander
c066139c3a Now need a dropbear config #define to use the built-in libtom. 2020-12-28 22:59:03 -05:00
Greg Alexander
fb7eab1fe9 Disable Blowfish, which is no longer supported by dropbear (but they
failed to completely remove it, so it causes a compilation error if
enabled instead of being ignored).
2020-12-28 22:58:34 -05:00
Greg Alexander
903bfa7ca2 Merge branch 'dropbear'
This time, to remove files that should have gone away (they are still
referenced in the build scripts, probably).
2020-12-28 21:28:06 -05:00
Greg Alexander
883d40f758 Whoops, the previous commit failed to take into account files that were
(should have been) deleted as part of the dropbear 2020.81 update.
Delete them now.
2020-12-28 21:27:18 -05:00
Greg Alexander
4f0a0c7e8e Remaining conflicts are more straightforward. Preserve both my hack and
dropbear's new behavior (as a fallabck) for when renaming a file using
hardlinks fails.  Either one alone would probably suffice but I know the
rename() hack works.
2020-12-28 20:37:34 -05:00
Greg Alexander
ec37382a5c Preserve the commit 60fcaa6 hack even though the hack it's embedded
within was deemed unworthy by dropbear maintainers.
2020-12-28 20:23:27 -05:00
Greg Alexander
5f12050fde Merge branch 'dropbear'
Update to dropbear-2020.81.
Does not build.  I did not even resolve the merge conflicts because the
first one I looked at wasn't entirely trivial.
2020-12-28 20:08:16 -05:00
Greg Alexander
e9d95ce283 stock dropbear-2020.81 source tree 2020-12-28 16:40:37 -05:00
Greg Alexander
f84240d5b7 change error message to be more clear 2020-01-29 19:21:25 -05:00
Greg Alexander
1cbe9b1456 remove debug output 2019-08-11 00:20:41 -04:00
Greg Alexander
71dcbc392b Normalize the dump code a little bit, and expand to 128 stack entries
just in case the problem is still there.
2019-08-11 00:19:17 -04:00
Greg Alexander
d7bd00fc2b change SIGSEGV handler to use SA_SIGINFO to get context information, and
get a stack dump too
2019-07-28 22:41:03 -04:00
Greg Alexander
7879c603fe Make a naive IP address decoder for the case where the library's
getnameinfo() doesn't work (Android 16).
2019-06-16 22:14:29 -04:00
Greg Alexander
80bb4d95c9 use rename() if the underlying filesystem doesn't support link() 2019-06-16 20:12:17 -04:00
Greg Alexander
bb8753a5a6 Disable DROPBEAR_SVR_MULTIUSER, because we don't want to be calling
setuid/seteuid sort of stuff (it won't work, and I think sec-comp or
something kills our process).  Also need to disable the sanity check.
2019-06-16 19:46:16 -04:00
Greg Alexander
b7bc52d209 Add type cast to avoid warning. 2019-06-15 23:45:11 -04:00
Greg Alexander
5a5cc34841 Use correct #define to disable using environment variable to supply
password (not that it matters, since we don't build the db client).
2019-06-15 23:44:38 -04:00
Greg Alexander
258e88e458 Merge branch 'dropbear'
Update to dropbear-2019.78.
Probably does not build...
2019-06-15 23:36:15 -04:00
Greg Alexander
9d7c6ffbfb stock dropbear-2019.78 source tree 2019-06-09 16:44:26 -04:00
Greg Alexander
22d7993e23 Find native lib directory the correct way, using
Context.getApplicationInfo().nativeLibraryDir.
2019-05-26 01:29:58 -04:00
Greg Alexander
6c276207fa add some consts to get rid of warnings (this is included in version 18
release!)
2018-05-16 16:45:29 -04:00
Greg Alexander
b1147a3aef m_free() the temps used for setting the environment 2018-05-16 16:30:28 -04:00
Greg Alexander
3c5b02beb9 change a few places that used malloc to use m_malloc instead *shrug* 2018-05-16 16:23:33 -04:00
Greg Alexander
9efa856065 add option to set environment variables 2018-05-16 16:23:12 -04:00
Greg Alexander
43cd46fd0d su is not a login shell, so if it's in the shell's filename, don't put
"-" before argv[0], but do put it in argv[1] because su accepts it as a
regular parameter ("-su" was breaking busybox)
2018-05-16 10:47:17 -04:00
Greg Alexander
651ba21816 don't call pty_release() because it always fails, and because we never
pty_setowner()ed in the first place.  never noticed it before because
it's only called if the shell command fails (apparently)
2017-04-30 11:53:20 -04:00
Greg Alexander
beed31bead improve error message when execv()ing the shell fails 2017-04-30 11:51:37 -04:00
Greg Alexander
4d888fdd81 fix typo 2016-10-16 18:38:11 -04:00
Greg Alexander
8a9503ac90 improve the formatting of the password message in the log 2016-10-16 18:25:00 -04:00
Greg Alexander
cbee2a1b67 if there is no authorized_keys file, generate a single-use password 2016-10-16 18:17:01 -04:00
Greg Alexander
60fcaa6ec9 When reading data from various spots in /proc to initialize the random
number generator:
 * reduce timeout from 2s to 1ms
 * if timeout, abort
 * only read first 4096 bytes
this is to work around the fact that on Samsung Tab 4, /proc/timer_list
is apparently 167MB!
2016-08-08 14:08:49 -04:00
Greg Alexander
3eca9d014b enable TCP port forwarding 2016-07-22 09:03:52 -04:00
Greg Alexander
41bdcb1b97 scp is now 64-bit capable as well, i think 2016-06-21 21:24:37 -04:00
Greg Alexander
f74a71fdd4 cast away the const on DROPBEAR_PIDFILE to get rid of the last warning.
that's it for warnings.
2016-06-18 16:06:10 -04:00
Greg Alexander
2eb8fa9355 don't clear the environment when spawning shells, so that android system
variables remain available (so you can run 'am' and 'pm')
2016-06-18 15:15:27 -04:00
Greg Alexander
c312fa52a3 give a warning and "unknown<af>.unknown" if we fail to get a string for
an address, instead of a fatal error
2015-11-23 08:16:43 -05:00
Greg Alexander
a916ac5c08 add 'buffersu' program to wrap rsync and make sure there is no wedging
when SuperSU is combined with rsync
2015-06-20 13:52:34 -04:00
Greg Alexander
1412edbee7 now it can execute rsync, which mostly works 2014-12-21 22:55:29 -05:00
Greg Alexander
8fb9669531 this is the only change necessary to make sftp-server "work" with dropbear
(of course, it doesn't "actually work")
2014-12-21 17:41:40 -05:00
Greg Alexander
7f0a8a63c0 build scp as a separate executable 2014-12-21 14:58:24 -05:00
Greg Alexander
93760bfb7b intercept attempts to execute "scp", and redirect them to the builtin scp 2014-12-20 20:06:02 -05:00
Greg Alexander
18f801e87a more appropriate default path for android 2014-12-16 23:51:27 -05:00
Greg Alexander
f664476da5 don't attempt to change uid, we do not run as root 2014-12-16 23:11:23 -05:00
Greg Alexander
f2b458f499 don't maintain utmp/wtmp 2014-12-16 23:06:45 -05:00