chore: merge branch 'release/v4.0.1'

Author: Manuthor

.github/workflows/maven.yml

@@ -135,6 +135,13 @@ jobs:
           python-version: 3.7
       - run: python scripts/get_native_libraries.py
 
+      - name: Import GPG key
+        id: import_gpg
+        uses: crazy-max/ghaction-import-gpg@v5
+        with:
+          gpg_private_key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+
       - name: Maven deploy
         if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
         run: |
@@ -143,7 +150,6 @@ jobs:
           mkdir -p ~/.m2 ~/.gpg
           echo "$M2_SETTINGS" > ~/.m2/settings.xml
           echo "$MAVEN_GPG_PRIVATE_KEY" > ~/.gpg/maven_gpg_private_key.asc
-          gpg --import ~/.gpg/maven_gpg_private_key.asc
           mvn clean deploy -Dmaven.test.skip
         env:
           M2_SETTINGS: ${{ secrets.M2_SETTINGS }}

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.0.1] - 2023-02-17
+
+### Bug Fixes
+
+- Maven central publish
+
+### Documentation
+
+- Add comments on exposed code from public_doc
+
+---
+
 ## [4.0.0] - 2023-01-31
 
 ### Documentation

README.md

@@ -95,6 +95,7 @@ This table shows the compatible versions of the various components
 | 3.0.2    | 4.0.1      | 8.0.1      | 2.0.0  |
 | 3.0.3    | 4.0.1      | 8.0.2      | 2.0.0  |
 | 4.0.0    | 4.2.0      | 10.0.0     | 2.0.1  |
+| 4.0.1    | 4.2.0      | 10.0.0     | 2.0.1  |
 
 ## Using in Java projects
 
@@ -104,7 +105,7 @@ This library is open-source software and is available on Maven Central.
 <dependency>
     <groupId>com.cosmian</groupId>
     <artifactId>cloudproof_java</artifactId>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
 </dependency>
 ```
 

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.cosmian</groupId>
     <artifactId>cloudproof_java</artifactId>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
 
     <name>cloudproof_java</name>
     <description>The Cloudproof Java Lib secures data repositories in the cloud with attributes-based access control encryption and encrypted search</description>

src/test/java/com/cosmian/TestDemo.java

@@ -65,13 +65,13 @@ public void testDocDemoKMS() throws CloudproofException {
 
         // Master Keys can be exported from the KMS
         // export the private master key
-        // PrivateKey privateMasterKey =
-        // kmsClient.retrieveCoverCryptPrivateMasterKey(privateMasterKeyUniqueIdentifier);
-        // byte[] _privateMasterKeyBytes = privateMasterKey.bytes();
+        PrivateKey privateMasterKey =
+            kmsClient.retrieveCoverCryptPrivateMasterKey(privateMasterKeyUniqueIdentifier);
+        byte[] _privateMasterKeyBytes = privateMasterKey.bytes();
         // export the public key
-        // PublicKey publicKey =
-        // kmsClient.retrieveCoverCryptPublicMasterKey(publicMasterKeyUniqueIdentifier);
-        // byte[] _publicKeyBytes = publicKey.bytes();
+        PublicKey publicKey =
+            kmsClient.retrieveCoverCryptPublicMasterKey(publicMasterKeyUniqueIdentifier);
+        byte[] _publicKeyBytes = publicKey.bytes();
 
         byte[] protectedMkgData = "protectedMkgMessage".getBytes(StandardCharsets.UTF_8);
         String protectedMkgEncryptionPolicy = "Department::MKG && Security Level::Protected";
@@ -106,10 +106,10 @@ public void testDocDemoKMS() throws CloudproofException {
 
         // as with the master keys, the user keys can be exported to be used with the
         // native library
-        // PrivateKey confidentialMkgUserKey_ =
-        // kmsClient.retrieveCoverCryptUserDecryptionKey(confidentialMkgUserKeyUid);
-        // PrivateKey topSecretMkgFinUserKey =
-        // kmsClient.retrieveCoverCryptUserDecryptionKey(topSecretMkgFinUserKeyUid);
+        PrivateKey confidentialMkgUserKey_ =
+            kmsClient.retrieveCoverCryptUserDecryptionKey(confidentialMkgUserKeyUid);
+        PrivateKey topSecretMkgFinUserKey =
+            kmsClient.retrieveCoverCryptUserDecryptionKey(topSecretMkgFinUserKeyUid);
 
         // The confidential marketing user can successfully decrypt a low-security
         // marketing message
@@ -180,7 +180,8 @@ public void testDocDemoKMS() throws CloudproofException {
         assert !Arrays.equals(oldConfidentialMkgUserKey.bytes(), rekeyedConfidentialMkgUserKey.bytes());
 
         // Decrypting the "old" `protected marketing` message
-        DecryptedData protectedMkg__ = CoverCrypt.decrypt(rekeyedConfidentialMkgUserKey.bytes(), protectedMkgCT, Optional.empty());
+        DecryptedData protectedMkg__ =
+            CoverCrypt.decrypt(rekeyedConfidentialMkgUserKey.bytes(), protectedMkgCT, Optional.empty());
         assert Arrays.equals(protectedMkgData, protectedMkg__.getPlaintext());
 
         // Decrypting the "new" `confidential marketing` message

src/test/java/com/cosmian/TestNativeCoverCrypt.java

@@ -267,13 +267,23 @@ public void testHybridCryptoWithHeaderMetadata() throws Exception {
     }
 
     public static Policy policy() throws CloudproofException {
-        return new Policy(20, new PolicyAxis[] {
-            new PolicyAxis("Security Level",
-                new PolicyAxisAttribute[] {new PolicyAxisAttribute("Protected", false),
-                    new PolicyAxisAttribute("Confidential", false), new PolicyAxisAttribute("Top Secret", true)},
-                true),
-            new PolicyAxis("Department", new PolicyAxisAttribute[] {new PolicyAxisAttribute("FIN", false),
-                new PolicyAxisAttribute("MKG", false), new PolicyAxisAttribute("HR", false)}, false)});
+        return new Policy(20, // maximum number of creation of partition values
+            new PolicyAxis[] {
+                new PolicyAxis("Security Level",
+                    new PolicyAxisAttribute[] {
+                        new PolicyAxisAttribute("Protected", false),
+                        new PolicyAxisAttribute("Confidential", false),
+                        // the following attribute is hybridized allowing post-quantum resistance
+                        new PolicyAxisAttribute("Top Secret", true)},
+                    true // this axis is hierarchical
+                ),
+                new PolicyAxis("Department",
+                    new PolicyAxisAttribute[] {
+                        new PolicyAxisAttribute("FIN", false),
+                        new PolicyAxisAttribute("MKG", false),
+                        new PolicyAxisAttribute("HR", false)},
+                    false // this axis is NOT hierarchical
+                )});
     }
 
     private String accessPolicyConfidential() throws CloudproofException {