diff --git a/CHANGES_BWI.md b/CHANGES_BWI.md index b144a9787..57c24b0f8 100644 --- a/CHANGES_BWI.md +++ b/CHANGES_BWI.md @@ -1,3 +1,32 @@ +Changes in BWI project 2.21.0 (2024-08-09) +=================================================== + +Upstream merge ✨: + +Features ✨: +- MESSENGER-6162 add server selection protection with jwt +- MESSENGER-6273 add hash +- MESSENGER-6236 add hash +- MESSENGER-6229 add hash +- MESSENGER-6372 add hash + +Improvements 🙌: + +Bugfix 🐛: +- MESSENGER-5896 disable periodic maintenance on logout +- MESSENGER-4172 use fixed sdk version +- MESSENGER-4172 read message marker + +Translations 🗣 : + +SDK API changes ⚠️: + +Build 🧱: +- MESSENGER-6243 change ci runner + +Documentation 📄: +- MESSENGER-MESSENGER new license file + Changes in BWI project 2.20.0 (2024-07-04) =================================================== diff --git a/Config/BWIBuildSettings.swift b/Config/BWIBuildSettings.swift index 28915e0f4..a144f5d7c 100644 --- a/Config/BWIBuildSettings.swift +++ b/Config/BWIBuildSettings.swift @@ -173,10 +173,11 @@ class BWIBuildSettings: NSObject { var bwiHashes = [ "a3f65e35a7476799afe8d80282fb3c45b39dab06d1d8c70dc98e45ab7d8e93a9", "2fda1a831655c22a5e6096d7cfbff4429fbf27891141e191b46adbf168142a11", "4f8cbb3fef885f7284d0477d797d7007f0e1ba76221834132752f4d645796e28", - /* "24c2ec541e61e8e68944b96dc45ed5df12f6bdbda283cb0b3a522742aa970256", - "1be0b314a6c915d4475290522baef5b642db1b6d68937792b8e0eb5b7b0d6666", - remove internal test server that is handled by token verification*/ - + /* + "24c2ec541e61e8e68944b96dc45ed5df12f6bdbda283cb0b3a522742aa970256", + "1be0b314a6c915d4475290522baef5b642db1b6d68937792b8e0eb5b7b0d6666", + remove internal test server that is handled by token verification + */ "3deb73db8cafcd1d5a59e25e251c35816162e1f6ee67b5d7d011da0e8d6ef931", "42e57985d61202c2c7dd87d898cef9bdce020877a4c7a8c7cd699f6a28f58c0c", "e1c3c7cac12bd65bd48de79a2677187d2e768d2769377627534023588b8d7a33", @@ -226,7 +227,8 @@ class BWIBuildSettings: NSObject { "09940562c6e5d1b4071873c1be36dfe526c33a9c87bce30935c43ed451a67d72", "c58c1892ba63b2a482a2ad72d563d523eff08759e6026b8630d64d41b48e7ae0", "db0c9012e0886da4cbbaf4fae3d4c8d345a95fcc004c0fa8132b5f718963750d", - "e4920edcf64870e0d86a8e511ad3ba0dc91f7208c891329d6ee9a64b4b7a07e6" + "e4920edcf64870e0d86a8e511ad3ba0dc91f7208c891329d6ee9a64b4b7a07e6", + "9f60d10d6ee4d1be2a5f301c57aae3224a3d010564c302346395ab1a7e2aa35f" ] // bwi #6162 login protection with jwt tokens var bwiEnableTokenizedLoginProtection = false diff --git a/Podfile b/Podfile index 67fde7c70..045c84466 100644 --- a/Podfile +++ b/Podfile @@ -43,7 +43,7 @@ when String # specific MatrixSDK released version $matrixSDKVersionSpec = $matrixSDKVersion end -$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.21.0-RC2' } +$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.21.0' } ######################################## diff --git a/Riot/Assets/new_features.html b/Riot/Assets/new_features.html index a55bcd5ed..a27ec045c 100644 --- a/Riot/Assets/new_features.html +++ b/Riot/Assets/new_features.html @@ -26,6 +26,18 @@ +
+

+ Version 2.21.0 +

+ +

+ Behobene Bugs +

+

+

Version 2.20.0 diff --git a/publickeys/public-key-b.pem b/publickeys/public-key-b.pem new file mode 100644 index 000000000..1f0aec503 --- /dev/null +++ b/publickeys/public-key-b.pem @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmE1lHp38EGij3ghWlEbK +K/H4fBcQxt7YyD4vTVUyzB0JizrXvwPkVQHqD9n92hZPpJALZiN0OgpjmlyJUgG7 +gv+2HYflPNrUklner7QAon1XVcEjMnHvQIAXVCCwaNzZ3zIsW33GRI+Y8M9sKKXi +siVABgtxh/p3w3ye/WOs0Axr7JrBCw7ZsGBONvjXjqzsDU7M8ETmOU0i8ncjZNid +/eHJsib7MwnPkF9LWlTijz9zxrrwpLC2DKoJXNax4SrvN38khk3tfOpBs1caUPrU +mR/bJWIlWs35wvzgl8iJm8Ijj3CR3S1egDe7y/W/5tx2z4h4Pk6TrBa43zvoeeq2 +XwIDAQAB +-----END PUBLIC KEY----- diff --git a/publickeys/public-key-k.pem b/publickeys/public-key-k.pem new file mode 100644 index 000000000..733589225 --- /dev/null +++ b/publickeys/public-key-k.pem @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqAG+mO3cENobuwORCOX4 +HmohVhvEATGuM7HjRA0JzQrZgwwZFYcx9Uf3MfbSCr1UiNBdJt6c3Bo2vYSPXXyE ++kSfucXcL+UMUOhlYuUphCxwTEPgp/ChIO04LtzGEojELj5ycvUsvw3ymw8GEK10 +wlRy3Ex6InI6PultKjZvdZjHFv/ZWvLmhJrLiAYdSZ29Hrx7jj2T3qQAnNRc8MWb +mMWlqzOplgwLQhToQ2QGDkMbGSHaWltBqXbSPE8CJI3l/A+x5p6PxKaahDMdrLJI +cD9KoJ7s1xvEVy3X97/CnAJ7KJ9yZDwxr+9MRtXmDxLPORusnpROffq7hXqVay3i +OwIDAQAB +-----END PUBLIC KEY-----