Implement the decrypt

opentdf · May 12, 2024 · f2a9b2c · f2a9b2c
1 parent 6404832
commit f2a9b2c
Show file tree

Hide file tree

Showing 8 changed files with 283 additions and 33 deletions.
diff --git a/sdk/pom.xml b/sdk/pom.xml
@@ -85,5 +85,10 @@
             <artifactId>commons-codec</artifactId>
             <version>1.17.0</version>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.11.0</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/sdk/src/main/java/io/opentdf/platform/sdk/AesGcm.java b/sdk/src/main/java/io/opentdf/platform/sdk/AesGcm.java
@@ -37,13 +37,26 @@ public AesGcm(byte[] key) {
      */
     public byte[] encrypt(byte[] plaintext) throws NoSuchPaddingException, NoSuchAlgorithmException,
             InvalidAlgorithmParameterException, InvalidKeyException, BadPaddingException, IllegalBlockSizeException {
+        return encrypt(plaintext, 0, plaintext.length);
+    }
+
+    /**
+     * <p>encrypt.</p>
+     *
+     * @param plaintext the plaintext byte array to encrypt
+     * @param offset where the input start
+     * @param len input length
+     * @return the encrypted text
+     */
+    public byte[] encrypt(byte[] plaintext, int offset, int len) throws NoSuchPaddingException, NoSuchAlgorithmException,
+            InvalidAlgorithmParameterException, InvalidKeyException, BadPaddingException, IllegalBlockSizeException {
         Cipher cipher = Cipher.getInstance(CIPHER_TRANSFORM);
         byte[] nonce = new byte[GCM_NONCE_LENGTH];
         SecureRandom.getInstanceStrong().nextBytes(nonce);
         GCMParameterSpec spec = new GCMParameterSpec(GCM_TAG_LENGTH * 8, nonce);
         cipher.init(Cipher.ENCRYPT_MODE, key, spec);
 
-        byte[] cipherText = cipher.doFinal(plaintext);
+        byte[] cipherText = cipher.doFinal(plaintext, offset, len);
         byte[] cipherTextWithNonce = new byte[nonce.length + cipherText.length];
         System.arraycopy(nonce, 0, cipherTextWithNonce, 0, nonce.length);
         System.arraycopy(cipherText, 0, cipherTextWithNonce, nonce.length, cipherText.length);

diff --git a/sdk/src/main/java/io/opentdf/platform/sdk/CryptoUtils.java b/sdk/src/main/java/io/opentdf/platform/sdk/CryptoUtils.java
@@ -8,13 +8,11 @@
 
 public class CryptoUtils {
     public static byte[] CalculateSHA256Hmac(byte[] key, byte[] data) throws NoSuchAlgorithmException,
-            UnsupportedEncodingException, InvalidKeyException {
+            InvalidKeyException {
         Mac sha256_HMAC = Mac.getInstance("HmacSHA256");
         SecretKeySpec secret_key = new SecretKeySpec(key, "HmacSHA256");
         sha256_HMAC.init(secret_key);
 
         return sha256_HMAC.doFinal(data);
-
-        //return Hex.encodeHexString(sha256_HMAC.doFinal(data.getBytes("UTF-8")));
     }
 }
diff --git a/sdk/src/main/java/io/opentdf/platform/sdk/Manifest.java b/sdk/src/main/java/io/opentdf/platform/sdk/Manifest.java
@@ -21,8 +21,8 @@ static public class RootSignature {
     static public class IntegrityInformation {
         public RootSignature rootSignature;
         public String segmentHashAlg;
-        public long segmentSizeDefault;
-        public long encryptedSegmentSizeDefault;
+        public int segmentSizeDefault;
+        public int encryptedSegmentSizeDefault;
         public List<Segment> segments;
     }
 
@@ -46,7 +46,9 @@ static public class EncryptionInformation {
         @SerializedName(value = "type")
         public String keyAccessType;
         public String policy;
-        public List<KeyAccess> keyAccess;
+
+        @SerializedName(value = "keyAccess")
+        public List<KeyAccess> keyAccessObj;
         public Method method;
         public IntegrityInformation integrityInformation;
     }