From 40a37b6ffc2c9f6f5bfa231d584d56363f2d6adb Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 25 Feb 2025 12:15:20 +0100 Subject: [PATCH 1/2] android: Disable make-before-break reauthentication The service implementation with its handling of reauth callbacks and no-DNS TUN device etc. can't handle make-before-break reauthentication at the moment. --- .../app/src/main/jni/libandroidbridge/charonservice.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/frontends/android/app/src/main/jni/libandroidbridge/charonservice.c b/src/frontends/android/app/src/main/jni/libandroidbridge/charonservice.c index 12ac01727..bec15a321 100644 --- a/src/frontends/android/app/src/main/jni/libandroidbridge/charonservice.c +++ b/src/frontends/android/app/src/main/jni/libandroidbridge/charonservice.c @@ -504,6 +504,11 @@ static void set_options(char *logfile, jboolean ipv6) "charon.retransmit_base", ANDROID_RETRANSMIT_BASE); lib->settings->set_bool(lib->settings, "charon.initiator_only", TRUE); + /* the service currently can't handle make-before-break reauth and assumes + * the old SA is deleted before the replacement and intalls a special + * replacement TUN device in-between */ + lib->settings->set_bool(lib->settings, + "charon.make_before_break", FALSE); lib->settings->set_bool(lib->settings, "charon.close_ike_on_child_failure", TRUE); lib->settings->set_bool(lib->settings, From a299a4d3cee184f005210eec7d1b230da0300973 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 25 Feb 2025 13:40:54 +0100 Subject: [PATCH 2/2] android: New release after fixing reauthentication regression --- src/frontends/android/app/build.gradle | 4 ++-- .../android/app/src/main/play/release-notes/de-DE/default.txt | 4 ++++ .../android/app/src/main/play/release-notes/en-US/default.txt | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/frontends/android/app/build.gradle b/src/frontends/android/app/build.gradle index f513e52be..105647580 100644 --- a/src/frontends/android/app/build.gradle +++ b/src/frontends/android/app/build.gradle @@ -9,8 +9,8 @@ android { minSdkVersion 21 targetSdkVersion 34 - versionCode 87 - versionName "2.5.3" + versionCode 88 + versionName "2.5.4" externalNativeBuild { ndkBuild { diff --git a/src/frontends/android/app/src/main/play/release-notes/de-DE/default.txt b/src/frontends/android/app/src/main/play/release-notes/de-DE/default.txt index c6923513f..5cc848590 100644 --- a/src/frontends/android/app/src/main/play/release-notes/de-DE/default.txt +++ b/src/frontends/android/app/src/main/play/release-notes/de-DE/default.txt @@ -1,3 +1,7 @@ +# 2.5.4 # + +- Fixt Probleme beim Wiederherstellen der Verbindung + # 2.5.3 # - Unterstützt die Verteilung von Passwörtern in verwalteten Profilen diff --git a/src/frontends/android/app/src/main/play/release-notes/en-US/default.txt b/src/frontends/android/app/src/main/play/release-notes/en-US/default.txt index 84153240a..23bc8c75c 100644 --- a/src/frontends/android/app/src/main/play/release-notes/en-US/default.txt +++ b/src/frontends/android/app/src/main/play/release-notes/en-US/default.txt @@ -1,3 +1,7 @@ +# 2.5.4 # + +- Fix issues when reestablishing the connection + # 2.5.3 # - Add support for distributing passwords in managed profiles