Skip to content

Commit 7bd9c76

Browse files
f11ha-trzewik
andauthored
Fix Sonar Code Smells (#25)
* decode ec certificates * fix ec signature computation * junit for signing * sonar * Fix coverage exclusions * Remove Sonar Coverage exclusion properties * Refactoring * fix Sonar Code Smells * Checkstyle Co-authored-by: Artur T <a.trzewik@t-systems.com>
1 parent 5186b74 commit 7bd9c76

3 files changed

Lines changed: 10 additions & 9 deletions

File tree

src/main/java/eu/europa/ec/dgc/issuance/restapi/controller/CertController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public ResponseEntity<EgcDecodeResult> decodeEgCert(
145145

146146
try {
147147
oneKey = new OneKey(map);
148-
message = (Sign1Message) Sign1Message.DecodeFromBytes(cose);
148+
message = (Sign1Message) COSE.Message.DecodeFromBytes(cose);
149149
} catch (CoseException e) {
150150
throw new ResponseStatusException(HttpStatus.BAD_REQUEST);
151151
}
@@ -218,7 +218,7 @@ private CBORObject getEcCurve(ECPublicKey publicKey) {
218218
}
219219

220220
private CBORObject stripLeadingZero(BigInteger input) {
221-
val bytes = input.toByteArray();
221+
final byte[] bytes = input.toByteArray();
222222
byte[] stripped;
223223

224224
if (bytes.length % 8 != 0 && bytes[0] == 0x00) {

src/main/java/eu/europa/ec/dgc/issuance/service/impl/SigningServiceImpl.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package eu.europa.ec.dgc.issuance.service.impl;
22

33
import eu.europa.ec.dgc.issuance.service.SigningService;
4-
import java.io.IOException;
54
import java.math.BigInteger;
65
import java.security.PrivateKey;
76
import java.security.interfaces.RSAPrivateCrtKey;
@@ -29,7 +28,7 @@ public byte[] signHash(byte[] hashBytes, PrivateKey privateKey) {
2928
} else {
3029
signature = signEc(hashBytes, privateKey);
3130
}
32-
} catch (CryptoException | IOException e) {
31+
} catch (CryptoException e) {
3332
throw new IllegalArgumentException("error during signing ", e);
3433
}
3534
return signature;
@@ -50,7 +49,7 @@ private byte[] signRsapss(byte[] hashBytes, PrivateKey privateKey) throws Crypto
5049
return pssSigner.generateSignature();
5150
}
5251

53-
private byte[] signEc(byte[] hash, PrivateKey privateKey) throws IOException {
52+
private byte[] signEc(byte[] hash, PrivateKey privateKey) {
5453
java.security.interfaces.ECPrivateKey privKey = (java.security.interfaces.ECPrivateKey) privateKey;
5554
ECParameterSpec s = EC5Util.convertSpec(privKey.getParams());
5655
ECPrivateKeyParameters keyparam = new ECPrivateKeyParameters(

src/main/java/eu/europa/ec/dgc/issuance/utils/CborDumpService.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@
2828
@Service
2929
public class CborDumpService {
3030

31+
/**
32+
* Method to write a CBOR Array into a {@link Writer} (e.g. {@link java.io.StringWriter}).
33+
*
34+
* @param cb cbor Byte Array to write
35+
* @param writer destination
36+
*/
3137
public void dumpCbor(byte[] cb, Writer writer) throws IOException {
3238
CBORObject cborObject = CBORObject.DecodeFromBytes(cb);
33-
dumpCbor(cborObject, writer, 0);
34-
}
35-
36-
private void dumpCbor(CBORObject cborObject, Writer writer, int ident) throws IOException {
3739
writer
3840
.append("")
3941
.append(String.valueOf(cborObject));

0 commit comments

Comments
 (0)