Merge remote-tracking branch 'refs/remotes/origin/1.72' into 1.72

dghgit · dghgit · commit bd07b7c8ec86 · 2023-03-14T11:43:35.000+11:00
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -12,16 +12,19 @@ test-code-8:
   stage: test
   script:
     - "apply_overlay bc-java ./"
+    - "sh gettestdata.sh"
     - ". cienv-8.sh; \ gradle -stacktrace clean build;"
   
 test-code-11:
   stage: test
   script:
     - "apply_overlay bc-java ./"
+    - "sh gettestdata.sh"
     - ". cienv-11.sh; \ gradle -stacktrace clean build;"
   
 test-code-17:
   stage: test
   script:
     - "apply_overlay bc-java ./"
+    - "sh gettestdata.sh"
     - ". cienv-17.sh; \ gradle -stacktrace clean build;"
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
@@ -15,6 +15,10 @@
 
     <property name="fileExtensions" value="java, properties, xml, vm, g, g4, dtd"/>
 
+    <module name="BeforeExecutionExclusionFileFilter">
+         <property name="fileNamePattern" value="bc\-test\-data[\\/]"/>
+    </module>
+
     <!-- Whitespace -->
     <module name="FileTabCharacter">
         <property name="eachLine" value="false"/>
diff --git a/config/nohttp/checkstyle.xml b/config/nohttp/checkstyle.xml
@@ -4,6 +4,10 @@
   <property name="charset" value="UTF-8"/>
   <property name="fileExtensions" value=""/>
 
+  <module name="BeforeExecutionExclusionFileFilter">
+      <property name="fileNamePattern" value="bc\-test\-data[\\/]"/>
+  </module>
+
   <module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">
     <property name="allowlistFileName" value="${nohttp.checkstyle.allowlistFileName}" default=""/>
   </module>
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/SIKE.java b/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/SIKE.java
