Merge pull request #236 from subrahmanyaman/remove_get_set

Remove getter setter - Merge from KeyMint300

Author: mdwivedi

Applet/AndroidSEProvider/src/com/android/javacard/keymaster/KMAttestationCertImpl.java

@@ -954,8 +954,8 @@ public KMAttestationCert makeUniqueId(byte[] scratchPad, short scratchPadOff,
 
     //Get the key data from the master key
     KMAESKey aesKey = (KMAESKey) masterKey;
-    short mKeyData = KMByteBlob.instance((short) (aesKey.getKeySizeBits() / 8));
-    aesKey.getKey(
+    short mKeyData = KMByteBlob.instance((short) (aesKey.aesKey.getSize() / 8));
+    aesKey.aesKey.getKey(
         KMByteBlob.cast(mKeyData).getBuffer(), /* Key */
         KMByteBlob.cast(mKeyData).getStartOff()); /* Key start*/
     timeOffset = KMByteBlob.instance((short) 32);

Applet/AndroidSEProviderLib/src/com/android/javacard/seprovider/KMAESKey.java

@@ -21,24 +21,12 @@
 
 public class KMAESKey implements KMMasterKey {
 
-  private AESKey aesKey;
+  public AESKey aesKey;
 
   public KMAESKey(AESKey key) {
     aesKey = key;
   }
 
-  public void setKey(byte[] keyData, short kOff) {
-    aesKey.setKey(keyData, kOff);
-  }
-
-  public byte getKey(byte[] keyData, short kOff) {
-    return aesKey.getKey(keyData, kOff);
-  }
-
-  public short getKeySizeBits() {
-    return aesKey.getSize();
-  }
-
   public static void onSave(Element element, KMAESKey kmKey) {
     element.write(kmKey.aesKey);
   }

Applet/AndroidSEProviderLib/src/com/android/javacard/seprovider/KMAndroidSEProvider.java

@@ -427,7 +427,7 @@ public HMACKey cmacKdf(KMPreSharedKey preSharedKey, byte[] label, short labelSta
       short keyOutLen = n * 16;
       //Convert Hmackey to AES Key as the algorithm is ALG_AES_CMAC_128.
       KMHmacKey hmacKey = ((KMHmacKey) preSharedKey);
-      hmacKey.getKey(tmpArray, (short) 0);
+      hmacKey.hmacKey.getKey(tmpArray, (short) 0);
       aesKeys[KEYSIZE_256_OFFSET].setKey(tmpArray, (short) 0);
       //Initialize the key derivation function.
       kdf.init(aesKeys[KEYSIZE_256_OFFSET], Signature.MODE_SIGN);
@@ -473,20 +473,20 @@ public short hmacSign(byte[] keyBuf, short keyStart, short keyLength,
   @Override
   public short hmacSign(Object key,
       byte[] data, short dataStart, short dataLength, byte[] mac, short macStart) {
-	if(!(key instanceof KMHmacKey)) {
-	  KMException.throwIt(KMError.INVALID_ARGUMENT);
-	}
-	KMHmacKey hmacKey = (KMHmacKey) key;
-    return hmacSign(hmacKey.getKey(), data, dataStart, dataLength, mac, macStart);
+    if(!(key instanceof KMHmacKey)) {
+      KMException.throwIt(KMError.INVALID_ARGUMENT);
+    }
+    KMHmacKey hmacKey = (KMHmacKey) key;
+    return hmacSign(hmacKey.hmacKey, data, dataStart, dataLength, mac, macStart);
   }
 
   @Override
   public short hmacKDF(KMMasterKey masterkey, byte[] data, short dataStart,
       short dataLength, byte[] signature, short signatureStart) {
     try {
       KMAESKey aesKey = (KMAESKey) masterkey;
-      short keyLen = (short) (aesKey.getKeySizeBits() / 8);
-      aesKey.getKey(tmpArray, (short) 0);
+      short keyLen = (short) (aesKey.aesKey.getSize() / 8);
+      aesKey.aesKey.getKey(tmpArray, (short) 0);
       return hmacSign(tmpArray, (short) 0, keyLen, data, dataStart, dataLength,
           signature, signatureStart);
     } finally {
@@ -498,7 +498,7 @@ public short hmacKDF(KMMasterKey masterkey, byte[] data, short dataStart,
   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);
+      hmacSignature.init(hmacKey.hmacKey, Signature.MODE_VERIFY);
       return hmacSignature.verify(data, dataStart, dataLength, mac, macStart,
 	        macLength);
   }
@@ -602,7 +602,7 @@ public KMOperation createSymmetricCipher(short alg, short purpose, short macLeng
 	  }
     // Get the KeyObject from the operation and update the key with the secret key material.
     KMKeyObject keyObj = operation.getKeyObject();
-    Key key = (Key)keyObj.getKeyObjectInstance();
+    Key key = (Key)keyObj.keyObjectInst;
     switch (secretLength) {
       case 32:
       case 16:	  
@@ -634,7 +634,7 @@ public KMOperation createHmacSignerVerifier(short purpose, short digest,
     }
     // Get the KeyObject from the operation and update the key with the secret key material.
     KMKeyObject keyObj = operation.getKeyObject();
-    HMACKey key = (HMACKey)keyObj.getKeyObjectInstance();
+    HMACKey key = (HMACKey)keyObj.keyObjectInst;
     key.setKey(secret, secretStart, secretLength);
     ((KMOperationImpl) operation).init(key, digest, null, (short) 0, (short) 0);
     return operation;
@@ -649,7 +649,7 @@ private KMOperation createHmacSignerVerifier(short purpose, short digest, HMACKe
         KMType.HMAC, KMType.INVALID_VALUE, KMType.INVALID_VALUE, KMType.INVALID_VALUE, (short)0, isTrustedConf);
     // Get the KeyObject from the operation and update the key with the secret key material.
     KMKeyObject keyObj = operation.getKeyObject();
-    HMACKey key = (HMACKey)keyObj.getKeyObjectInstance();
+    HMACKey key = (HMACKey)keyObj.keyObjectInst;
     short len = hmacKey.getKey(tmpArray, (short) 0);
     key.setKey(tmpArray, (short) 0, len);
     ((KMOperationImpl) operation).init(key, digest, null, (short) 0, (short) 0);
@@ -716,8 +716,8 @@ public KMOperation initSymmetricOperation(byte purpose, byte alg, byte digest, b
       switch (interfaceType) {
         case KMDataStoreConstants.INTERFACE_TYPE_MASTER_KEY:
 	  KMAESKey aesKey = (KMAESKey) key;
-	  keyLen = (short) (aesKey.getKeySizeBits() / 8);
-	  aesKey.getKey(tmpArray, (short) 0);
+	  keyLen = (short) (aesKey.aesKey.getSize() / 8);
+	  aesKey.aesKey.getKey(tmpArray, (short) 0);
 	  break;
 
 	default:
@@ -743,7 +743,7 @@ public KMOperation initSymmetricOperation(byte purpose, byte alg, byte digest, b
   @Override
   public KMOperation initTrustedConfirmationSymmetricOperation(KMComputedHmacKey computedHmacKey) {
     KMHmacKey key = (KMHmacKey) computedHmacKey;
-    return createHmacSignerVerifier(KMType.VERIFY, KMType.SHA2_256, key.getKey(), true);
+    return createHmacSignerVerifier(KMType.VERIFY, KMType.SHA2_256, key.hmacKey, true);
   } 
 
   public KMOperation createRsaSigner(short digest, short padding, byte[] secret,
@@ -754,7 +754,7 @@ public KMOperation createRsaSigner(short digest, short padding, byte[] secret,
         KMType.INVALID_VALUE, KMType.INVALID_VALUE, secretLength, false);
     // Get the KeyObject from the operation and update the key with the secret key material.
     KMKeyObject keyObj = operation.getKeyObject();
-    RSAPrivateKey key = (RSAPrivateKey)((KeyPair)(keyObj.getKeyObjectInstance())).getPrivate();
+    RSAPrivateKey key = (RSAPrivateKey)((KeyPair)(keyObj.keyObjectInst)).getPrivate();
     key.setExponent(secret, secretStart, secretLength);
     key.setModulus(modBuffer, modOff, modLength);
     ((KMOperationImpl) operation).init(key, digest, null, (short) 0, (short) 0);
@@ -769,7 +769,7 @@ public KMOperation createRsaDecipher(short padding, short mgfDigest, byte[] secr
         KMType.INVALID_VALUE, KMType.INVALID_VALUE, secretLength, false); 
     // Get the KeyObject from the operation and update the key with the secret key material.
     KMKeyObject keyObj = operation.getKeyObject();
-    RSAPrivateKey key = (RSAPrivateKey) ((KeyPair)(keyObj.getKeyObjectInstance())).getPrivate();
+    RSAPrivateKey key = (RSAPrivateKey) ((KeyPair)(keyObj.keyObjectInst)).getPrivate();
     key.setExponent(secret, secretStart, secretLength);
     key.setModulus(modBuffer, modOff, modLength);
     ((KMOperationImpl) operation).init(key, KMType.INVALID_VALUE, null, (short) 0, (short) 0);
@@ -783,7 +783,7 @@ public KMOperation createEcSigner(short digest, byte[] secret,
             .getOperationImpl(KMType.SIGN, alg, KMType.EC, KMType.INVALID_VALUE,
                 KMType.INVALID_VALUE, KMType.INVALID_VALUE, secretLength, false);
     KMKeyObject keyObj = operation.getKeyObject();
-    ECPrivateKey key = (ECPrivateKey) ((KeyPair)(keyObj.getKeyObjectInstance())).getPrivate();
+    ECPrivateKey key = (ECPrivateKey) ((KeyPair)(keyObj.keyObjectInst)).getPrivate();
     key.setS(secret, secretStart, secretLength);
     ((KMOperationImpl) operation).init(key, digest, null, (short) 0, (short) 0);
     return operation;
@@ -795,7 +795,7 @@ public KMOperation createKeyAgreement(byte[] secret, short secretStart,
         .getOperationImpl(KMType.AGREE_KEY, KeyAgreement.ALG_EC_SVDP_DH_PLAIN,
             KMType.EC, KMType.INVALID_VALUE, KMType.INVALID_VALUE, KMType.INVALID_VALUE, (short)0, false);
     KMKeyObject keyObj = operation.getKeyObject();
-    ECPrivateKey key = (ECPrivateKey) ((KeyPair)(keyObj.getKeyObjectInstance())).getPrivate();
+    ECPrivateKey key = (ECPrivateKey) ((KeyPair)(keyObj.keyObjectInst)).getPrivate();
     key.setS(secret, secretStart, secretLength);
     ((KMOperationImpl) operation).init(key, KMType.INVALID_VALUE, null, (short) 0, (short) 0);
     return operation;
@@ -864,7 +864,7 @@ public KMMasterKey createMasterKey(KMMasterKey masterKey, short keySizeBits) {
         masterKey = new KMAESKey(key);
         short keyLen = (short) (keySizeBits / 8);
         getTrueRandomNumber(tmpArray, (short) 0, keyLen);
-        ((KMAESKey)masterKey).setKey(tmpArray, (short) 0);
+        ((KMAESKey)masterKey).aesKey.setKey(tmpArray, (short) 0);
       }
       return (KMMasterKey) masterKey;
     } finally {
@@ -883,7 +883,7 @@ public KMPreSharedKey createPreSharedKey(KMPreSharedKey preSharedKey, byte[] key
           false);
       preSharedKey = new KMHmacKey(key);
     }
-    ((KMHmacKey)preSharedKey).setKey(keyData, offset, length);
+    ((KMHmacKey)preSharedKey).hmacKey.setKey(keyData, offset, length);
     return (KMPreSharedKey) preSharedKey;
   }
 
@@ -897,7 +897,7 @@ public KMComputedHmacKey createComputedHmacKey(KMComputedHmacKey computedHmacKey
           false);
       computedHmacKey = new KMHmacKey(key);
     }
-    ((KMHmacKey)computedHmacKey).setKey(keyData, offset, length);
+    ((KMHmacKey)computedHmacKey).hmacKey.setKey(keyData, offset, length);
     return (KMComputedHmacKey) computedHmacKey;
   }  
 
@@ -933,7 +933,7 @@ public short ecSign256(KMAttestationKey ecPrivKey, byte[] inputDataBuf, short in
 
       signer = Signature.OneShot.open(MessageDigest.ALG_SHA_256,
           Signature.SIG_CIPHER_ECDSA, Cipher.PAD_NULL);
-      signer.init(((KMECPrivateKey) ecPrivKey).getPrivateKey(), Signature.MODE_SIGN);
+      signer.init(((KMECPrivateKey) ecPrivKey).ecKeyPair.getPrivate(), Signature.MODE_SIGN);
       return signer.sign(inputDataBuf, inputDataStart, inputDataLength,
           outputDataBuf, outputDataStart);
     } finally {
@@ -1071,7 +1071,7 @@ public short ecSign256(KMDeviceUniqueKeyPair ecPrivKey, byte[] inputDataBuf,
     try {
       signer = Signature.OneShot.open(MessageDigest.ALG_SHA_256,
           Signature.SIG_CIPHER_ECDSA, Cipher.PAD_NULL);
-      signer.init(((KMECDeviceUniqueKey) ecPrivKey).getPrivateKey(), Signature.MODE_SIGN);
+      signer.init(((KMECDeviceUniqueKey) ecPrivKey).ecKeyPair.getPrivate(), Signature.MODE_SIGN);
       return signer.sign(inputDataBuf, inputDataStart, inputDataLength,
           outputDataBuf, outputDataStart);
     } finally {
@@ -1090,8 +1090,10 @@ public KMDeviceUniqueKeyPair createRkpDeviceUniqueKeyPair(KMDeviceUniqueKeyPair
       poolMgr.initECKey(ecKeyPair);
       key = new KMECDeviceUniqueKey(ecKeyPair);
     }
-    ((KMECDeviceUniqueKey) key).setS(privKey, privKeyOff, privKeyLen);
-    ((KMECDeviceUniqueKey) key).setW(pubKey, pubKeyOff, pubKeyLen);
+    ECPrivateKey ecKeyPair = (ECPrivateKey) ((KMECDeviceUniqueKey) key).ecKeyPair.getPrivate();
+    ECPublicKey ecPublicKey = (ECPublicKey) ((KMECDeviceUniqueKey) key).ecKeyPair.getPublic();
+    ecKeyPair.setS(privKey, privKeyOff, privKeyLen);
+    ecPublicKey.setW(pubKey, pubKeyOff, pubKeyLen);
     return (KMDeviceUniqueKeyPair) key;
   }
 
@@ -1103,7 +1105,7 @@ public KMRkpMacKey createRkpMacKey(KMRkpMacKey rkpMacKey, byte[] keyData,
           false);
       rkpMacKey = new KMHmacKey(key);
     }
-    ((KMHmacKey) rkpMacKey).setKey(keyData, offset, length);
+    ((KMHmacKey) rkpMacKey).hmacKey.setKey(keyData, offset, length);
     return rkpMacKey;
   }
 

Applet/AndroidSEProviderLib/src/com/android/javacard/seprovider/KMECDeviceUniqueKey.java

@@ -22,36 +22,18 @@
 
 public class KMECDeviceUniqueKey implements KMDeviceUniqueKeyPair {
 
-  private KeyPair ecKeyPair;
+  public KeyPair ecKeyPair;
 
   @Override
   public short getPublicKey(byte[] buf, short offset) {
-    ECPublicKey publicKey = getPublicKey();
+    ECPublicKey publicKey = (ECPublicKey) ecKeyPair.getPublic();
     return publicKey.getW(buf, offset);
   }
 
   public KMECDeviceUniqueKey(KeyPair ecPair) {
     ecKeyPair = ecPair;
   }
 
-  public void setS(byte[] buffer, short offset, short length) {
-    ECPrivateKey ecPriv = (ECPrivateKey) ecKeyPair.getPrivate();
-    ecPriv.setS(buffer, offset, length);
-  }
-
-  public void setW(byte[] buffer, short offset, short length) {
-    ECPublicKey ecPublicKey = (ECPublicKey) ecKeyPair.getPublic();
-    ecPublicKey.setW(buffer, offset, length);
-  }
-
-  public ECPrivateKey getPrivateKey() {
-    return (ECPrivateKey) ecKeyPair.getPrivate();
-  }
-
-  public ECPublicKey getPublicKey() {
-    return (ECPublicKey) ecKeyPair.getPublic();
-  }
-  
   public static void onSave(Element element, KMECDeviceUniqueKey kmKey) {
     element.write(kmKey.ecKeyPair);
   }

Applet/AndroidSEProviderLib/src/com/android/javacard/seprovider/KMECPrivateKey.java

@@ -23,26 +23,12 @@
 
 public class KMECPrivateKey implements KMAttestationKey {
 
-  private KeyPair ecKeyPair;
+  public KeyPair ecKeyPair;
 
   public KMECPrivateKey(KeyPair ecPair) {
     ecKeyPair = ecPair;
   }
 
-  public void setS(byte[] buffer, short offset, short length) {
-    ECPrivateKey ecPriv = (ECPrivateKey) ecKeyPair.getPrivate();
-    ecPriv.setS(buffer, offset, length);
-  }
-
-  public short getS(byte[] buffer, short offset) {
-    ECPrivateKey ecPriv = (ECPrivateKey) ecKeyPair.getPrivate();
-    return ecPriv.getS(buffer, offset);
-  }
-
-  public ECPrivateKey getPrivateKey() {
-    return (ECPrivateKey) ecKeyPair.getPrivate();
-  }
-
   public static void onSave(Element element, KMECPrivateKey kmKey) {
     element.write(kmKey.ecKeyPair);
   }

Applet/AndroidSEProviderLib/src/com/android/javacard/seprovider/KMException.java

@@ -42,14 +42,6 @@ public static void throwIt(short e) {
     reason[0] = e;
     throw exception;
   }
-/*
-  public static KMException instance() {
-    if (exception == null) {
-      exception = new KMException();
-    }
-    return exception;
-  }
-*/
 }
 
 

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

@@ -21,28 +21,12 @@
 
 public class KMHmacKey implements KMPreSharedKey, KMComputedHmacKey, KMRkpMacKey {
 
-  private HMACKey hmacKey;
+  public HMACKey hmacKey;
 
   public KMHmacKey(HMACKey key) {
     hmacKey = key;
   }
 
-  public void setKey(byte[] keyData, short kOff, short length) {
-    hmacKey.setKey(keyData, kOff, length);
-  }
-
-  public byte getKey(byte[] keyData, short kOff) {
-    return hmacKey.getKey(keyData, kOff);
-  }
-  
-  public HMACKey getKey() {
-    return hmacKey;
-  }
-  
-  public short getKeySizeBits() {
-    return hmacKey.getSize();
-  }
-
   public static void onSave(Element element, KMHmacKey kmKey) {
     element.write(kmKey.hmacKey);
   }

Applet/AndroidSEProviderLib/src/com/android/javacard/seprovider/KMKeyObject.java

@@ -1,19 +1,6 @@
 package com.android.javacard.seprovider;
 
 public class KMKeyObject {
-  private byte algorithm;
-  private Object keyObjectInst;
-
-  public void setKeyObjectData(byte alg, Object keyObject) {
-    algorithm = alg;
-	keyObjectInst = keyObject;
-  }
-  
-  public byte getAlgorithm() {
-    return this.algorithm;
-  }
-	
-  public Object getKeyObjectInstance() {
-	return keyObjectInst;
-  }
+  public byte algorithm;
+  public Object keyObjectInst;
 }

Applet/AndroidSEProviderLib/src/com/android/javacard/seprovider/KMPoolManager.java

@@ -339,7 +339,8 @@ private KMKeyObject createKeyObjectInstance(byte alg) {
       KMException.throwIt(KMError.UNSUPPORTED_ALGORITHM);
     }
     KMKeyObject ptr = new KMKeyObject();
-    ptr.setKeyObjectData(alg, keyObject);
+    ptr.algorithm = alg;
+    ptr.keyObjectInst = keyObject;
     return ptr;
   }
 
@@ -529,7 +530,7 @@ public KMKeyObject getKeyObjectFromPool(short alg, short secretLength, short max
         break;
       }
       keyObject = (KMKeyObject) keysPool[index];
-      if (algo == keyObject.getAlgorithm()) {
+      if (algo == keyObject.algorithm) {
         // Check if the Object instance is not busy and free to use.
         if (!isResourceBusy(keyObject, RESOURCE_TYPE_KEY)) {
           break;