Some fixes

.github/workflows/main.yml

@@ -35,10 +35,10 @@ jobs:
       # if this check fails, you have to update the number of auto types known and the list of auto types in the check below
       - name: Check auto types are up-to-date
         run: |
-          [[ "$(find src -type f -name '*.[ch]' -exec awk '/^#define auto_[\W]*/ {print $2}' '{}' \; | sort -u | wc -l)" == "8" ]] || exit -1
+          [[ "$(find src -type f -name '*.[ch]' -exec awk '/^#define auto_[\W]*/ {print $2}' '{}' \; | sort -u | wc -l)" == "9" ]] || exit -1
       - name: Check auto types are initialized
         run: |
-          grep -P 'auto_(char|gchar|gcharv|guchar|jid|sqlite|gfd|FILE)[\w *]*;$' -r src && exit -1 || true
+          grep -P 'auto_(char|gchar|gcharv|gerror|guchar|jid|sqlite|gfd|FILE)[\w *]*;$' -r src && exit -1 || true
       - name: Run clang-format
         uses: jidicula/[email protected]
         with:

Makefile.am

@@ -285,7 +285,7 @@ endif
 
 TESTS = tests/unittests/unittests
 check_PROGRAMS = tests/unittests/unittests
-tests_unittests_unittests_CPPFLAGS = -Itests/
+tests_unittests_unittests_CPPFLAGS = -I$(srcdir)/tests/
 tests_unittests_unittests_SOURCES = $(unittest_sources)
 tests_unittests_unittests_LDADD = -lcmocka
 
@@ -348,7 +348,7 @@ endif
 
 .PHONY: my-prof.supp
 my-prof.supp:
-	@sed '/^# AUTO-GENERATED START/q' prof.supp > $@
+	@sed '/^# AUTO-GENERATED START/q' $(srcdir)/prof.supp > $@
 	@printf "\n\n# glib\n" >> $@
 	@cat /usr/share/glib-2.0/valgrind/glib.supp >> $@
 	@printf "\n\n# Python\n" >> $@

configure.ac

