From 21dec20543b7cde89f4d3efe016093d5b02ec0a1 Mon Sep 17 00:00:00 2001
From: "avinash.hedage" <avinash.hedage@quest-global.com>
Date: Tue, 12 Apr 2022 14:09:49 +0000
Subject: [PATCH] bug fixes

---
 Applet/src/com/android/javacard/keymaster/KMByteTag.java        | 2 +-
 .../src/com/android/javacard/keymaster/KMKeymasterApplet.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Applet/src/com/android/javacard/keymaster/KMByteTag.java b/Applet/src/com/android/javacard/keymaster/KMByteTag.java
index e33cc4db..b7b8decd 100644
--- a/Applet/src/com/android/javacard/keymaster/KMByteTag.java
+++ b/Applet/src/com/android/javacard/keymaster/KMByteTag.java
@@ -130,6 +130,6 @@ private static boolean validateKey(short key, short byteBlob) {
       default:
         return false;
     }
-    return result;
+    return true;
   }
 }
diff --git a/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java b/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java
index 1a58baa1..d413cc05 100644
--- a/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java
+++ b/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java
@@ -1377,7 +1377,7 @@ private KMAttestationCert makeSelfSignedCert(short attPrivKey, short attPubKey,
       subject = KMByteTag.cast(subject).getValue();
     }
 
-    if (KMEnumTag.cast(alg).getValue() == KMType.RSA) {
+    if (alg == KMType.RSA) {
       cert.rsaAttestKey(attPrivKey, attPubKey, (byte) mode);
     } else {
       cert.ecAttestKey(attPrivKey, (byte) mode);