multicast: Support uftp 5.0 by switching from aes256-cbc to aes256-gcm

aes256-gcm is supported by both 4.x and 5.x, while 5.x dropped aes256-cbc.

Sponsored-by: Graham Spencer on Patreon

diff --git a/CHANGELOG b/CHANGELOG
index abc1b32ec8d4dfad0d07a321d5e614b1bf0995c8..159b32a835ddee7a4bf641683678ab2edc57194b 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,8 @@ git-annex (10.20220323) UNRELEASED; urgency=medium
     Same for mincopies.
   * assistant: When annex.autocommit is set, notice commits that
     the user makes manually, and push them out to remotes promptly.
+  * multicast: Support uftp 5.0 by switching from aes256-cbc to
+    aes256-gcm.
 
  -- Joey Hess <id@joeyh.name>  Mon, 28 Mar 2022 14:46:10 -0400
 

diff --git a/Command/Multicast.hs b/Command/Multicast.hs
index 7d059cc19417cdaab0fa5017d32831e7ed1a3012..3d7e726f79098aea86c2c4ceef3b37d851fdf5c4 100644 (file)
--- a/Command/Multicast.hs
+++ b/Command/Multicast.hs
@@ -152,7 +152,7 @@ send ups fs = do
                                let ps =
                                        -- Force client authentication.
                                        [ Param "-c"
-                                       , Param "-Y", Param "aes256-cbc"
+                                       , Param "-Y", Param "aes256-gcm"
                                        , Param "-h", Param "sha512"
                                        -- Picked ecdh_ecdsa for perfect forward secrecy,
                                        -- and because a EC key exchange algorithm is

diff --git a/doc/bugs/uftp_5__58___invalid_key_type.mdwn b/doc/bugs/uftp_5__58___invalid_key_type.mdwn
index 8fc49129c38dc0bcf8be7ccb45126add329e5e97..440c0401333611149d498b557e99a96e81086afe 100644 (file)
--- a/doc/bugs/uftp_5__58___invalid_key_type.mdwn
+++ b/doc/bugs/uftp_5__58___invalid_key_type.mdwn
@@ -49,3 +49,7 @@ ok
 ### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
 
 Of course! I'm using it to track assets in an infrastructure repository
+
+> I've changed it to use aes256-gcm. I have not verified if there
+> is other breakage from the new version, so file a bug if you find any.
+> [[done]] --[[Joey]]