Merge branch 'master' into dependabot/maven/com.fasterxml.jackson.core-jackson-core-2.20.0

Author: rishav-karanjit

.github/workflows/run-codebuild-ci.yml

@@ -26,18 +26,16 @@ jobs:
         with:
           project-name: java-ddb-ec
           buildspec-override: codebuild/static-analysis.yml
-          image-override: aws/codebuild/amazonlinux2-x86_64-standard:3.0
+          image-override: aws/codebuild/amazonlinux-x86_64-standard:5.0
   build:
     name: Build
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
       matrix:
         platform:
-          - distribution: openjdk
-            image: "aws/codebuild/standard:3.0"
           - distribution: corretto
-            image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2
+            image: "aws/codebuild/standard:7.0"
         version: [ 8, 11 ]
     steps:
       - name: Configure AWS Credentials

sdk1/pom.xml

@@ -236,7 +236,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.15.2</version>
+            <version>2.20</version>
             <scope>test</scope>
         </dependency>
 

sdk1/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/internal/Hkdf.java

@@ -23,7 +23,6 @@
 import java.util.Arrays;
 import javax.crypto.Mac;
 import javax.crypto.SecretKey;
-import javax.crypto.ShortBufferException;
 import javax.crypto.spec.SecretKeySpec;
 
 /**
@@ -193,36 +192,7 @@ public byte[] deriveKey(final String info, final int length) throws IllegalState
    */
   public byte[] deriveKey(final byte[] info, final int length) throws IllegalStateException {
     byte[] result = new byte[length];
-    try {
-      deriveKey(info, length, result, 0);
-    } catch (ShortBufferException ex) {
-      // This exception is impossible as we ensure the buffer is long
-      // enough
-      throw new RuntimeException(ex);
-    }
-    return result;
-  }
-
-  /**
-   * Derives a pseudorandom key of <code>length</code> bytes and stores the result in <code>output
-   * </code>.
-   *
-   * @param info optional context and application specific information (can be a zero-length array).
-   * @param length the length of the output key in bytes
-   * @param output the buffer where the pseudorandom key will be stored
-   * @param offset the offset in <code>output</code> where the key will be stored
-   * @throws ShortBufferException if the given output buffer is too small to hold the result
-   * @throws IllegalStateException if this object has not been initialized
-   */
-  public void deriveKey(final byte[] info, final int length, final byte[] output, final int offset)
-      throws ShortBufferException, IllegalStateException {
     assertInitialized();
-    if (length < 0) {
-      throw new IllegalArgumentException("Length must be a non-negative value.");
-    }
-    if (output.length < offset + length) {
-      throw new ShortBufferException();
-    }
     Mac mac = createMac();
 
     if (length > 255 * mac.getMacLength()) {
@@ -241,14 +211,15 @@ public void deriveKey(final byte[] info, final int length, final byte[] output,
         t = mac.doFinal();
 
         for (int x = 0; x < t.length && loc < length; x++, loc++) {
-          output[loc] = t[x];
+          result[loc] = t[x];
         }
 
         i++;
       }
     } finally {
       Arrays.fill(t, (byte) 0); // Zeroize temporary array
     }
+    return result;
   }
 
   private Mac createMac() {