bug fix

pixxelhq · Nov 23, 2024 · 8451105 · 8451105
1 parent fffc685
commit 8451105
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/yamcs-core/src/main/java/org/yamcs/security/encryption/aes/GCM.java b/yamcs-core/src/main/java/org/yamcs/security/encryption/aes/GCM.java
@@ -42,8 +42,8 @@ public void init(String yamcsInstance, YConfiguration config) {
     public byte[] encrypt(byte[] plainMessage)
             throws NoSuchAlgorithmException,InvalidKeySpecException, InvalidKeyException, InvalidAlgorithmParameterException, NoSuchPaddingException, IllegalBlockSizeException, BadPaddingException {
         byte[] iv = getRandomNonce(IV_LENGTH);
-
         SecretKey secretKey = getSecretKey(keyMgmService.getTcKey());
+        log.warn("KeyBeing Used: {}", secretKey.toString());
 
         Cipher cipher = initCipher(Cipher.ENCRYPT_MODE, secretKey, iv);
         if (aad != null)
@@ -80,7 +80,7 @@ public SecretKey getSecretKey(String key)
     public byte[] decrypt(byte[] cipherContent) throws NoSuchAlgorithmException, InvalidKeySpecException, InvalidKeyException,
             InvalidAlgorithmParameterException, NoSuchPaddingException, IllegalBlockSizeException, BadPaddingException  {
         SecretKey secretKey = getSecretKey(keyMgmService.getTmKey());
-
+        log.warn("KeyBeing Used: {}", secretKey.toString());
         ByteBuffer bb = ByteBuffer.wrap(cipherContent);
 
         byte[] iv = new byte[IV_LENGTH];

diff --git a/yamcs-core/src/main/java/org/yamcs/security/encryption/aes/KeyManagementService.java b/yamcs-core/src/main/java/org/yamcs/security/encryption/aes/KeyManagementService.java
@@ -175,10 +175,12 @@ public String getPayloadKeyId(){
 
     public void setTcKeyId(String tcKeyId) {
         this.tcKeyId = tcKeyId;
+        this.tcKey = this.parser.getKeySections().get("TC Keys").get(config.getString("spacecraftIdSrs")+"_TC_"+tcKeyId).getKey();
     }
 
     public void setTmKeyId(String tmKeyId) {
         this.tmKeyId = tmKeyId;
+        this.tmKey = this.parser.getKeySections().get("TM Keys").get(config.getString("spacecraftIdSrs")+"_TM_"+tmKeyId).getKey();
     }
 
     public void setPayloadKeyId(String payloadKeyId){