Trusted confirmation changes for Jcard

Applet/JCardSimProviderLib/src/com/android/javacard/seprovider/KMComputedHmacKey.java

@@ -0,0 +1,5 @@
+package com.android.javacard.seprovider;
+
+
+public interface KMComputedHmacKey {
+}

Applet/JCardSimProviderLib/src/com/android/javacard/seprovider/KMHmacKey.java

@@ -36,4 +36,8 @@ public byte getKey(byte[] keyData, short kOff) {
  public short getKeySizeBits() {
  return hmacKey.getSize();
  }
+
+ public HMACKey getKey() {
+ return hmacKey;
+ }
 }

Applet/JCardSimProviderLib/src/com/android/javacard/seprovider/KMJCardSimulator.java

@@ -39,6 +39,7 @@
 import javacard.security.Key;
 import javacard.security.KeyBuilder;
 import javacard.security.KeyPair;
+import javacard.security.MessageDigest;
 import javacard.security.RSAPrivateKey;
 import javacard.security.KeyAgreement;
 import javacard.security.RandomData;
@@ -75,6 +76,7 @@ public class KMJCardSimulator implements KMSEProvider {
  public static final byte POWER_RESET_FALSE = (byte)0xAA;
  public static final byte POWER_RESET_TRUE = (byte)0x00;
  public static final byte AES_BLOCK_SIZE = 16;
+ private static final short COMPUTED_HMAC_KEY_SIZE = 32;
 
  public static byte[] resetFlag;
  public static boolean jcardSim = false;
@@ -95,6 +97,7 @@ public class KMJCardSimulator implements KMSEProvider {
  private KMECDeviceUniqueKey testKey;
  private KMECDeviceUniqueKey deviceUniqueKey;
  private KMHmacKey preSharedKey;
+ private KMHmacKey computedHmacKey;
  private boolean deviceReboot;
 
  // Data - originally was in repository
@@ -571,12 +574,6 @@ public short hmacSign(HMACKey key, byte[] data, short dataStart, short dataLengt
  return hmacSignature.sign(data, dataStart, dataLength, mac, macStart);
  }
 
- public boolean hmacVerify(HMACKey key, byte[] data, short dataStart, short dataLength,
- byte[] mac, short macStart, short macLength) {
- hmacSignature.init(key, Signature.MODE_VERIFY);
- return hmacSignature.verify(data, dataStart, dataLength, mac, macStart, macLength);
- }
-
  @Override
  public short hmacKDF(KMMasterKey masterkey, byte[] data, short dataStart,
  short dataLength, byte[] signature, short signatureStart) {
@@ -651,10 +648,11 @@ public short hmacSign(byte[] keyBuf, short keyStart, short keyLength, byte[] dat
  }
 
  @Override
- public boolean hmacVerify(byte[] keyBuf, short keyStart, short keyLength, byte[] data,
- short dataStart, short dataLength, byte[] mac, short macStart, short macLength) {
- HMACKey key = createHMACKey(keyBuf, keyStart, keyLength);
- return hmacVerify(key, data, dataStart, dataLength, mac, macStart, macLength);
+ public boolean hmacVerify(KMComputedHmacKey key, byte[] data, short dataStart, 
+ short dataLength, byte[] mac, short macStart, short macLength) {
+ KMHmacKey hmacKey = (KMHmacKey) key;
+ hmacSignature.init(hmacKey.getKey(), Signature.MODE_VERIFY);
+ return hmacSignature.verify(data, dataStart, dataLength, mac, macStart, macLength);
  }
 
  @Override
@@ -697,6 +695,14 @@ public KMOperation initSymmetricOperation(byte purpose, byte alg, byte digest, b
  return null;
  }
 
+ @Override
+ public KMOperation initTrustedConfirmationSymmetricOperation(KMComputedHmacKey computedHmacKey) {
+ KMOperationImpl opr = null;
+ KMHmacKey key = (KMHmacKey) computedHmacKey;
+ Signature signerVerifier = createHmacSignerVerifier(KMType.VERIFY, KMType.SHA2_256, key.getKey());
+ return new KMOperationImpl(signerVerifier);
+ }
+
  @Override
  public KMOperation initAsymmetricOperation(byte purpose, byte alg, byte padding, byte digest,
  byte mgfDigest, byte[] privKeyBuf, short privKeyStart, short privKeyLength,
@@ -1120,6 +1126,15 @@ public Signature createHmacSignerVerifier(short purpose, short digest, byte[] se
  return hmacSignerVerifier;
  }
 
+ private Signature createHmacSignerVerifier(short purpose, short digest, HMACKey key) {
+ byte alg = Signature.ALG_HMAC_SHA_256;
+ if (digest != KMType.SHA2_256) {
+ CryptoException.throwIt(CryptoException.ILLEGAL_VALUE);
+ }
+ Signature hmacSignerVerifier = Signature.getInstance((byte) alg, false);
+ hmacSignerVerifier.init(key, (byte) purpose);
+ return hmacSignerVerifier;
+ }
 
  public KMCipher createAesGcmCipher(short mode, short tagLen, byte[] secret, short secretStart,
  short secretLength,
@@ -1466,6 +1481,20 @@ public boolean isUpgrading() {
  return false;
  }
 
+ @Override
+ public KMComputedHmacKey createComputedHmacKey(byte[] keyData, short offset, short length) {
+ if (length != COMPUTED_HMAC_KEY_SIZE) {
+ CryptoException.throwIt(CryptoException.ILLEGAL_VALUE);
+ }
+ if (computedHmacKey == null) {
+ HMACKey key = (HMACKey) KeyBuilder.buildKey(KeyBuilder.TYPE_HMAC, (short) (length * 8),
+ false);
+ computedHmacKey = new KMHmacKey(key);
+ }
+ computedHmacKey.setKey(keyData, offset, length);
+ return (KMComputedHmacKey) computedHmacKey;
+ }
+
  @Override
  public KMMasterKey createMasterKey(short keySizeBits) {
  if (masterKey == null) {
@@ -1760,5 +1789,24 @@ public void setProvisionLocked(boolean locked) {
  public boolean isProvisionLocked() {
  return isProvisionLocked;
  }
+
+ @Override
+ public short messageDigest256(byte[] inBuff, short inOffset,
+ short inLength, byte[] outBuff, short outOffset) {
+ MessageDigest mDigest = null;
+ short len = 0;
+ try {
+ mDigest = MessageDigest.getInitializedMessageDigestInstance(MessageDigest.ALG_SHA_256, false);
+ len = mDigest.doFinal(inBuff, inOffset, inLength, outBuff, outOffset);
+ } catch (Exception e) {
+
+ }
+ return len;
+ }
+
+ @Override
+ public KMComputedHmacKey getComputedHmacKey() {
+ return (KMComputedHmacKey) computedHmacKey;
+ }
 
 }

Applet/JCardSimProviderLib/src/com/android/javacard/seprovider/KMSEProvider.java

@@ -63,6 +63,14 @@ void createAsymmetricKey(
  short pubModMaxLength,
  short[] lengths);
 
+ /**
+ * Initializes the trusted confirmation operation.
+ *
+ * @param computedHmacKey Instance of the computed Hmac key.
+ * @return instance of KMOperation.
+ */
+ KMOperation initTrustedConfirmationSymmetricOperation(KMComputedHmacKey computedHmacKey);
+
  /**
  * Verify that the imported key is valid. If the algorithm and/or keysize are not supported then
  * it should throw a CryptoException.
@@ -289,9 +297,7 @@ short hmacKDF(
  /**
  * This is a oneshot operation that verifies the signature using hmac algorithm.
  *
- * @param keyBuf is the buffer with hmac key.
- * @param keyStart is the start of the buffer.
- * @param keyLength is the length of the buffer which will be in bytes from 8 to 64.
+ * @param hmacKey is the computed hmac key.
  * @param data is the buffer containing data.
  * @param dataStart is the start of the data.
  * @param dataLength is the length of the data.
@@ -301,9 +307,7 @@ short hmacKDF(
  * @return true if the signature matches.
  */
  boolean hmacVerify(
- byte[] keyBuf,
- short keyStart,
- short keyLength,
+ KMComputedHmacKey hmacKey,
  byte[] data,
  short dataStart,
  short dataLength,
@@ -555,6 +559,16 @@ KMOperation initAsymmetricOperation(
  */
  boolean isUpgrading();
 
+ /**
+ * This function creates an HMACKey and initializes the key with the provided input key data.
+ *
+ * @param keyData buffer containing the key data.
+ * @param offset start of the buffer.
+ * @param length length of the buffer.
+ * @return An instance of the KMComputedHmacKey.
+ */
+ KMComputedHmacKey createComputedHmacKey(byte[] keyData, short offset, short length);
+
  /**
  * This function generates an AES Key of keySizeBits, which is used as an master key. This
  * generated key is maintained by the SEProvider. This function should be called only once at the
@@ -685,6 +699,26 @@ KMDeviceUniqueKey createDeviceUniqueKey(boolean testMode,
  * @return boot certificate chain.
  */
  byte[] getBootCertificateChain();
+
+ /**
+ * Returns the computed Hmac key.
+ *
+ * @return Instance of the computed hmac key.
+ */
+ KMComputedHmacKey getComputedHmacKey();
+
+ /**
+ * This is a one-shot operation the does digest of the input mesage.
+ *
+ * @param inBuff input buffer to be digested.
+ * @param inOffset start offset of the input buffer.
+ * @param inLength length of the input buffer.
+ * @param outBuff is the output buffer that contains the digested data.
+ * @param outOffset start offset of the digested output buffer.
+ * @return length of the digested data.
+ */
+ short messageDigest256(byte[] inBuff, short inOffset, short inLength, byte[] outBuff,
+ short outOffset);
 
  public boolean isProvisionLocked();
 

Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java

@@ -17,7 +17,6 @@
 package com.android.javacard.keymaster;
 
 import com.android.javacard.seprovider.KMAttestationCert;
-import com.android.javacard.seprovider.KMComputedHmacKey;
 import com.android.javacard.seprovider.KMDeviceUniqueKey;
 import com.android.javacard.seprovider.KMException;
 import com.android.javacard.seprovider.KMHmacKey;