Introduced sechub-encryption #3273 + update bouncy castle version #3275

- moved own encryption implementations into own gradle sub module "sechub-encryption" - CryptoAccess class is kept in commons-core because there are no dependencies to bouncy castle or other libraries - updated bouncy castle dependencies to 1.78.1
mercedes-benz · Jul 4, 2024 · 27e9bd2 · 27e9bd2
1 parent 7af8425
commit 27e9bd2
Show file tree

Hide file tree

Showing 28 changed files with 24 additions and 5 deletions.
diff --git a/gradle/libraries.gradle b/gradle/libraries.gradle
@@ -88,8 +88,12 @@ ext {
       cycloneDX_core:                          "8.0.0",
       cyclonedx_gradle_plugin:                 "1.7.4",
 
-     /* Prepare wrapper */
-     jgit_core:                                "6.9.0.202403050737-r"
+      /* Prepare wrapper */
+      jgit_core:                                "6.9.0.202403050737-r",
+
+      /* encryption */
+      // https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk18on
+      bouncy_castle_bcprov_jdk8:                "1.78.1"
 
    ]    
 
@@ -187,7 +191,10 @@ ext {
         /* cycloneDX core for Xray and sechub importer */
         cycloneDX_core:                         "org.cyclonedx:cyclonedx-core-java:${libraryVersion.cycloneDX_core}",
 
-        jgit_core:                              "org.eclipse.jgit:org.eclipse.jgit:${libraryVersion.jgit_core}"
+        jgit_core:                              "org.eclipse.jgit:org.eclipse.jgit:${libraryVersion.jgit_core}",
+
+        bouncy_castle_bcprov_jdk8:              "org.bouncycastle:bcprov-jdk18on:${libraryVersion.bouncy_castle_bcprov_jdk8}"
+
    ]
 
 

