Merge branch 'Keymint' of https://github.com/cpathak/JavaCardKeymaster into Keymint

Author: Chirag Pathak

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

@@ -691,8 +691,6 @@ private void processGetHmacSharingParamCmd(APDU apdu) {
     short seed = KMByteBlob.instance((short) 0);
     KMHmacSharingParameters.cast(params).setNonce(nonce);
     KMHmacSharingParameters.cast(params).setSeed(seed);
-    //print(KMByteBlob.cast(nonce).getBuffer(), KMByteBlob.cast(nonce).getStartOff(),
-    //    KMByteBlob.cast(nonce).length());
     // prepare the response
     short resp = KMArray.instance((short) 2);
     KMArray.cast(resp).add((short) 0, KMInteger.uint_16(KMError.OK));
@@ -771,9 +769,6 @@ private void processComputeSharedHmacCmd(APDU apdu) {
     short found = 0;
     //tmpVariables[9]
     short nonce = repository.getHmacNonce();
-    //print(KMByteBlob.cast(nonce).getBuffer(),
-    //    KMByteBlob.cast(nonce).getStartOff(),
-    //    KMByteBlob.cast(nonce).length());
 
     while (paramIndex < paramsLen) {
       // read HmacSharingParam
@@ -816,11 +811,6 @@ private void processComputeSharedHmacCmd(APDU apdu) {
       // Check if the nonce generated here is present in the hmacSharingParameters array.
       // Otherwise throw INVALID_ARGUMENT error.
       if (found == 1) {
-        //print(repository.getHeap(),
-        //    (short) (concateBuffer + bufferIndex),nonceLen);
-        //print(KMByteBlob.cast(nonce).getBuffer(),
-        //    KMByteBlob.cast(nonce).getStartOff(),
-        //    nonceLen);
         if (0
             == Util.arrayCompare(
             repository.getHeap(),
@@ -3013,18 +3003,6 @@ private void processInitStrongBoxCmd(APDU apdu) {
     setOsVersion(osVersion);
     setOsPatchLevel(osPatchLevel);
     setVendorPatchLevel(vendorPatchLevel);
-    System.out.println("============ OS Version et al ==========");
-   // print(KMInteger.cast(osVersion).getBuffer(),
-   //     KMInteger.cast(osVersion).getStartOff(),
-   //     KMInteger.cast(osVersion).length());
-
-   // print(KMInteger.cast(osPatchLevel).getBuffer(),
-   //     KMInteger.cast(osPatchLevel).getStartOff(),
-   //     KMInteger.cast(osPatchLevel).length());
-
-   // print(KMInteger.cast(vendorPatchLevel).getBuffer(),
-   //     KMInteger.cast(vendorPatchLevel).getStartOff(),
-   //     KMInteger.cast(vendorPatchLevel).length());
   }
 
   public void reboot(){
@@ -3118,6 +3096,7 @@ private void processGenerateKey(APDU apdu) {
         KMException.throwIt(KMError.UNSUPPORTED_ALGORITHM);
         break;
     }
+
     // create key blob and associated attestation.
     data[ORIGIN] = KMType.GENERATED;
     makeKeyCharacteristics(scratchPad);
@@ -3131,21 +3110,14 @@ private void processGenerateKey(APDU apdu) {
     KMArray.cast(resp).add((short) 3, data[CERTIFICATE]);
     sendOutgoing(apdu, resp);
   }
-/*
-  private static void print(byte[] buf, short start, short length){
-    StringBuilder sb = new StringBuilder(length * 2);
-    for(short i = start; i < (start+length); i ++){
-      sb.append(String.format("%02x", buf[i]));
-    }
-    System.out.println( sb.toString());
-  }
-*/
+
   private  void generateAttestation(byte[] scratchPad){
     KMAttestationCert cert = makeCert(scratchPad);
     if(cert == null) {// No certificate
       data[CERTIFICATE] = KMArray.instance((short)0);
       return;
     }
+
     // Allocate memory
     short certData = KMByteBlob.instance(MAX_CERT_SIZE);
     cert.buffer(KMByteBlob.cast(certData).getBuffer(),
@@ -3157,9 +3129,6 @@ private  void generateAttestation(byte[] scratchPad){
     KMByteBlob.cast(certData).setStartOff(cert.getCertStart());
     KMByteBlob.cast(certData).setLength(cert.getCertLength());
 
-    //print(KMByteBlob.cast(certData).getBuffer(),
-    //    KMByteBlob.cast(certData).getStartOff(),
-    //    KMByteBlob.cast(certData).length());
     // Initialize the certificate as array of blob
     data[CERTIFICATE] = KMArray.instance((short)1);
     KMArray.cast(data[CERTIFICATE]).add((short)0, certData);