Skip to content

Commit dc0b671

Browse files
committed
Merge branch 'main' of gitlab.cryptoworkshop.com:root/bc-java
2 parents 170d9f0 + 285eb80 commit dc0b671

115 files changed

Lines changed: 66 additions & 8867 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

core/src/main/java/org/bouncycastle/asn1/ASN1BitString.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ public static ASN1BitString getTagged(ASN1TaggedObject taggedObject, boolean dec
8080
*
8181
* @deprecated Will be removed
8282
*/
83+
@Deprecated
8384
static protected int getPadBits(int bitString)
8485
{
8586
int val = 0;
@@ -130,6 +131,7 @@ static protected int getPadBits(int bitString)
130131
*
131132
* @deprecated Will be removed
132133
*/
134+
@Deprecated
133135
static protected byte[] getBytes(int bitString)
134136
{
135137
if (bitString == 0)

core/src/main/java/org/bouncycastle/asn1/ASN1InputStream.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ protected int getLimit()
122122
/**
123123
* @deprecated No longer used; will be removed
124124
*/
125+
@Deprecated
125126
protected int readLength()
126127
throws IOException
127128
{
@@ -136,6 +137,7 @@ protected int readLength()
136137
/**
137138
* @deprecated No longer used; will be removed
138139
*/
140+
@Deprecated
139141
protected void readFully(
140142
byte[] bytes)
141143
throws IOException

core/src/main/java/org/bouncycastle/asn1/DERExternal.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public DERExternal(ASN1EncodableVector vector)
5050
*
5151
* @deprecated Use {@link #fromSequence(ASN1Sequence)} instead.
5252
*/
53+
@Deprecated
5354
public DERExternal(DERSequence sequence)
5455
{
5556
super(sequence);

core/src/main/java/org/bouncycastle/asn1/DLExternal.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public DLExternal(ASN1EncodableVector vector)
5050
*
5151
* @deprecated Use {@link #fromSequence(ASN1Sequence)} instead.
5252
*/
53+
@Deprecated
5354
public DLExternal(DLSequence sequence)
5455
{
5556
super(sequence);

core/src/main/java/org/bouncycastle/asn1/x500/X500Name.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public X500Name(X500NameStyle style, X500Name name)
5151
/**
5252
* Return a X500Name based on the passed in tagged object.
5353
*
54-
* @param obj tag object holding name.
55-
* @param explicit true if explicitly tagged false otherwise.
54+
* @param taggedObject tag object holding name.
55+
* @param declaredExplicit true if explicitly tagged false otherwise.
5656
* @return the X500Name
5757
*/
5858
public static X500Name getInstance(ASN1TaggedObject taggedObject, boolean declaredExplicit)

core/src/main/java/org/bouncycastle/asn1/x509/X509Extension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public class X509Extension
160160
public static final ASN1ObjectIdentifier auditIdentity = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.1.4");
161161

162162
/**
163-
* <a href="https://davidben.github.io/merkle-tree-certs/draft-ietf-plants-merkle-tree-certs.html>Merkle Tree Certificates</a>
163+
* <a href="https://davidben.github.io/merkle-tree-certs/draft-ietf-plants-merkle-tree-certs.html">Merkle Tree Certificates</a>
164164
* 1.3.6.1.5.5.7.25.TBD
165165
* */
166166
public static final ASN1ObjectIdentifier id_rdna_trustAnchorID = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.25");

core/src/main/java/org/bouncycastle/crypto/engines/Salsa20Engine.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ protected void packTauOrSigma(int keyLength, int[] state, int stateOffset)
3636
}
3737

3838
/** @deprecated */
39+
@Deprecated
3940
protected final static byte[]
4041
sigma = Strings.toByteArray("expand 32-byte k"),
4142
tau = Strings.toByteArray("expand 16-byte k");
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/**
22
* ML-KEM (FIPS 203) bindings of the lightweight KEM API
33
* ({@link org.bouncycastle.crypto.EncapsulatedSecretGenerator} /
4-
* {@link org.bouncycastle.crypto.EncapsulatedSecretExtractor}) sitting on top of the
5-
* {@link org.bouncycastle.pqc.crypto.mlkem} primitives.
4+
* {@link org.bouncycastle.crypto.EncapsulatedSecretExtractor}), backing
5+
* {@link org.bouncycastle.crypto.kems.MLKEMGenerator} and
6+
* {@link org.bouncycastle.crypto.kems.MLKEMExtractor}.
67
*/
78
package org.bouncycastle.crypto.kems.mlkem;
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/**
2-
* ML-DSA (FIPS 204) bindings of the lightweight signer API. Wraps the primitives in
3-
* {@link org.bouncycastle.pqc.crypto.mldsa} as {@link org.bouncycastle.crypto.Signer} /
4-
* {@link org.bouncycastle.crypto.StatefulSigner} implementations.
2+
* Internal ML-DSA (FIPS 204) engine backing {@link org.bouncycastle.crypto.signers.MLDSASigner}
3+
* and {@link org.bouncycastle.crypto.signers.HashMLDSASigner}.
54
*/
65
package org.bouncycastle.crypto.signers.mldsa;
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/**
2-
* SLH-DSA (FIPS 205) bindings of the lightweight signer API. Wraps the primitives in
3-
* {@link org.bouncycastle.pqc.crypto.slhdsa} as {@link org.bouncycastle.crypto.Signer}
4-
* implementations.
2+
* Internal SLH-DSA (FIPS 205) engine backing {@link org.bouncycastle.crypto.signers.SLHDSASigner}
3+
* and {@link org.bouncycastle.crypto.signers.HashSLHDSASigner}.
54
*/
65
package org.bouncycastle.crypto.signers.slhdsa;

0 commit comments

Comments
 (0)