Merge "Remove unused functions" into main am: 54a3c39904

Original change: https://android-review.googlesource.com/c/platform/external/libese/+/2728553

Change-Id: Ia563421dac05ca761d4523b15c34691bc5658340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4 files changed, 0 insertions, 77 deletions

diff --git a/ready_se/google/keymint/KM200/Applet/src/com/android/javacard/keymaster/KMEncoder.java b/ready_se/google/keymint/KM200/Applet/src/com/android/javacard/keymaster/KMEncoder.java
index 2146c82..05d8bef 100644
--- a/ready_se/google/keymint/KM200/Applet/src/com/android/javacard/keymaster/KMEncoder.java
+++ b/ready_se/google/keymint/KM200/Applet/src/com/android/javacard/keymaster/KMEncoder.java
@@ -334,13 +334,6 @@ public class KMEncoder {
     }
   }
 
-  public void encodeArrayOnlyLength(short arrLength, byte[] buffer, short offset, short length) {
-    bufferRef[0] = buffer;
-    scratchBuf[START_OFFSET] = offset;
-    scratchBuf[LEN_OFFSET] = (short) (offset + length + 1);
-    writeMajorTypeWithLength(ARRAY_TYPE, length);
-  }
-
   private void encodeMap(short obj) {
     writeMajorTypeWithLength(MAP_TYPE, KMMap.cast(obj).length());
     short len = KMMap.cast(obj).length();
diff --git a/ready_se/google/keymint/KM200/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java b/ready_se/google/keymint/KM200/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java
index a410e00..cc20407 100644
--- a/ready_se/google/keymint/KM200/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java
+++ b/ready_se/google/keymint/KM200/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java
@@ -2331,31 +2331,6 @@ public class KMKeymasterApplet extends Applet implements AppletEvent, ExtendedLe
     sendResponse(apdu, KMError.OK);
   }
 
-  private short aesGCMEncrypt(
-      short aesSecret, short input, short nonce, short authData, short authTag, byte[] scratchPad) {
-    Util.arrayFillNonAtomic(scratchPad, (short) 0, KMByteBlob.cast(input).length(), (byte) 0);
-    short len =
-        seProvider.aesGCMEncrypt(
-            KMByteBlob.cast(aesSecret).getBuffer(),
-            KMByteBlob.cast(aesSecret).getStartOff(),
-            KMByteBlob.cast(aesSecret).length(),
-            KMByteBlob.cast(input).getBuffer(),
-            KMByteBlob.cast(input).getStartOff(),
-            KMByteBlob.cast(input).length(),
-            scratchPad,
-            (short) 0,
-            KMByteBlob.cast(nonce).getBuffer(),
-            KMByteBlob.cast(nonce).getStartOff(),
-            KMByteBlob.cast(nonce).length(),
-            KMByteBlob.cast(authData).getBuffer(),
-            KMByteBlob.cast(authData).getStartOff(),
-            KMByteBlob.cast(authData).length(),
-            KMByteBlob.cast(authTag).getBuffer(),
-            KMByteBlob.cast(authTag).getStartOff(),
-            KMByteBlob.cast(authTag).length());
-    return KMByteBlob.instance(scratchPad, (short) 0, len);
-  }
-
   private short aesGCMDecrypt(
       short aesSecret, short input, short nonce, short authData, short authTag, byte[] scratchPad) {
     Util.arrayFillNonAtomic(scratchPad, (short) 0, KMByteBlob.cast(input).length(), (byte) 0);
@@ -3419,14 +3394,6 @@ public class KMKeymasterApplet extends Applet implements AppletEvent, ExtendedLe
     sendOutgoing(apdu, resp);
   }
 
