Egothor/ZeroEcho
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

chore: deps upgrade

Browse Source 
chore: PMD 8.0.0 obsolete rules replaced

Signed-off-by: Leo Galambos <lg@hq.egothor.org>
This commit is contained in:
Leo Galambos
2025-12-24 22:33:00 +01:00
parent 0b4b4de603
commit cb363ba2f4
13 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.ruleset
View File

@@ -136,7 +136,7 @@
<rule ref="category/java/codestyle.xml/UnnecessaryConstructor"/> <rule ref="category/java/codestyle.xml/UnnecessaryConstructor"/>
<rule ref="category/java/codestyle.xml/UnnecessaryFullyQualifiedName"/> <rule ref="category/java/codestyle.xml/UnnecessaryFullyQualifiedName"/>
<rule ref="category/java/codestyle.xml/UnnecessaryImport"/> <rule ref="category/java/codestyle.xml/UnnecessaryImport"/>
<rule ref="category/java/codestyle.xml/UnnecessaryLocalBeforeReturn"/> <!-- PMD 8.0.0: obsolete rule ref="category/java/codestyle.xml/UnnecessaryLocalBeforeReturn"/ -->
<rule ref="category/java/codestyle.xml/UnnecessaryModifier"/> <rule ref="category/java/codestyle.xml/UnnecessaryModifier"/>
<rule ref="category/java/codestyle.xml/UnnecessaryReturn"/> <rule ref="category/java/codestyle.xml/UnnecessaryReturn"/>
<rule ref="category/java/codestyle.xml/UnnecessarySemicolon"/> <rule ref="category/java/codestyle.xml/UnnecessarySemicolon"/>
@@ -147,7 +147,6 @@
<rule ref="category/java/codestyle.xml/UseShortArrayInitializer"/> <rule ref="category/java/codestyle.xml/UseShortArrayInitializer"/>
<rule ref="category/java/codestyle.xml/UseUnderscoresInNumericLiterals"/> <rule ref="category/java/codestyle.xml/UseUnderscoresInNumericLiterals"/>
<rule ref="category/java/design.xml/AbstractClassWithoutAnyMethod"/> <rule ref="category/java/design.xml/AbstractClassWithoutAnyMethod"/>
<rule ref="category/java/design.xml/AvoidCatchingGenericException"/>
<rule ref="category/java/design.xml/AvoidDeeplyNestedIfStmts"/> <rule ref="category/java/design.xml/AvoidDeeplyNestedIfStmts"/>
<rule ref="category/java/design.xml/AvoidRethrowingException"/> <rule ref="category/java/design.xml/AvoidRethrowingException"/>
<rule ref="category/java/design.xml/AvoidThrowingNewInstanceOfSameException"/> <rule ref="category/java/design.xml/AvoidThrowingNewInstanceOfSameException"/>
@@ -231,8 +230,11 @@
<rule ref="category/java/errorprone.xml/AvoidAssertAsIdentifier"/> <rule ref="category/java/errorprone.xml/AvoidAssertAsIdentifier"/>
<rule ref="category/java/errorprone.xml/AvoidBranchingStatementAsLastInLoop"/> <rule ref="category/java/errorprone.xml/AvoidBranchingStatementAsLastInLoop"/>
<rule ref="category/java/errorprone.xml/AvoidCallingFinalize"/> <rule ref="category/java/errorprone.xml/AvoidCallingFinalize"/>
<rule ref="category/java/errorprone.xml/AvoidCatchingNPE"/> <rule ref="category/java/errorprone.xml/AvoidCatchingGenericException">
<rule ref="category/java/errorprone.xml/AvoidCatchingThrowable"/> <properties>
<property name="typesThatShouldNotBeCaught" value="java.lang.RuntimeException,java.lang.Throwable,java.lang.Error" />
</properties>
</rule>
<rule ref="category/java/errorprone.xml/AvoidDecimalLiteralsInBigDecimalConstructor"/> <rule ref="category/java/errorprone.xml/AvoidDecimalLiteralsInBigDecimalConstructor"/>
<rule ref="category/java/errorprone.xml/AvoidDuplicateLiterals"> <rule ref="category/java/errorprone.xml/AvoidDuplicateLiterals">
<properties> <properties>
@@ -245,7 +247,6 @@
<rule ref="category/java/errorprone.xml/AvoidFieldNameMatchingTypeName"/> <rule ref="category/java/errorprone.xml/AvoidFieldNameMatchingTypeName"/>
<rule ref="category/java/errorprone.xml/AvoidInstanceofChecksInCatchClause"/> <rule ref="category/java/errorprone.xml/AvoidInstanceofChecksInCatchClause"/>
<rule ref="category/java/errorprone.xml/AvoidLiteralsInIfCondition"/> <rule ref="category/java/errorprone.xml/AvoidLiteralsInIfCondition"/>
<rule ref="category/java/errorprone.xml/AvoidLosingExceptionInformation"/>
<rule ref="category/java/errorprone.xml/AvoidMultipleUnaryOperators"/> <rule ref="category/java/errorprone.xml/AvoidMultipleUnaryOperators"/>
<rule ref="category/java/errorprone.xml/AvoidUsingOctalValues"/> <rule ref="category/java/errorprone.xml/AvoidUsingOctalValues"/>
<rule ref="category/java/errorprone.xml/BrokenNullCheck"/> <rule ref="category/java/errorprone.xml/BrokenNullCheck"/>
@@ -313,7 +314,7 @@
<rule ref="category/java/errorprone.xml/UnusedNullCheckInEquals"/> <rule ref="category/java/errorprone.xml/UnusedNullCheckInEquals"/>
<rule ref="category/java/errorprone.xml/UseCorrectExceptionLogging"/> <rule ref="category/java/errorprone.xml/UseCorrectExceptionLogging"/>
<rule ref="category/java/errorprone.xml/UseEqualsToCompareStrings"/> <rule ref="category/java/errorprone.xml/UseEqualsToCompareStrings"/>
<rule ref="category/java/errorprone.xml/UselessOperationOnImmutable"/> <rule ref="category/java/errorprone.xml/UselessPureMethodCall" />
<rule ref="category/java/errorprone.xml/UseLocaleWithCaseConversions"/> <rule ref="category/java/errorprone.xml/UseLocaleWithCaseConversions"/>
<rule ref="category/java/errorprone.xml/UseProperClassLoader"/> <rule ref="category/java/errorprone.xml/UseProperClassLoader"/>
<rule ref="category/java/multithreading.xml/AvoidSynchronizedAtMethodLevel"/> <rule ref="category/java/multithreading.xml/AvoidSynchronizedAtMethodLevel"/>

