Skip to content

Commit

Permalink
[INJICERT-657] update default JWT algo & remove unused code
Browse files Browse the repository at this point in the history
Signed-off-by: Harsh Vardhan <[email protected]>
  • Loading branch information
vharsh committed Jan 6, 2025
1 parent 6d16be5 commit d923fec
Showing 1 changed file with 2 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -601,10 +601,7 @@ public JWTSignatureResponseDto jwsSign(JWSSignatureRequestDto jwsSignRequestDto)
byte[] jwsSignData = SignatureUtil.buildSignData(jwsHeader, dataToSign);

SignatureProvider signatureProvider = SIGNATURE_PROVIDER.get(signAlgorithm);
if (Objects.isNull(signatureProvider)) {
signatureProvider = SIGNATURE_PROVIDER.get(SignatureConstant.JWS_PS256_SIGN_ALGO_CONST);
}


String signature = signatureProvider.sign(privateKey, jwsSignData, providerName);

StringBuilder signedData = new StringBuilder().append(jwsHeader.toBase64URL().toString())
Expand Down Expand Up @@ -654,7 +651,7 @@ public SignResponseDto signv2(SignRequestDtoV2 signatureReq) {
referenceId = signRefid;
}
String signAlgorithm = SignatureUtil.isDataValid(signatureReq.getSignAlgorithm()) ?
signatureReq.getSignAlgorithm(): SignatureConstant.ED25519_ALGORITHM;
signatureReq.getSignAlgorithm(): SignatureConstant.JWS_EDDSA_SIGN_ALGO_CONST;

SignatureCertificate certificateResponse = keymanagerService.getSignatureCertificate(applicationId,
Optional.of(referenceId), timestamp);
Expand All @@ -664,9 +661,6 @@ public SignResponseDto signv2(SignRequestDtoV2 signatureReq) {
certificateResponse.getCertificateEntry().getChain();
String providerName = certificateResponse.getProviderName();
SignatureProvider signatureProvider = SIGNATURE_PROVIDER.get(signAlgorithm);
if (Objects.isNull(signatureProvider)) {
signatureProvider = SIGNATURE_PROVIDER.get(SignatureConstant.JWS_PS256_SIGN_ALGO_CONST);
}
String signature = signatureProvider.sign(privateKey, dataToSign, providerName);
byte[] data = java.util.Base64.getUrlDecoder().decode(signature);
SignResponseDto signedData = new SignResponseDto();
Expand Down

0 comments on commit d923fec

Please sign in to comment.