From 59c961a27092e2d12e62c40508d3b74f1178db79 Mon Sep 17 00:00:00 2001
From: nagendra0721 <nagendra0718@gmail.com>
Date: Thu, 5 Feb 2026 23:56:23 +0530
Subject: [PATCH 1/2] MOSIP-42630: log

Signed-off-by: nagendra0721 <nagendra0718@gmail.com>
---
 .../service/impl/KeymanagerServiceImpl.java   | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/service/impl/KeymanagerServiceImpl.java b/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/service/impl/KeymanagerServiceImpl.java
index ca395dce4..ae3000e76 100644
--- a/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/service/impl/KeymanagerServiceImpl.java
+++ b/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/service/impl/KeymanagerServiceImpl.java
@@ -930,13 +930,17 @@ private Object[] getKeyDetails(Optional<io.mosip.kernel.keymanagerservice.entity
 			PrivateKey signPrivateKey = signKeyEntry.getPrivateKey();
 			X509Certificate x509Cert = (X509Certificate) signKeyEntry.getCertificate();
 			return new Object[] {signPrivateKey, x509Cert};
-		} 
-		PrivateKeyEntry masterKeyEntry = keyStore.getAsymmetricKey(keyFromDBStore.get().getMasterAlias());
-		PrivateKey masterPrivateKey = masterKeyEntry.getPrivateKey();
-		PublicKey masterPublicKey = masterKeyEntry.getCertificate().getPublicKey();
+		}
 		try {
+            PrivateKeyEntry masterKeyEntry = keyStore.getAsymmetricKey(keyFromDBStore.get().getMasterAlias());
+            LOGGER.info(KeymanagerConstant.SESSIONID, KeymanagerConstant.KEYFROMDB, keyFromDBStore.toString(),
+                    "Key in DBStore does not exist for this alias. So fetching the certificate from HSM." + masterKeyEntry);
+            PrivateKey masterPrivateKey = masterKeyEntry.getPrivateKey();
+            PublicKey masterPublicKey = masterKeyEntry.getCertificate().getPublicKey();
 			byte[] decryptedPrivateKey = keymanagerUtil.decryptKey(CryptoUtil.decodeURLSafeBase64(keyFromDBStore.get().getPrivateKey()), 
 													masterPrivateKey, masterPublicKey, keyStore.getKeystoreProviderName());
+            LOGGER.info(KeymanagerConstant.SESSIONID, KeymanagerConstant.KEYFROMDB, keyFromDBStore.toString(),
+                    "Key in DBStore does not exist for this alias. So fetching the certificate from HSM. Byte Length: " + decryptedPrivateKey.length);
 			X509Certificate x509Cert = (X509Certificate) keymanagerUtil.convertToCertificate(keyFromDBStore.get().getCertificateData());
 			String keyAlgorithm = x509Cert.getPublicKey().getAlgorithm();
 			PrivateKey signPrivateKey = null;
@@ -953,7 +957,12 @@ private Object[] getKeyDetails(Optional<io.mosip.kernel.keymanagerservice.entity
 				| NullMethodException | InvalidKeySpecException | NoSuchAlgorithmException e) {
 			throw new CryptoException(KeymanagerErrorConstant.CRYPTO_EXCEPTION.getErrorCode(),
 					KeymanagerErrorConstant.CRYPTO_EXCEPTION.getErrorMessage() + e.getMessage(), e);
-		}
+		} catch (Throwable e) {
+            LOGGER.error(KeymanagerConstant.SESSIONID, KeymanagerConstant.APPLICATIONID, null,
+                    "Invalid Certificate Data provided to upload the certificate.", e);
+            throw new CryptoException(KeymanagerErrorConstant.CRYPTO_EXCEPTION.getErrorCode(),
+                    KeymanagerErrorConstant.CRYPTO_EXCEPTION.getErrorMessage() + e.getMessage(), e);
+        }
 	}
 
 	@Override

From d24d901fb998567670e18455461084b67df703e1 Mon Sep 17 00:00:00 2001
From: nagendra0721 <nagendra0718@gmail.com>
Date: Fri, 6 Feb 2026 00:01:33 +0530
Subject: [PATCH 2/2] Improve exception handling in KeymanagerServiceImpl

Refactor exception handling to log invalid certificate data errors.

Signed-off-by: nagendra0721 <nagendra0718@gmail.com>
---
 .../keymanagerservice/service/impl/KeymanagerServiceImpl.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/service/impl/KeymanagerServiceImpl.java b/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/service/impl/KeymanagerServiceImpl.java
index 14fbca08e..ae3000e76 100644
--- a/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/service/impl/KeymanagerServiceImpl.java
+++ b/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/service/impl/KeymanagerServiceImpl.java
@@ -957,11 +957,7 @@ private Object[] getKeyDetails(Optional<io.mosip.kernel.keymanagerservice.entity
 				| NullMethodException | InvalidKeySpecException | NoSuchAlgorithmException e) {
 			throw new CryptoException(KeymanagerErrorConstant.CRYPTO_EXCEPTION.getErrorCode(),
 					KeymanagerErrorConstant.CRYPTO_EXCEPTION.getErrorMessage() + e.getMessage(), e);
-<<<<<<< release-1.4.x-log
 		} catch (Throwable e) {
-=======
-		}  catch (Throwable e) {
->>>>>>> release-1.4.x
             LOGGER.error(KeymanagerConstant.SESSIONID, KeymanagerConstant.APPLICATIONID, null,
                     "Invalid Certificate Data provided to upload the certificate.", e);
             throw new CryptoException(KeymanagerErrorConstant.CRYPTO_EXCEPTION.getErrorCode(),