Skip to content

Fix unwrapping #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivanovmasa merged 1 commit into from
Oct 2, 2025
Merged

Fix unwrapping #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion MiniKms/src/main/java/ftn/security/minikms/service/KeyComputeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package ftn.security.minikms.service;

import ftn.security.minikms.entity.KeyMaterial;
import ftn.security.minikms.enumeration.KeyType;
import ftn.security.minikms.repository.KeyMetadataRepository;
import ftn.security.minikms.repository.WrappedKeyRepository;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -75,7 +76,20 @@ public KeyMaterial getKey(UUID keyId, Integer version) {
var wrappedKey = keyRepository.findByMetadataIdAndVersion(keyId, version)
.orElseThrow(() -> new InvalidParameterException("Key with given id and version does not exist"));

return wrappedKey.getWrappedMaterial();
if (metadata.getKeyType().equals(KeyType.HMAC))
return wrappedKey.getWrappedMaterial();
try {
byte[] unwrappedKey = rootKeyManager.unwrap(
wrappedKey.getWrappedMaterial().getKey(), keyId, version
);

KeyMaterial material = new KeyMaterial();
material.setKey(unwrappedKey);
material.setPublicKey(wrappedKey.getWrappedMaterial().getPublicKey());
return material;
} catch (GeneralSecurityException e) {
throw new RuntimeException("Failed to unwrap key material", e);
}
}

public KeyMaterial getKeySig(UUID keyId, Integer version) {
Expand Down
Loading