Merge branch 'master' into master-android

2026-08-27 22:34:51 +00:00 · 2024-11-23 12:32:45 +00:00
parent 2b0c229dbb 7bcb514baf
commit b42cde2519
141 changed files with 10231 additions and 2814 deletions
@@ -3,12 +3,12 @@ ignore-project: False
 -- amend to point to the actual openssl location

 package simplexmq
-    extra-include-dirs: /opt/homebrew/opt/openssl@1.1/include
-    extra-lib-dirs: /opt/homebrew/opt/openssl@1.1/lib
+    extra-include-dirs: /opt/homebrew/opt/openssl@3.0/include
+    extra-lib-dirs: /opt/homebrew/opt/openssl@3.0/lib

 package direct-sqlcipher
-    extra-include-dirs: /opt/homebrew/opt/openssl@1.1/include
-    extra-lib-dirs: /opt/homebrew/opt/openssl@1.1/lib
+    extra-include-dirs: /opt/homebrew/opt/openssl@3.0/include
+    extra-lib-dirs: /opt/homebrew/opt/openssl@3.0/lib
    flags: +openssl

 test-show-details: direct
@@ -84,25 +84,25 @@ cp $BUILD_DIR/build/libHSsimplex-chat-*-inplace-ghc*.$LIB_EXT apps/multiplatform
 cd apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/

 LIBCRYPTO_PATH=$(otool -l libHSdrct-*.$LIB_EXT | grep libcrypto | cut -d' ' -f11)
-install_name_tool -change $LIBCRYPTO_PATH @rpath/libcrypto.1.1.$LIB_EXT libHSdrct-*.$LIB_EXT
-cp $LIBCRYPTO_PATH libcrypto.1.1.$LIB_EXT
-chmod 755 libcrypto.1.1.$LIB_EXT
-install_name_tool -id "libcrypto.1.1.$LIB_EXT" libcrypto.1.1.$LIB_EXT
+install_name_tool -change $LIBCRYPTO_PATH @rpath/libcrypto.3.0.$LIB_EXT libHSdrct-*.$LIB_EXT
+cp $LIBCRYPTO_PATH libcrypto.3.0.$LIB_EXT
+chmod 755 libcrypto.3.0.$LIB_EXT
+install_name_tool -id "libcrypto.3.0.$LIB_EXT" libcrypto.3.0.$LIB_EXT
 install_name_tool -id "libffi.8.$LIB_EXT" libffi.$LIB_EXT

 LIBCRYPTO_PATH=$(otool -l $LIB | grep libcrypto | cut -d' ' -f11)
 if [ -n "$LIBCRYPTO_PATH" ]; then
-    install_name_tool -change $LIBCRYPTO_PATH @rpath/libcrypto.1.1.$LIB_EXT $LIB
+    install_name_tool -change $LIBCRYPTO_PATH @rpath/libcrypto.3.0.$LIB_EXT $LIB
 fi

 LIBCRYPTO_PATH=$(otool -l libHSsmplxmq*.$LIB_EXT | grep libcrypto | cut -d' ' -f11)
 if [ -n "$LIBCRYPTO_PATH" ]; then
-    install_name_tool -change $LIBCRYPTO_PATH @rpath/libcrypto.1.1.$LIB_EXT libHSsmplxmq*.$LIB_EXT
+    install_name_tool -change $LIBCRYPTO_PATH @rpath/libcrypto.3.0.$LIB_EXT libHSsmplxmq*.$LIB_EXT
 fi

 LIBCRYPTO_PATH=$(otool -l libHSsqlcphr-*.$LIB_EXT | grep libcrypto | cut -d' ' -f11)
 if [ -n "$LIBCRYPTO_PATH" ]; then
-    install_name_tool -change $LIBCRYPTO_PATH @rpath/libcrypto.1.1.$LIB_EXT libHSsqlcphr-*.$LIB_EXT
+    install_name_tool -change $LIBCRYPTO_PATH @rpath/libcrypto.3.0.$LIB_EXT libHSsqlcphr-*.$LIB_EXT
 fi

 for lib in $(find . -type f -name "*.$LIB_EXT"); do
@@ -36,7 +36,7 @@ mkdir dist-newstyle 2>/dev/null || true

 scripts/desktop/prepare-openssl-windows.sh