-  private void authorizeAlgorithm(KMOperationState op) {
-    short alg = KMEnumTag.getValue(KMType.ALGORITHM, data[HW_PARAMETERS]);
-    if (alg == KMType.INVALID_VALUE) {
-      KMException.throwIt(KMError.UNSUPPORTED_ALGORITHM);
-    }
-    op.setAlgorithm((byte) alg);
-  }
-
   private void authorizePurpose(KMOperationState op) {
     switch (op.getAlgorithm()) {
       case KMType.AES:
@@ -4608,16 +4575,6 @@ public class KMKeymasterApplet extends Applet implements AppletEvent, ExtendedLe
     kmDataStore.removeAllAuthTags();
   }
 
-  protected void initSystemBootParams(
-      short osVersion, short osPatchLevel, short vendorPatchLevel, short bootPatchLevel) {
-    osVersion = KMInteger.uint_16(osVersion);
-    osPatchLevel = KMInteger.uint_16(osPatchLevel);
-    vendorPatchLevel = KMInteger.uint_16((short) vendorPatchLevel);
-    setOsVersion(osVersion);
-    setOsPatchLevel(osPatchLevel);
-    setVendorPatchLevel(vendorPatchLevel);
-  }
-
   protected void setOsVersion(short version) {
     kmDataStore.setOsVersion(
         KMInteger.cast(version).getBuffer(),
diff --git a/ready_se/google/keymint/KM200/Applet/src/com/android/javacard/keymaster/KMKeymintDataStore.java b/ready_se/google/keymint/KM200/Applet/src/com/android/javacard/keymaster/KMKeymintDataStore.java
index 56d99a0..efd7ae5 100644
--- a/ready_se/google/keymint/KM200/Applet/src/com/android/javacard/keymaster/KMKeymintDataStore.java
+++ b/ready_se/google/keymint/KM200/Applet/src/com/android/javacard/keymaster/KMKeymintDataStore.java
@@ -374,10 +374,6 @@ public class KMKeymintDataStore implements KMUpgradable {
     writeDataEntry(HMAC_NONCE, nonce, offset, len);
   }
 
-  public void clearHmacNonce() {
-    clearDataEntry(HMAC_NONCE);
-  }
-
   public boolean persistAuthTag(short authTag) {
 
     if (KMByteBlob.cast(authTag).length() != AUTH_TAG_LENGTH) {
diff --git a/ready_se/google/keymint/KM200/Applet/src/com/android/javacard/keymaster/KMTag.java b/ready_se/google/keymint/KM200/Applet/src/com/android/javacard/keymaster/KMTag.java
index 3033a70..d7d549a 100644
--- a/ready_se/google/keymint/KM200/Applet/src/com/android/javacard/keymaster/KMTag.java
+++ b/ready_se/google/keymint/KM200/Applet/src/com/android/javacard/keymaster/KMTag.java
@@ -55,29 +55,6 @@ public class KMTag extends KMType {
     return tag != KMType.INVALID_VALUE;
   }
 
-  public static boolean isEqual(short params, short tagType, short tagKey, short value) {
-    switch (tagType) {
-      case KMType.ENUM_TAG:
-        return KMEnumTag.getValue(tagKey, params) == value;
-      case KMType.UINT_TAG:
-      case KMType.DATE_TAG:
-      case KMType.ULONG_TAG:
-        return KMIntegerTag.isEqual(params, tagType, tagKey, value);
-      case KMType.ENUM_ARRAY_TAG:
-        return KMEnumArrayTag.contains(tagKey, value, params);
-      case KMType.UINT_ARRAY_TAG:
-      case KMType.ULONG_ARRAY_TAG:
-        return KMIntegerArrayTag.contains(tagKey, value, params);
-    }
-    return false;
-  }
-
-  public static void assertTrue(boolean condition, short error) {
-    if (!condition) {
-      KMException.throwIt(error);
-    }
-  }
-
   public static boolean isValidPublicExponent(short params) {
     short pubExp = KMKeyParameters.findTag(KMType.ULONG_TAG, KMType.RSA_PUBLIC_EXPONENT, params);
     if (pubExp == KMType.INVALID_VALUE) {