@@ -173,6 +173,19 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([[
     [AC_MSG_RESULT([yes])],
     [AC_MSG_ERROR([libstrophe is broken, check config.log for details])])
 
+AC_MSG_CHECKING([whether libstrophe has XMPP_CERT_PUBKEY_FINGERPRINT_SHA256 support])
+AC_LINK_IFELSE([AC_LANG_SOURCE([[
+    #include <strophe.h>
+
+    int main() {
+        xmpp_tlscert_get_string(NULL, XMPP_CERT_PUBKEY_FINGERPRINT_SHA256);
+        return 1;
+    }
+    ]])],
+    [AC_MSG_RESULT([yes])
+     AC_DEFINE([HAVE_XMPP_CERT_PUBKEY_FINGERPRINT_SHA256], [1], [Have XMPP_CERT_PUBKEY_FINGERPRINT_SHA256])],
+    [AC_MSG_RESULT(no)])
+
 ## Check for curses library
 PKG_CHECK_MODULES([ncursesw], [ncursesw],
     [NCURSES_CFLAGS="$ncursesw_CFLAGS"; NCURSES_LIBS="$ncursesw_LIBS"; CURSES="ncursesw"],

src/command/cmd_ac.c

@@ -853,8 +853,9 @@ cmd_ac_init(void)
     autocomplete_add(tls_property_ac, "force");
     autocomplete_add(tls_property_ac, "allow");
     autocomplete_add(tls_property_ac, "trust");
-    autocomplete_add(tls_property_ac, "legacy");
+    autocomplete_add(tls_property_ac, "direct");
     autocomplete_add(tls_property_ac, "disable");
+    autocomplete_add(tls_property_ac, "legacy");
 
     autocomplete_add(auth_property_ac, "default");
     autocomplete_add(auth_property_ac, "legacy");

src/command/cmd_defs.c

@@ -105,6 +105,9 @@ static gboolean _cmd_has_tag(Command* pcmd, const char* const tag);
  * Command list
  */
 
+#define CMD_TLS_DIRECT "Use direct TLS for the connection. It means TLS handshake is started right after TCP connection is established."
+#define CMD_TLS_LEGACY "Alternative keyword for 'direct', which was created when one still thought that 'STARTTLS' is the future."
+
 // clang-format off
 static const struct cmd_t command_defs[] = {
     { CMD_PREAMBLE("/help",
@@ -146,7 +149,7 @@ static const struct cmd_t command_defs[] = {
               CMD_TAG_CONNECTION)
       CMD_SYN(
               "/connect [<account>]",
-              "/connect <account> [server <server>] [port <port>] [tls force|allow|trust|legacy|disable] [auth default|legacy]",
+              "/connect <account> [server <server>] [port <port>] [tls force|allow|trust|direct|disable|legacy] [auth default|legacy]",
               "/connect <server>")
       CMD_DESC(
               "Login to a chat service. "
@@ -161,8 +164,9 @@ static const struct cmd_t command_defs[] = {
               { "tls force", "Force TLS connection, and fail if one cannot be established, this is default behaviour." },
               { "tls allow", "Use TLS for the connection if it is available." },
               { "tls trust", "Force TLS connection and trust server's certificate." },
-              { "tls legacy", "Use legacy TLS for the connection. It means server doesn't support STARTTLS and TLS is forced just after TCP connection is established." },
+              { "tls direct", CMD_TLS_DIRECT },
               { "tls disable", "Disable TLS for the connection." },
+              { "tls legacy", CMD_TLS_LEGACY },
               { "auth default", "Default authentication process." },
               { "auth legacy", "Allow legacy authentication." })
       CMD_EXAMPLES(
@@ -2070,7 +2074,7 @@ static const struct cmd_t command_defs[] = {
               "/account set <account> pgpkeyid <pgpkeyid>",
               "/account set <account> startscript <script>",
               "/account set <account> clientid \"<name> <version>\"",
-              "/account set <account> tls force|allow|trust|legacy|disable",
+              "/account set <account> tls force|allow|trust|direct|disable|legacy",
               "/account set <account> auth default|legacy",
               "/account set <account> theme <theme>",
               "/account set <account> session_alarm <max_sessions>",
@@ -2116,8 +2120,9 @@ static const struct cmd_t command_defs[] = {
               { "set <account> tls force", "Force TLS connection, and fail if one cannot be established, this is default behaviour." },
               { "set <account> tls allow", "Use TLS for the connection if it is available." },
               { "set <account> tls trust", "Force TLS connection and trust server's certificate." },
-              { "set <account> tls legacy", "Use legacy TLS for the connection. It means server doesn't support STARTTLS and TLS is forced just after TCP connection is established." },
+              { "set <account> tls direct", CMD_TLS_DIRECT },
               { "set <account> tls disable", "Disable TLS for the connection." },
+              { "set <account> tls legacy", CMD_TLS_LEGACY },
               { "set <account> auth default", "Use default authentication process." },
               { "set <account> auth legacy", "Allow legacy authentication." },
               { "set <account> theme <theme>", "Set the UI theme for the account." },
@@ -2352,6 +2357,15 @@ static const struct cmd_t command_defs[] = {
             "/omemo char *")
     },
 
+    { CMD_PREAMBLE("/changes",
+                   parse_args, 0, 0, NULL)
+      CMD_MAINFUNC(cmd_changes)
+      CMD_SYN(
+              "/changes")
+      CMD_DESC(
+              "Show changes from saved configuration file.")
+    },
+
     { CMD_PREAMBLE("/save",
                    parse_args, 0, 0, NULL)
       CMD_MAINFUNC(cmd_save)
@@ -2650,7 +2664,7 @@ static const struct cmd_t command_defs[] = {
       CMD_TAGS(
               CMD_TAG_CONNECTION)
       CMD_SYN(
-              "/register <username> <server> [port <port>] [tls force|allow|trust|legacy|disable]")
+              "/register <username> <server> [port <port>] [tls force|allow|trust|direct|disable|legacy]")
       CMD_DESC(
               "Register an account on a server.")
       CMD_ARGS(
@@ -2660,8 +2674,9 @@ static const struct cmd_t command_defs[] = {
               { "tls force", "Force TLS connection, and fail if one cannot be established. This is the default behavior." },
               { "tls allow", "Use TLS for the connection if it is available." },
               { "tls trust", "Force TLS connection and trust the server's certificate." },
-              { "tls legacy", "Use legacy TLS for the connection. This forces TLS just after the TCP connection is established. Use when a server doesn't support STARTTLS." },
-              { "tls disable", "Disable TLS for the connection." })
+              { "tls direct", CMD_TLS_DIRECT },
+              { "tls disable", "Disable TLS for the connection." },
+              { "tls legacy", CMD_TLS_LEGACY })
       CMD_EXAMPLES(
               "/register odin valhalla.edda ",
               "/register freyr vanaheimr.edda port 5678",