8
buildSrc/src/main/groovy/buildlogic.java-common-conventions.gradle
View File

@@ -30,9 +30,9 @@ repositories {
dependencies { dependencies {
constraints { constraints {
// Define dependency versions as constraints // Define dependency versions as constraints
implementation 'org.apache.commons:commons-text:1.11.0' implementation 'org.apache.commons:commons-text:1.15.0'
implementation 'commons-cli:commons-cli:1.9.0' implementation 'commons-cli:commons-cli:1.11.0'
implementation 'org.bouncycastle:bcpkix-jdk18on:1.81' implementation 'org.bouncycastle:bcpkix-jdk18on:1.83'
implementation 'org.egothor:conflux:[1.0,2.0)' implementation 'org.egothor:conflux:[1.0,2.0)'
implementation 'org.apache.commons:commons-imaging:1.0.0-alpha6' implementation 'org.apache.commons:commons-imaging:1.0.0-alpha6'
} }
@@ -45,7 +45,7 @@ dependencies {
pmd { pmd {
consoleOutput = true consoleOutput = true
toolVersion = '7.16.0' toolVersion = '7.19.0'
sourceSets = [sourceSets.main] sourceSets = [sourceSets.main]
ruleSetFiles = files(rootProject.file(".ruleset")) ruleSetFiles = files(rootProject.file(".ruleset"))
} }

2
lib/src/main/java/zeroecho/core/CryptoAlgorithms.java
View File

@@ -518,7 +518,7 @@ public final class CryptoAlgorithms {
destroyed = true; destroyed = true;
} }
} }
} catch (Exception ignored) { // NOPMD } catch (Exception ignored) {
// swallow and report via audit only if destroyed // swallow and report via audit only if destroyed
} }
if (destroyed) { if (destroyed) {

2
lib/src/main/java/zeroecho/core/alg/bike/BikeKemContext.java
View File

@@ -186,7 +186,7 @@ public final class BikeKemContext implements KemContext {
.createKey(key.getEncoded()); .createKey(key.getEncoded());
BIKEKEMExtractor ex = new BIKEKEMExtractor(keyParam); BIKEKEMExtractor ex = new BIKEKEMExtractor(keyParam);
return ex.extractSecret(ciphertext); return ex.extractSecret(ciphertext);
} catch (Exception e) { // NOPMD } catch (Exception e) {
throw new IOException("BIKE decapsulate failed", e); throw new IOException("BIKE decapsulate failed", e);
} }
} }

