From 82e168b8e099b0309535dbf4075a3c2ed649712e Mon Sep 17 00:00:00 2001
From: nagendra0721 <nagendra0718@gmail.com>
Date: Thu, 5 Feb 2026 23:39:44 +0530
Subject: [PATCH 1/2] MOSIP-42630: Add exceptions to catch block in
 KeymanagerServiceImpl

Signed-off-by: nagendra0721 <nagendra0718@gmail.com>
---
 .../keymanagerservice/service/impl/KeymanagerServiceImpl.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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..fafe56885 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
@@ -950,7 +950,8 @@ private Object[] getKeyDetails(Optional<io.mosip.kernel.keymanagerservice.entity
 			
 			return new Object[] {signPrivateKey, x509Cert};
 		} catch (InvalidDataException | InvalidKeyException | NullDataException | NullKeyException
-				| NullMethodException | InvalidKeySpecException | NoSuchAlgorithmException e) {
+				| NullMethodException | InvalidKeySpecException | NoSuchAlgorithmException
+				| KeystoreProcessingException | NoSuchSecurityProviderException e) {
 			throw new CryptoException(KeymanagerErrorConstant.CRYPTO_EXCEPTION.getErrorCode(),
 					KeymanagerErrorConstant.CRYPTO_EXCEPTION.getErrorMessage() + e.getMessage(), e);
 		}

From 7f3ab335b19169c331ce92c0801d04c1bdb1a222 Mon Sep 17 00:00:00 2001
From: nagendra0721 <nagendra0718@gmail.com>
Date: Thu, 5 Feb 2026 23:49:02 +0530
Subject: [PATCH 2/2] Improve error handling in KeymanagerServiceImpl

Refactor exception handling in KeymanagerServiceImpl to log errors for invalid certificate data.

Signed-off-by: nagendra0721 <nagendra0718@gmail.com>
---
 .../service/impl/KeymanagerServiceImpl.java            | 10 +++++++---
 1 file changed, 7 insertions(+), 3 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 fafe56885..26ea5eca5 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
@@ -950,11 +950,15 @@ private Object[] getKeyDetails(Optional<io.mosip.kernel.keymanagerservice.entity
 			
 			return new Object[] {signPrivateKey, x509Cert};
 		} catch (InvalidDataException | InvalidKeyException | NullDataException | NullKeyException
-				| NullMethodException | InvalidKeySpecException | NoSuchAlgorithmException
-				| KeystoreProcessingException | NoSuchSecurityProviderException e) {
+				| 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