Skip to content

Commit f096c18

Browse files
committed
Moved to Error Prone 2.50.0, removing the dangling and duplicated javadoc and the exposed private types it reports.
1 parent 8657df7 commit f096c18

26 files changed

Lines changed: 60 additions & 85 deletions

File tree

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ configure(subprojects.findAll {it.name != 'bom'}) {
263263
dependencies {
264264
checkstyle files("$rootDir/config/checkstyle/lib/methodchecker-1.0.0.jar")
265265
checkstyle 'com.puppycrawl.tools:checkstyle:9.0'
266-
errorprone "com.google.errorprone:error_prone_core:2.43.0"
266+
errorprone "com.google.errorprone:error_prone_core:2.50.0"
267267
}
268268

269269
checkstyle {

‎core/src/main/java/org/bouncycastle/asn1/bc/BCObjectIdentifiers.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public interface BCObjectIdentifiers
4545
*/
4646
ASN1ObjectIdentifier bc_pbe_sha224 = bc_pbe.branch("2.4");
4747

48-
/**
48+
/*
4949
* PKCS-5(1)|PKCS-12(2)
5050
*/
5151
/**
@@ -66,7 +66,7 @@ public interface BCObjectIdentifiers
6666
*/
6767
ASN1ObjectIdentifier bc_pbe_sha256_pkcs12 = bc_pbe_sha256.branch("2");
6868

69-
/**
69+
/*
7070
* AES(1) . (CBC-128(2)|CBC-192(22)|CBC-256(42))
7171
*/
7272
/**
@@ -331,7 +331,7 @@ public interface BCObjectIdentifiers
331331
/*
332332
* ML-DSA
333333
*/
334-
///** 2.16.840.1.101.3.4.3.17 OQS_OID_MLDSA44 */
334+
// /** 2.16.840.1.101.3.4.3.17 OQS_OID_MLDSA44 */
335335
/** 1.3.9999.7.5 OQS_OID_P256_MLDSA44 */
336336
ASN1ObjectIdentifier p256_mldsa44 = new ASN1ObjectIdentifier("1.3.9999.7.5");
337337
/** 1.3.9999.7.6 OQS_OID_RSA3072_MLDSA44 */
@@ -346,7 +346,7 @@ public interface BCObjectIdentifiers
346346
ASN1ObjectIdentifier mldsa44_p256 = new ASN1ObjectIdentifier("2.16.840.1.114027.80.8.1.4");
347347
/** 2.16.840.1.114027.80.8.1.5 OQS_OID_MLDSA44_bp256 */
348348
ASN1ObjectIdentifier mldsa44_bp256 = new ASN1ObjectIdentifier("2.16.840.1.114027.80.8.1.5");
349-
///** 2.16.840.1.101.3.4.3.18 OQS_OID_MLDSA65 */
349+
// /** 2.16.840.1.101.3.4.3.18 OQS_OID_MLDSA65 */
350350
/** 1.3.9999.7.7 OQS_OID_P384_MLDSA65 */
351351
ASN1ObjectIdentifier p384_mldsa65 = new ASN1ObjectIdentifier("1.3.9999.7.7");
352352
/** 2.16.840.1.114027.80.8.1.6 OQS_OID_MLDSA65_pss3072 */
@@ -359,7 +359,7 @@ public interface BCObjectIdentifiers
359359
ASN1ObjectIdentifier mldsa65_bp256 = new ASN1ObjectIdentifier("2.16.840.1.114027.80.8.1.9");
360360
/** 2.16.840.1.114027.80.8.1.10 OQS_OID_MLDSA65_ed25519 */
361361
ASN1ObjectIdentifier mldsa65_ed25519 = new ASN1ObjectIdentifier("2.16.840.1.114027.80.8.1.10");
362-
///** 2.16.840.1.101.3.4.3.19 OQS_OID_MLDSA87 */
362+
// /** 2.16.840.1.101.3.4.3.19 OQS_OID_MLDSA87 */
363363
/** 1.3.9999.7.8 OQS_OID_P521_MLDSA87 */
364364
ASN1ObjectIdentifier p521_mldsa87 = new ASN1ObjectIdentifier("1.3.9999.7.8");
365365
/** 2.16.840.1.114027.80.8.1.11 OQS_OID_MLDSA87_p384 */
@@ -644,7 +644,7 @@ public interface BCObjectIdentifiers
644644
ASN1ObjectIdentifier mayo3 = mayo_3;
645645
ASN1ObjectIdentifier mayo5 = mayo_5;
646646

647-
/**
647+
/*
648648
* cross
649649
*/
650650
// /** 1.3.6.1.4.1.62245.2.1.1.2 OQS_OID_CROSSRSDP128BALANCED */
@@ -680,9 +680,9 @@ public interface BCObjectIdentifiers
680680
// /** 1.3.6.1.4.1.62245.2.1.18.2 OQS_OID_CROSSRSDPG256SMALL */
681681
// ASN1ObjectIdentifier crossrsdpg_256small = new ASN1ObjectIdentifier("1.3.6.1.4.1.62245.2.1.18.2");
682682

683-
/**
683+
/*
684684
* OV
685-
* */
685+
*/
686686
// /** 1.3.9999.9.1.1 OQS_OID_OV_IS */
687687
// ASN1ObjectIdentifier ov_is = new ASN1ObjectIdentifier("1.3.9999.9.1.1");
688688
// /** 1.3.9999.9.1.2 OQS_OID_P256_OV_IS */

‎core/src/main/java/org/bouncycastle/asn1/x509/CertPolicyId.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,6 @@
55
import org.bouncycastle.asn1.ASN1Primitive;
66

77

8-
/**
9-
* CertPolicyId, used in the CertificatePolicies and PolicyMappings
10-
* X509V3 Extensions.
11-
*
12-
* <pre>
13-
* CertPolicyId ::= OBJECT IDENTIFIER
14-
* </pre>
15-
*/
168
/**
179
* CertPolicyId, used in the CertificatePolicies and PolicyMappings
1810
* X509V3 Extensions.

‎core/src/main/java/org/bouncycastle/crypto/agreement/owl/OwlServerRegistration.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,14 +140,6 @@ public OwlServerRegistration(
140140

141141
this.registrationState = REGISTRATION_NOT_CALLED;
142142
}
143-
/**
144-
* Initiates user registration with the server. Creates the registration payload {@link OwlInitialRegistration} and sends it to the server.
145-
* MUST be sent over a secure channel.
146-
* <p>
147-
* Must be called prior to {@link #registerUseronServer(OwlInitialRegistration)}
148-
* @throws IllegalStateException if this function is called more than once
149-
*/
150-
151143
/**
152144
* Receives the payload sent by the client as part of user registration, and stores necessary values in the server.
153145
* <p>

‎core/src/main/java/org/bouncycastle/crypto/agreement/owl/OwlUtil.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,7 @@ static BigInteger calculateX2s(
120120

121121

122122
/**
123-
* Calculate alpha or beta as done in the second pass.
124-
*/
125-
/**
126-
* Calculate the public key from a base point and a scalar
123+
* Calculate the public key from a base point and a scalar - alpha or beta as done in the second pass.
127124
* @param gA Base point
128125
* @param x2pi Scalar
129126
* @return [gA] * x2pi

‎core/src/main/java/org/bouncycastle/crypto/kems/frodo/FrodoKEMEngine.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ public void kem_dec(byte[] ss, byte[] ct, byte[] sk)
536536
// 4. mu' = Frodo.Decode(M)
537537
byte[] muprime = decode(M);
538538

539-
/// 5. Parse pk = seedA || b (done above)
539+
// 5. Parse pk = seedA || b (done above)
540540

541541
// 6. seedSE' || k' = SHAKE(pkh || mu' || salt, len_seedSE + len_k) (length in bits)
542542
// (salt is empty for eFrodoKEM)

‎core/src/main/java/org/bouncycastle/crypto/params/SLHDSAPrivateKeyParameters.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ private byte[] cloneWithCheck(byte[] fieldValue)
124124
return rv;
125125
}
126126

127-
private static class PK
127+
static class PK
128128
{
129129
final byte[] seed;
130130
final byte[] root;
@@ -136,7 +136,7 @@ private static class PK
136136
}
137137
}
138138

139-
private static class SK
139+
static class SK
140140
{
141141
final byte[] seed;
142142
final byte[] prf;

‎core/src/main/java/org/bouncycastle/crypto/util/PrivateKeyFactory.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -459,10 +459,6 @@ else if (params.isImplicitlyCA())
459459
}
460460
}
461461

462-
/**
463-
* So it seems for the new PQC algorithms, there's a couple of approaches to what goes in the OCTET STRING
464-
*/
465-
466462
/**
467463
* So it seems for the new PQC algorithms, there's a couple of approaches to what goes in the OCTET STRING
468464
* and in this case there may also be SEQUENCE.

‎core/src/main/java/org/bouncycastle/crypto/util/PublicKeyFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ public static AsymmetricKeyParameter createKey(SubjectPublicKeyInfo keyInfo, Obj
262262
return converter.getPublicKeyParameters(keyInfo, defaultParams);
263263
}
264264

265-
private static abstract class SubjectPublicKeyInfoConverter
265+
static abstract class SubjectPublicKeyInfoConverter
266266
{
267267
abstract AsymmetricKeyParameter getPublicKeyParameters(SubjectPublicKeyInfo keyInfo, Object defaultParams)
268268
throws IOException;

‎core/src/main/java/org/bouncycastle/pqc/crypto/lms/LMSPrivateKeyParameters.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -570,12 +570,6 @@ void primeTreeCache(byte[][] cachedT)
570570
}
571571
}
572572

573-
/**
574-
* Return true if the top of the Merkle tree is present in the node cache - either because
575-
* this key has been used/queried, or because it was decoded from the optional trailing data in
576-
* a version 0 encoding (see getEncoded). Used by the regression tests that verify tree-cache
577-
* persistence.
578-
*/
579573
/**
580574
* The root node if it is already in the cache, otherwise null. Unlike getPublicKey() this never
581575
* computes it, so a caller can cross-check the root against an authoritative public key without
@@ -589,6 +583,12 @@ byte[] peekRootT()
589583
}
590584
}
591585

586+
/**
587+
* Return true if the top of the Merkle tree is present in the node cache - either because
588+
* this key has been used/queried, or because it was decoded from the optional trailing data in
589+
* a version 0 encoding (see getEncoded). Used by the regression tests that verify tree-cache
590+
* persistence.
591+
*/
592592
boolean isTreeCachePrimed()
593593
{
594594
synchronized (tCache)

0 commit comments

Comments
 (0)