2
lib/src/main/java/zeroecho/core/alg/cmce/CmceKemContext.java
View File

@@ -219,7 +219,7 @@ public final class CmceKemContext implements KemContext {
.createKey(key.getEncoded()); .createKey(key.getEncoded());
CMCEKEMExtractor ex = new CMCEKEMExtractor(keyParam); CMCEKEMExtractor ex = new CMCEKEMExtractor(keyParam);
return ex.extractSecret(ciphertext); return ex.extractSecret(ciphertext);
} catch (Exception e) { // NOPMD } catch (Exception e) {
throw new IOException("CMCE decapsulate failed", e); throw new IOException("CMCE decapsulate failed", e);
} }
} }

2
lib/src/main/java/zeroecho/core/alg/frodo/FrodoKemContext.java
View File

@@ -212,7 +212,7 @@ public final class FrodoKemContext implements KemContext {
.createKey(key.getEncoded()); .createKey(key.getEncoded());
FrodoKEMExtractor ex = new FrodoKEMExtractor(keyParam); FrodoKEMExtractor ex = new FrodoKEMExtractor(keyParam);
return ex.extractSecret(ciphertext); return ex.extractSecret(ciphertext);
} catch (Exception e) { // NOPMD } catch (Exception e) {
throw new IOException("Frodo decapsulate failed", e); throw new IOException("Frodo decapsulate failed", e);
} }
} }

2
lib/src/main/java/zeroecho/core/alg/hqc/HqcKemContext.java
View File

@@ -213,7 +213,7 @@ public final class HqcKemContext implements KemContext {
.createKey(key.getEncoded()); .createKey(key.getEncoded());
HQCKEMExtractor ex = new HQCKEMExtractor(keyParam); HQCKEMExtractor ex = new HQCKEMExtractor(keyParam);
return ex.extractSecret(ciphertext); return ex.extractSecret(ciphertext);
} catch (Exception e) { // NOPMD } catch (Exception e) {
throw new IOException("HQC decapsulate failed", e); throw new IOException("HQC decapsulate failed", e);
} }
} }

2
lib/src/main/java/zeroecho/core/alg/kyber/KyberKemContext.java
View File

@@ -220,7 +220,7 @@ public final class KyberKemContext implements KemContext {
MLKEMExtractor gen = new MLKEMExtractor(keyParam); MLKEMExtractor gen = new MLKEMExtractor(keyParam);
return gen.extractSecret(ciphertext); return gen.extractSecret(ciphertext);
} catch (Exception e) { // NOPMD } catch (Exception e) {
throw new IOException("Kyber decapsulate failed", e); throw new IOException("Kyber decapsulate failed", e);
} }
} }

