Compare commits

..

No commits in common. '98d7116ee941e8df0bdb7b6b75ca56b4915ed488' and '2516984300aa158ba17304d4bbaa2e5c4a5796c0' have entirely different histories.

38
NOTES

@ -1274,42 +1274,14 @@ than 128kB, and RECV_MAX_PAYLOAD_LEN hardly matters at all. So I'm going
with 512kB / 128kB. And I confirm, that does work with WinSCP.
December 28, 2020.
Dropbear 2020.79 finally adds support for ed25519, which is a frequent
comment I've received from users because some openssh configuration
generates these keys by default I guess? Anyways, I'm finally updating
it to 2020.81.
The update went about as you would expect and seems to be successful. I
just onnected to my phone using an ed25519 user key for authentication --
it works!
So that's about time for a new release. People have apparently been
waiting since March for the WinSCP fix, though I stopped getting emails
about it and that's why I haven't bothered with it.
The only thing pending is updating to the SDK needed for the play store.
Supposedly they require 29 today and will require 30 in aug 2021. I
happen to have already used 30 for TunerTime, so I know I've got the SDK
version 30 installed all the way, so that's what I'm gonna aim for I
guess.
It's currently at 28, so that's not a huge step...
Looking at the list of things to expect when updating to SDK 30, the only
one that looks relevant is "scoped storage enforcement", which is just
the /sdcard nightmare that we've known all along is getting worse.
XXX - ed25519? new dropbear 2020.79!
XXX - ability to dynamically request <uses-permission-sdk-23 android:name="android.permission.SEND_SMS" />
XXX - Vitalii suggests giving an error message for unrecognized key types (ed25519) that are encountered in authorized_keys, so the user doesn't have to stab in the dark
XXX - on android 6 (duckling moto g2), the notification is white-on-white?
XXX - test Settings and Notifications colors in Pie (or Quiche?) "dark mode" for Alexander Chobot, and for Fionn Behrens (https://developer.android.com/guide/topics/ui/look-and-feel/darktheme)
XXX - test Settings and Notifications colors in Pie (or Quiche?) "dark mode" for Alexander Chobot, and for Fionn Behrens
XXX - crash.20200109
XXX - if the unlink(authorized_keys) fails, or if the open() fails for permission reasons, generate a Toast for the user. (confirmed that restorecon -F authorized_keys works)
XXX - ability to dynamically request <uses-permission-sdk-23 android:name="android.permission.SEND_SMS" /> (and if that's dynamic, could we make the install app permission also dynamic??)
XXX - restart the daemon on app upgrade
<receiver android:name="com.google.android.apps.youtube.app.PackageReplacedReceiver">
<intent-filter>
@ -1324,4 +1296,8 @@ XXX - test file renaming in /storage/emulated/0/download on Quiche for Ben Reave
--- new release
XXX - see if settings looks better with SDK26, if not, hack it so that the ones with strings have their states shown
XXX - try /data/data/com.termux/files/usr/bin/zsh as login shell
XXX - libiconv? HAVE_ICONV_H etc

@ -4,8 +4,8 @@ def keyprops=new Properties()
keyprops.load(new FileInputStream(rootProject.file("keystore.properties")))
android {
compileSdkVersion 30
buildToolsVersion "30.0.2"
compileSdkVersion 28
buildToolsVersion "28.0.3"
sourceSets {
main {
@ -25,10 +25,7 @@ android {
defaultConfig {
applicationId "org.galexander.sshd"
minSdkVersion 17
targetSdkVersion 30
versionCode 25
versionName "25"
targetSdkVersion 28
}
buildTypes {

@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.galexander.sshd">
package="org.galexander.sshd"
android:versionCode="24"
android:versionName="24">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

@ -132,7 +132,7 @@ public class SimpleSSHD extends Activity
b.setTitle("About");
b.setMessage(
"SimpleSSHD version " + my_version() +
"\ndropbear 2020.81" +
"\ndropbear 2019.78" +
"\nscp/sftp from OpenSSH 6.7p1" +
"\nrsync 3.1.1");
b.show();

@ -218,6 +218,9 @@ harmless.
<b>Port Number</b> to 22 (which will fail and be ignored), and then add
<tt>-p 192.168.1.123:2222</tt> to <b>Extra Commandline</b>.
<li> <tt>ed25519</tt> keys are not supported by Dropbear (yet). Use a
regular <tt>rsa</tt> key for greatest compatibility.
<li> Do not use <tt>ssh-copy-id</tt>, it will try to put the
<tt>authorized_keys</tt> file in the wrong place.
@ -227,7 +230,7 @@ harmless.
<h2>Change Log</h2>
<ul>
<li> <b>2020/12/29 Version 25:</b> Fix compatibility with WinSCP. Update to upstream Dropbear 2020.81 -- adding ed25519 support!
<li> <b>2020/03/XXX Version 25:</b> Fix compatibility with WinSCP.
<li> <b>2020/01/01 Version 24:</b> Fix crash with "Start on Open" on Android 9. New TV icon. Improve performance.
<li> <b>2019/09/21 Version 23:</b> Support Android TV.
<li> <b>2019/09/01 Version 22:</b> Add broadcast intents for start and stop.
@ -289,7 +292,6 @@ me:<br>
<li><a href="SimpleSSHD-19.apk">SimpleSSHD-19.apk</a> - last version to target SDK 11, Android 3.0 Honeycomb.
<li><a href="SimpleSSHD-23.apk">SimpleSSHD-23.apk</a>
<li><a href="SimpleSSHD-24.apk">SimpleSSHD-24.apk</a>
<li><a href="SimpleSSHD-25.apk">SimpleSSHD-25.apk</a>
</ul></p>
</body></html>

@ -301,5 +301,3 @@ be overridden at runtime with -I. 0 disables idle timeouts */
#define DROPBEAR_SVR_MULTIUSER 0
#define BUNDLED_LIBTOM 1
#define DROPBEAR_ED25519 1
#define DROPBEAR_ENABLE_GCM_MODE 1

@ -101,7 +101,8 @@ void svr_auth_password(int valid_user) {
if (testcrypt == NULL) {
/* crypt() with an invalid salt like "!!" */
dropbear_log(LOG_WARNING, "No password received from ssh client");
dropbear_log(LOG_WARNING, "No password received from ssh client",
ses.authstate.pw_name);
send_msg_userauth_failure(0, 1);
return;
}

@ -9,7 +9,6 @@ DROPBEAR_PATH := ../dropbear
DROPBEAR_SRCS := $(DROPBEAR_PATH)/atomicio.c \
$(DROPBEAR_PATH)/bignum.c \
$(DROPBEAR_PATH)/buffer.c \
$(DROPBEAR_PATH)/chachapoly.c \
$(DROPBEAR_PATH)/circbuffer.c \
$(DROPBEAR_PATH)/common-algo.c \
$(DROPBEAR_PATH)/common-channel.c \
@ -28,11 +27,8 @@ DROPBEAR_SRCS := $(DROPBEAR_PATH)/atomicio.c \
$(DROPBEAR_PATH)/dss.c \
$(DROPBEAR_PATH)/ecc.c \
$(DROPBEAR_PATH)/ecdsa.c \
$(DROPBEAR_PATH)/ed25519.c \
$(DROPBEAR_PATH)/fake-rfc2553.c \
$(DROPBEAR_PATH)/gcm.c \
$(DROPBEAR_PATH)/gendss.c \
$(DROPBEAR_PATH)/gened25519.c \
$(DROPBEAR_PATH)/genrsa.c \
$(DROPBEAR_PATH)/gensignkey.c \
$(DROPBEAR_PATH)/keyimport.c \
@ -136,7 +132,6 @@ DROPBEAR_SRCS := $(DROPBEAR_PATH)/atomicio.c \
$(DROPBEAR_PATH)/libtomcrypt/src/mac/pmac/pmac_process.c \
$(DROPBEAR_PATH)/libtomcrypt/src/mac/pmac/pmac_shift_xor.c \
$(DROPBEAR_PATH)/libtomcrypt/src/mac/pmac/pmac_test.c \
$(DROPBEAR_PATH)/libtomcrypt/src/mac/poly1305/poly1305.c \
$(DROPBEAR_PATH)/libtomcrypt/src/mac/xcbc/xcbc_done.c \
$(DROPBEAR_PATH)/libtomcrypt/src/mac/xcbc/xcbc_file.c \
$(DROPBEAR_PATH)/libtomcrypt/src/mac/xcbc/xcbc_init.c \
@ -330,10 +325,6 @@ DROPBEAR_SRCS := $(DROPBEAR_PATH)/atomicio.c \
$(DROPBEAR_PATH)/libtomcrypt/src/prngs/sober128.c \
$(DROPBEAR_PATH)/libtomcrypt/src/prngs/sprng.c \
$(DROPBEAR_PATH)/libtomcrypt/src/prngs/yarrow.c \
$(DROPBEAR_PATH)/libtomcrypt/src/stream/chacha/chacha_crypt.c \
$(DROPBEAR_PATH)/libtomcrypt/src/stream/chacha/chacha_ivctr64.c \
$(DROPBEAR_PATH)/libtomcrypt/src/stream/chacha/chacha_keystream.c \
$(DROPBEAR_PATH)/libtomcrypt/src/stream/chacha/chacha_setup.c \
$(DROPBEAR_PATH)/libtommath/bn_cutoffs.c \
$(DROPBEAR_PATH)/libtommath/bn_mp_2expt.c \
$(DROPBEAR_PATH)/libtommath/bn_mp_abs.c \

Loading…
Cancel
Save