Merge pull request #10 from Cosmian/feature/add_findex_ffi

Feature/add findex ffi

Author: Manuthor

.classpath

@@ -29,11 +29,6 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" path="target/generated-sources/annotations">
 		<attributes>
 			<attribute name="optional" value="true"/>

.gitlab-ci.yml

@@ -0,0 +1,24 @@
+image: gitlab.cosmian.com:5000/core/ci-java-8:latest
+
+variables:
+  CARGO_HOME: ${CI_PROJECT_DIR}/.cargo/
+  SCCACHE_DIR: ${CI_PROJECT_DIR}/.cache/sccache
+  COSMIAN_SERVER_URL: http://localhost:9998
+  KMS_PUBLIC_PATH: /tmp
+  KMS_PRIVATE_PATH: /tmp
+  KMS_SHARED_PATH: /tmp
+
+stages:
+  - build
+
+build:
+  stage: build
+  services:
+    - name: gitlab.cosmian.com:5000/core/kms:2.1.0_ci
+      alias: kms_ci
+  script:
+    - mvn package
+  artifacts:
+    paths:
+      - target/*.jar
+    expire_in: 3 mos

.vscode/settings.json

@@ -10,9 +10,11 @@
     ],
     "java.format.settings.url": ".vscode/codestyle-java.xml",
     "[java]": {
-        "editor.detectIndentation": false
+        "editor.detectIndentation": false,
+        "editor.insertSpaces": true,
+        "editor.tabSize": 4,
     },
     "files.watcherExclude": {
         "**/target": true
     }
-}
+}

README.md

@@ -17,9 +17,10 @@ In addition, please have a look at the following tests for implementation exampl
 
  - [TestCoverCrypt](./src/test/java/com/cosmian/TestCoverCrypt.java) for using the CoverCrypt scheme with Cosmian KMS
  - [TestFfiCoverCrypt](./src/test/java/com/cosmian/TestFfiCoverCrypt.java) for using the CoverCrypt scheme with the local native library
- - [TestAbe](./src/test/java/com/cosmian/TestAbe.java) for using the ABE GPSW scheme with Cosmian KMS
- - [TestFfiAbe](./src/test/java/com/cosmian/TestFfiAbe.java) for using the ABE GPSW scheme with the local native library
+ - [TestGpsw](./src/test/java/com/cosmian/TestAbe.java) for using the ABE GPSW scheme with Cosmian KMS
+ - [TestFfiGpsw](./src/test/java/com/cosmian/TestFfiAbe.java) for using the ABE GPSW scheme with the local native library
  - [TestKmip](./src/test/java/com/cosmian/TestKmip.java) for using the KMIP 2.1 interface with the Cosmian KMS
+ - [TestFfiFindex](./src/test/java/com/cosmian/TestFfiAbe.java) for using the SSE Findex scheme with the local native library
 
 
 ## Using in Java projects
@@ -30,7 +31,7 @@ This library free software and is available on Maven Central
 <dependency>
     <groupId>com.cosmian</groupId>
     <artifactId>cosmian_java_lib</artifactId>
-    <version>0.7.5</version>
+    <version>0.7.6</version>
 </dependency>
 ```
 
@@ -40,13 +41,24 @@ When using local encryption and decryption with [GPSW](https://github.com/Cosmia
 
 Check the main pages of the respective projects to build the native librairies appropriate for your systems. The [test directory](./src/test/resources/linux-x86-64/) provides pre-built libraries for Linux GLIBC 2.17. These librairies should run fine on a system with a more recent GLIBC version.
 
-This table shows the minimum versions correspondances between the various components
+This table shows the minimum versions correspondences between the various components
 
-KMS Server | Java Lib  | abe_gpsw lib | CoverCrypt lib
------------|-----------|--------------|---------------
-1.2.0      | 0.5.0     | 0.3.0        | N/A
-1.2.1      | 0.5.2     | 0.4.0        | N/A
-1.2.1      | ~~0.6.0~~ | ~~0.6.0~~    | N/A
-1.2.1      | 0.6.1     | 0.6.1        | N/A
-2.0.1      | 0.7.2     | 0.6.5        | 1.0.2
-2.0.2      | 0.7.5     | 0.6.10       | 2.0.0
+KMS Server | Java Lib  | GPSW lib  | CoverCrypt lib | Findex
+-----------|-----------|-----------|----------------|-------
+1.2.0      | 0.5.0     | 0.3.0     | N/A            | N/A
+1.2.1      | 0.5.2     | 0.4.0     | N/A            | N/A
+1.2.1      | ~~0.6.0~~ | ~~0.6.0~~ | N/A            | N/A
+1.2.1      | 0.6.1     | 0.6.1     | N/A            | N/A
+2.0.1      | 0.7.2     | 0.6.5     | 1.0.2          | N/A
+2.0.2      | 0.7.5     | 0.6.10    | 2.0.0          | N/A
+2.1.0      | 0.7.6     | 1.1.1     | 4.0.0          | 0.2.3
+
+## Update native libraries
+
+The Cosmian Java lib uses JNA to access functions of the 2 native shared libraries `CoverCrypt` and `ABE GPSW`.
+
+On Linux, those 2 libraries must be found in 1 of these folders:
+- src/resources/linux-x86-64
+- src/test/resources/linux-x86-64
+
+To update those native libraries, the script `src/test/resources/linux-x86-64/update_native_libraries.sh`

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.cosmian</groupId>
     <artifactId>cosmian_java_lib</artifactId>
-    <version>0.7.5</version>
+    <version>0.7.6</version>
 
     <name>cosmian_java_lib</name>
     <description>The Cosmian Java Lib provides local encryption/decyption and access to the Cosmian public platform APIs</description>
@@ -67,6 +67,12 @@
             <artifactId>jna</artifactId>
             <version>${jna.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.rover12421.android</groupId>
+            <artifactId>dx</artifactId>
+            <version>1.16</version>
+        </dependency>
+        <!-- Scope test -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
@@ -85,6 +91,12 @@
             <version>20210307</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.xerial</groupId>
+            <artifactId>sqlite-jdbc</artifactId>
+            <version>3.8.7</version>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
     <build>
@@ -146,4 +158,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>