2
lib/src/main/java/zeroecho/core/alg/ntru/NtruKemContext.java
View File

@@ -250,7 +250,7 @@ public final class NtruKemContext implements KemContext {
.createKey(key.getEncoded()); .createKey(key.getEncoded());
NTRUKEMExtractor ex = new NTRUKEMExtractor(keyParam); NTRUKEMExtractor ex = new NTRUKEMExtractor(keyParam);
return ex.extractSecret(ciphertext); return ex.extractSecret(ciphertext);
} catch (Exception e) { // NOPMD } catch (Exception e) {
throw new IOException("NTRU decapsulate failed", e); throw new IOException("NTRU decapsulate failed", e);
} }
} }

2
lib/src/main/java/zeroecho/core/alg/ntruprime/NtrulPrimeKemContext.java
View File

@@ -212,7 +212,7 @@ public final class NtrulPrimeKemContext implements KemContext {
.createKey(key.getEncoded()); .createKey(key.getEncoded());
NTRULPRimeKEMExtractor ex = new NTRULPRimeKEMExtractor(keyParam); NTRULPRimeKEMExtractor ex = new NTRULPRimeKEMExtractor(keyParam);
return ex.extractSecret(ciphertext); return ex.extractSecret(ciphertext);
} catch (Exception e) { // NOPMD } catch (Exception e) {
throw new IOException("NTRULPRime decapsulate failed", e); throw new IOException("NTRULPRime decapsulate failed", e);
} }
} }

2
lib/src/main/java/zeroecho/core/alg/ntruprime/SntruPrimeKemContext.java
View File

@@ -218,7 +218,7 @@ public final class SntruPrimeKemContext implements KemContext {
.createKey(key.getEncoded()); .createKey(key.getEncoded());
SNTRUPrimeKEMExtractor ex = new SNTRUPrimeKEMExtractor(keyParam); SNTRUPrimeKEMExtractor ex = new SNTRUPrimeKEMExtractor(keyParam);
return ex.extractSecret(ciphertext); return ex.extractSecret(ciphertext);
} catch (Exception e) { // NOPMD } catch (Exception e) {
throw new IOException("SNTRUPrime decapsulate failed", e); throw new IOException("SNTRUPrime decapsulate failed", e);
} }
} }

2
lib/src/main/java/zeroecho/core/alg/saber/SaberKemContext.java
View File

@@ -217,7 +217,7 @@ public final class SaberKemContext implements KemContext {
.createKey(key.getEncoded()); .createKey(key.getEncoded());
SABERKEMExtractor ex = new SABERKEMExtractor(keyParam); SABERKEMExtractor ex = new SABERKEMExtractor(keyParam);
return ex.extractSecret(ciphertext); return ex.extractSecret(ciphertext);
} catch (Exception e) { // NOPMD } catch (Exception e) {
throw new IOException("SABER decapsulate failed", e); throw new IOException("SABER decapsulate failed", e);
} }
} }

2
lib/src/main/java/zeroecho/core/io/SmartContinuousBlockStream.java
View File

@@ -166,7 +166,7 @@ final class SmartContinuousBlockStream extends AbstractChunkTransformInputStream
out = outBuf = Arrays.copyOf(outBuf, outOff + finBlockSize); // NOPMD out = outBuf = Arrays.copyOf(outBuf, outOff + finBlockSize); // NOPMD
} }
int written = cipher.doFinal(in, inOff, len, out, outOff); // NOPMD int written = cipher.doFinal(in, inOff, len, out, outOff);
return written; return written;
// return cipher.doFinal(in, inOff, len, out, outOff); // return cipher.doFinal(in, inOff, len, out, outOff);