diff --git a/gradle/projects.gradle b/gradle/projects.gradle
@@ -16,6 +16,7 @@ projectType = [
                project(':sechub-commons-model-testframework'),
                project(':sechub-commons-pds'),
                project(':sechub-commons-archive'),
+               project(':sechub-encryption'),
                project(':sechub-storage-core'),
                project(':sechub-wrapper-owasp-zap'),
                project(':sechub-pds-commons-core'),

diff --git a/sechub-commons-core/build.gradle b/sechub-commons-core/build.gradle
@@ -3,8 +3,6 @@ dependencies {
 
     api spring_boot_dependency.slf4j_api
 
-    implementation 'org.bouncycastle:bcprov-jdk18on:1.73'
-
     testImplementation spring_boot_dependency.junit_jupiter
     testImplementation spring_boot_dependency.mockito_core
 

diff --git a/sechub-encryption/build.gradle b/sechub-encryption/build.gradle
@@ -0,0 +1,9 @@
+  // SPDX-License-Identifier: MIT
+dependencies {
+
+    implementation library.bouncy_castle_bcprov_jdk8
+    testImplementation spring_boot_dependency.junit_jupiter
+    testImplementation spring_boot_dependency.mockito_core
+
+}
+
diff --git a/...ity/persistence/AbstractBinaryString.java → ...ity/persistence/AbstractBinaryString.java b/...ity/persistence/AbstractBinaryString.java → ...ity/persistence/AbstractBinaryString.java
diff --git a/.../core/security/persistence/AesGcmSiv.java → .../core/security/persistence/AesGcmSiv.java b/.../core/security/persistence/AesGcmSiv.java → .../core/security/persistence/AesGcmSiv.java
diff --git a/...re/security/persistence/Base64String.java → ...re/security/persistence/Base64String.java b/...re/security/persistence/Base64String.java → ...re/security/persistence/Base64String.java
diff --git a/...re/security/persistence/BinaryString.java → ...re/security/persistence/BinaryString.java b/...re/security/persistence/BinaryString.java → ...re/security/persistence/BinaryString.java
diff --git a/...persistence/BinaryStringEncodingType.java → ...persistence/BinaryStringEncodingType.java b/...persistence/BinaryStringEncodingType.java → ...persistence/BinaryStringEncodingType.java
diff --git a/...rity/persistence/BinaryStringFactory.java → ...rity/persistence/BinaryStringFactory.java b/...rity/persistence/BinaryStringFactory.java → ...rity/persistence/BinaryStringFactory.java
diff --git a/.../core/security/persistence/HexString.java → .../core/security/persistence/HexString.java b/.../core/security/persistence/HexString.java → .../core/security/persistence/HexString.java
diff --git a/...core/security/persistence/NoneCipher.java → ...core/security/persistence/NoneCipher.java b/...core/security/persistence/NoneCipher.java → ...core/security/persistence/NoneCipher.java
diff --git a/...curity/persistence/PersistenceCipher.java → ...curity/persistence/PersistenceCipher.java b/...curity/persistence/PersistenceCipher.java → ...curity/persistence/PersistenceCipher.java
diff --git a/...persistence/PersistenceCipherFactory.java → ...persistence/PersistenceCipherFactory.java b/...persistence/PersistenceCipherFactory.java → ...persistence/PersistenceCipherFactory.java
diff --git a/...ty/persistence/PersistenceCipherType.java → ...ty/persistence/PersistenceCipherType.java b/...ty/persistence/PersistenceCipherType.java → ...ty/persistence/PersistenceCipherType.java
diff --git a/...ore/security/persistence/PlainString.java → ...ore/security/persistence/PlainString.java b/...ore/security/persistence/PlainString.java → ...ore/security/persistence/PlainString.java
diff --git a/...ecurity/persistence/RotationStrategy.java → ...ecurity/persistence/RotationStrategy.java b/...ecurity/persistence/RotationStrategy.java → ...ecurity/persistence/RotationStrategy.java
diff --git a/...re/security/persistence/package-info.java → ...re/security/persistence/package-info.java b/...re/security/persistence/package-info.java → ...re/security/persistence/package-info.java
diff --git a/...e/security/persistence/AesGcmSivTest.java → ...e/security/persistence/AesGcmSivTest.java b/...e/security/persistence/AesGcmSivTest.java → ...e/security/persistence/AesGcmSivTest.java
diff --git a/...ecurity/persistence/Base64StringTest.java → ...ecurity/persistence/Base64StringTest.java b/...ecurity/persistence/Base64StringTest.java → ...ecurity/persistence/Base64StringTest.java
diff --git a/.../persistence/BinaryStringFactoryTest.java → .../persistence/BinaryStringFactoryTest.java b/.../persistence/BinaryStringFactoryTest.java → .../persistence/BinaryStringFactoryTest.java
diff --git a/...e/security/persistence/HexStringTest.java → ...e/security/persistence/HexStringTest.java b/...e/security/persistence/HexStringTest.java → ...e/security/persistence/HexStringTest.java
diff --git a/.../security/persistence/NoneCipherTest.java → .../security/persistence/NoneCipherTest.java b/.../security/persistence/NoneCipherTest.java → .../security/persistence/NoneCipherTest.java
diff --git a/...istence/PersistenceCipherFactoryTest.java → ...istence/PersistenceCipherFactoryTest.java b/...istence/PersistenceCipherFactoryTest.java → ...istence/PersistenceCipherFactoryTest.java
diff --git a/...security/persistence/PlainStringTest.java → ...security/persistence/PlainStringTest.java b/...security/persistence/PlainStringTest.java → ...security/persistence/PlainStringTest.java
diff --git a/...re/security/persistence/RotationTest.java → ...re/security/persistence/RotationTest.java b/...re/security/persistence/RotationTest.java → ...re/security/persistence/RotationTest.java
diff --git a/sechub-schedule/build.gradle b/sechub-schedule/build.gradle
@@ -12,6 +12,7 @@ dependencies {
     implementation(library.apache_commons_fileupload2_jakarta)
 
     implementation project(':sechub-shared-kernel')
+    implementation project(':sechub-encryption')
 
     testImplementation project(':sechub-testframework')
     testImplementation project(':sechub-commons-model-testframework')

diff --git a/settings.gradle b/settings.gradle
@@ -10,6 +10,9 @@ include 'sechub-cli',
 'sechub-commons-pds',
 'sechub-commons-archive',
 
+/* encryption */
+'sechub-encryption',
+
 /* server POD area */
 'sechub-server',       // executable spring boot jar
 'sechub-server-core',  // core project for test compile dependencies and more