-openssl_windows_style_path=$(echo `pwd`/dist-newstyle/openssl-1.1.1w | sed 's#/\([a-zA-Z]\)#\1:#' | sed 's#/#\\#g')
+openssl_windows_style_path=$(echo `pwd`/dist-newstyle/openssl-3.0.15 | sed 's#/\([a-zA-Z]\)#\1:#' | sed 's#/#\\#g')
 rm -rf $BUILD_DIR 2>/dev/null || true
 # Existence of this directory produces build error: cabal's bug
 rm -rf dist-newstyle/src/direct-sq* 2>/dev/null || true
@@ -47,7 +47,7 @@ echo "    flags: +openssl" >> cabal.project.local
 echo "    extra-include-dirs: $openssl_windows_style_path\include" >> cabal.project.local
 echo "    extra-lib-dirs: $openssl_windows_style_path" >> cabal.project.local
 echo "package simplex-chat" >> cabal.project.local
-echo "    ghc-options: -shared -threaded -optl-L$openssl_windows_style_path -optl-lcrypto-1_1-x64 -o libsimplex.dll libsimplex.dll.def" >> cabal.project.local
+echo "    ghc-options: -shared -threaded -optl-L$openssl_windows_style_path -optl-lcrypto-3-x64 -o libsimplex.dll libsimplex.dll.def" >> cabal.project.local
 # Very important! Without it the build fails on linking step since the linker can't find exported symbols.
 # It looks like GHC bug because with such random path the build ends successfully
 sed -i "s/ld.lld.exe/abracadabra.exe/" `ghc --print-libdir`/settings
@@ -57,7 +57,7 @@ rm -rf apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/
 rm -rf apps/multiplatform/desktop/build/cmake

 mkdir -p apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/
-cp dist-newstyle/openssl-1.1.1w/libcrypto-1_1-x64.dll apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/
+cp dist-newstyle/openssl-3.0.15/libcrypto-3-x64.dll apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/
 cp libsimplex.dll apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/

 scripts/desktop/prepare-vlc-windows.sh
@@ -9,12 +9,12 @@ root_dir="$(dirname "$(dirname "$(readlink "$0")")")"

 cd $root_dir

-if [ ! -f dist-newstyle/openssl-1.1.1w/libcrypto-1_1-x64.dll ]; then
+if [ ! -f dist-newstyle/openssl-3.0.15/libcrypto-3-x64.dll ]; then
    mkdir dist-newstyle 2>/dev/null || true
    cd dist-newstyle
-    curl --tlsv1.2 https://www.openssl.org/source/openssl-1.1.1w.tar.gz -L -o openssl.tar.gz
+    curl --tlsv1.2 https://www.openssl.org/source/openssl-3.0.15.tar.gz -L -o openssl.tar.gz
    $WINDIR\\System32\\tar.exe -xvzf openssl.tar.gz
-    cd openssl-1.1.1w
+    cd openssl-3.0.15
    ./Configure mingw64
    make
    cd ../../
@@ -38,6 +38,34 @@
  </description>

  <releases>
+    <release version="6.1.1" date="2024-10-18">
+      <url type="details">https://simplex.chat/blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.html</url>
+      <description>
+        <p>New in v6.1 - v6.1.1:</p>
+        <ul>
+          <li>Misc fixes</li>
+        </ul>
+        <p>New in v6.1:</p>
+        <p>Better security:</p>
+        <ul>
+          <li>SimpleX protocols reviewed by Trail of Bits.</li>
+          <li>security improvements (don't worry, there is nothing critical there).</li>
+        </ul>
+        <p>Better calls:</p>
+        <ul>
+          <li>you can switch audio and video during the call.</li>
+          <li>share the screen from desktop app.</li>
+        </ul>
+        <p>Better user experience:</p>
+        <ul>
+          <li>switch chat profile for 1-time invitations.</li>
+          <li>customizable message shape.</li>
+          <li>better message dates.</li>
+          <li>forward up to 20 messages at once.</li>
+          <li>delete or moderate up to 200 messages.</li>
+        </ul>
+      </description>
+    </release>
    <release version="6.1.0" date="2024-10-14">
      <url type="details">https://simplex.chat/blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.html</url>
      <description>
@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."a64c1aa2c41938c5e18cc49d08075f14e5d25f0d" = "1kf86vrh5zfrqyczfjcj3d2nagmqb0rwhhdc10fw5n8jcgmdw6rp";
+  "https://github.com/simplex-chat/simplexmq.git"."601620bdde612ebdd33da2637d99b15ff32170c9" = "0lgiphb9sf5i29d378pah24mhf7m8df75jk6asvw8ns527g4amj1";
  "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
  "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
  "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";