rebased to resolve conflict in CHANGES.md

Author: madanm3

.github/workflows/aarch64-more-cross-compiles.yml

@@ -30,6 +30,12 @@ jobs:
           }, {
             branch: '3.4',
             cppflags: 'CPPFLAGS=-ansi'
+          }, {
+            branch: '3.3',
+            cppflags: 'CPPFLAGS=-ansi',
+          }, {
+            branch: '3.2',
+            cppflags: 'CPPFLAGS=-ansi'
           }, {
             branch: '3.0',
             cppflags: 'CPPFLAGS=-ansi'

.github/workflows/backport.yml

@@ -72,6 +72,7 @@ jobs:
           { openssl: 'openssl-3.6', openssh: 'openssl-3.6', openssl_config: 'no-docs'},
           { openssl: 'openssl-3.5', openssh: 'openssl-3.5', openssl_config: 'no-docs'},
           { openssl: 'openssl-3.4', openssh: 'openssl-3.4', openssl_config: 'no-docs'},
+          { openssl: 'openssl-3.3', openssh: 'openssl-3.3', openssl_config: 'no-docs'},
           { openssl: 'openssl-3.0', openssh: 'openssl-3.0', openssl_config: ''}
         ]
     runs-on: ubuntu-latest

.github/workflows/ct-validation-daily.yml

@@ -115,6 +115,11 @@ jobs:
             dir: branch-3.0,
             tgz: branch-3.0.tar.gz,
             extra_config: "",
+          }, {
+            name: openssl-3.3,
+            dir: branch-3.3,
+            tgz: branch-3.3.tar.gz,
+            extra_config: "",
           }, {
             name: openssl-3.4,
             dir: branch-3.4,
@@ -205,7 +210,7 @@ jobs:
         # Note that releases are not used as a test environment for
         # later providers.  Problems in these situations ought to be
         # caught by cross branch testing before the release.
-        tree_a: [ branch-4.0, branch-3.6, branch-3.5, branch-3.4, branch-3.0,
+        tree_a: [ branch-4.0, branch-3.6, branch-3.5, branch-3.4, branch-3.3, branch-3.0,
                   openssl-3.0.0, openssl-3.0.8, openssl-3.0.9, openssl-3.1.2 ]
         tree_b: [ PR ]
         include:
@@ -219,6 +224,8 @@ jobs:
             tree_b: branch-3.5
           - tree_a: PR
             tree_b: branch-3.4
+          - tree_a: PR
+            tree_b: branch-3.3
           - tree_a: PR
             tree_b: branch-3.0
     steps:

.github/workflows/interop-tests.yml

@@ -119,6 +119,11 @@ jobs:
             dir: branch-3.0,
             tgz: branch-3.0.tar.gz,
             extra_config: "",
+          }, {
+            name: openssl-3.3,
+            dir: branch-3.3,
+            tgz: branch-3.3.tar.gz,
+            extra_config: "",
           }, {
             name: openssl-3.4,
             dir: branch-3.4,
@@ -214,10 +219,10 @@ jobs:
         # later providers.  Problems in these situations ought to be
         # caught by cross branch testing before the release.
         tree_a: [ branch-master, branch-4.0, branch-3.6, branch-3.5, branch-3.4,
-                  branch-3.0,
+                  branch-3.3, branch-3.0,
                   openssl-3.0.0, openssl-3.0.8, openssl-3.0.9, openssl-3.1.2 ]
         tree_b: [ branch-master, branch-4.0, branch-3.6, branch-3.5, branch-3.4,
-                  branch-3.0  ]
+                  branch-3.3, branch-3.0  ]
     steps:
       - name: early exit checks
         id: early_exit