Added use of @deprecated. Relates to github #2026

dghgit · dghgit · commit 8cef288fa0a7 · 2025-08-13T22:27:19.000+10:00
diff --git a/tls/src/main/java/org/bouncycastle/tls/AbstractTlsServer.java b/tls/src/main/java/org/bouncycastle/tls/AbstractTlsServer.java
@@ -68,6 +68,7 @@ protected boolean allowTrustedCAIndication()
     }
 
     /** @deprecated Use 'serverExtensions' directly, it is now never null */
+    @Deprecated
     protected Hashtable checkServerExtensions()
     {
         return serverExtensions;
diff --git a/tls/src/main/java/org/bouncycastle/tls/Certificate.java b/tls/src/main/java/org/bouncycastle/tls/Certificate.java
@@ -245,6 +245,7 @@ public void encode(TlsContext context, OutputStream messageOutput, OutputStream
      * @throws IOException
      * @deprecated Use version taking a {@link ParseOptions} argument instead. 
      */
+    @Deprecated
     public static Certificate parse(TlsContext context, InputStream messageInput, OutputStream endPointHashOutput)
         throws IOException
     {
diff --git a/tls/src/main/java/org/bouncycastle/tls/ClientHello.java b/tls/src/main/java/org/bouncycastle/tls/ClientHello.java
@@ -44,6 +44,7 @@ public int[] getCipherSuites()
     /**
      * @deprecated Use {@link #getVersion()} instead.
      */
+    @Deprecated
     public ProtocolVersion getClientVersion()
     {
         return version;
diff --git a/tls/src/main/java/org/bouncycastle/tls/NamedGroup.java b/tls/src/main/java/org/bouncycastle/tls/NamedGroup.java
@@ -103,10 +103,13 @@ public class NamedGroup
     public static final int arbitrary_explicit_char2_curves = 0xFF02;
 
     /** @deprecated Experimental API (unstable): unofficial value from Open Quantum Safe project. */
+    @Deprecated
     public static final int OQS_mlkem512 = 0x0247;
     /** @deprecated Experimental API (unstable): unofficial value from Open Quantum Safe project. */
+    @Deprecated
     public static final int OQS_mlkem768 = 0x0248;
     /** @deprecated Experimental API (unstable): unofficial value from Open Quantum Safe project. */
+    @Deprecated
     public static final int OQS_mlkem1024 = 0x0249;
 
     /*
diff --git a/tls/src/main/java/org/bouncycastle/tls/RecordPreview.java b/tls/src/main/java/org/bouncycastle/tls/RecordPreview.java
@@ -22,6 +22,7 @@ static RecordPreview extendRecordSize(RecordPreview a, int recordSize)
     }
 
     /** @deprecated Use {@link #getContentLimit} instead */
+    @Deprecated
     public int getApplicationDataLimit()
     {
         return contentLimit;
diff --git a/tls/src/main/java/org/bouncycastle/tls/SecurityParameters.java b/tls/src/main/java/org/bouncycastle/tls/SecurityParameters.java
@@ -177,6 +177,7 @@ public int[] getServerSupportedGroups()
      * 
      * @deprecated Will be removed. Use constant CompressionMethod._null instead.
      */
+    @Deprecated
     public short getCompressionAlgorithm()
     {
         return CompressionMethod._null;
@@ -193,6 +194,7 @@ public short getMaxFragmentLength()
     /**
      * @deprecated Use {@link #getPRFAlgorithm()} instead.
      */
+    @Deprecated
     public int getPrfAlgorithm()
     {
         return prfAlgorithm;
diff --git a/tls/src/main/java/org/bouncycastle/tls/SignatureScheme.java b/tls/src/main/java/org/bouncycastle/tls/SignatureScheme.java
@@ -195,6 +195,7 @@ public static int getNamedGroup(int signatureScheme)
     }
 
     /** @deprecated Use {@link #getCryptoHashAlgorithm(int)} instead. */
+    @Deprecated
     public static int getRSAPSSCryptoHashAlgorithm(int signatureScheme)
     {
         switch (signatureScheme)
diff --git a/tls/src/main/java/org/bouncycastle/tls/TlsExtensionsUtils.java b/tls/src/main/java/org/bouncycastle/tls/TlsExtensionsUtils.java
@@ -325,6 +325,7 @@ public static short getClientCertificateTypeExtensionServer(Hashtable extensions
     /**
      * @deprecated Use version without defaultValue instead
      */
+    @Deprecated
     public static short getClientCertificateTypeExtensionServer(Hashtable extensions, short defaultValue)
         throws IOException
     {
@@ -452,6 +453,7 @@ public static short getServerCertificateTypeExtensionServer(Hashtable extensions
     /**
      * @deprecated Use version without defaultValue instead
      */
+    @Deprecated
     public static short getServerCertificateTypeExtensionServer(Hashtable extensions, short defaultValue)
         throws IOException
     {
diff --git a/tls/src/main/java/org/bouncycastle/tls/TlsPeer.java b/tls/src/main/java/org/bouncycastle/tls/TlsPeer.java
@@ -92,6 +92,7 @@ public interface TlsPeer
      *             {@link TlsUtils#checkPeerSigAlgs(TlsContext, TlsCertificate[])} once a complete
      *             CertPath has been determined (i.e. as part of chain validation).
      */
+    @Deprecated
     boolean shouldCheckSigAlgOfPeerCerts();
 
     boolean shouldUseExtendedMasterSecret();
diff --git a/tls/src/main/java/org/bouncycastle/tls/TlsProtocol.java b/tls/src/main/java/org/bouncycastle/tls/TlsProtocol.java
@@ -1942,6 +1942,7 @@ public boolean isHandshaking()
     /**
      * @deprecated Will be removed.
      */
+    @Deprecated
     protected short processMaxFragmentLengthExtension(Hashtable clientExtensions, Hashtable serverExtensions,
         short alertDescription)
         throws IOException
diff --git a/tls/src/main/java/org/bouncycastle/tls/TlsUtils.java b/tls/src/main/java/org/bouncycastle/tls/TlsUtils.java
@@ -1094,6 +1094,7 @@ public static ASN1Primitive readASN1Object(byte[] encoding) throws IOException
     }
 
     /** @deprecated Will be removed. Use readASN1Object in combination with requireDEREncoding instead */
+    @Deprecated
     public static ASN1Primitive readDERObject(byte[] encoding) throws IOException
     {
         /*
@@ -1244,6 +1245,7 @@ public static Vector getSupportedSignatureAlgorithms(TlsContext context, Vector
     /**
      * @deprecated Will be removed
      */
+    @Deprecated
     public static SignatureAndHashAlgorithm getSignatureAndHashAlgorithm(TlsContext context,
         TlsCredentialedSigner signerCredentials)
         throws IOException
@@ -1598,6 +1600,7 @@ public static TlsSecret PRF(SecurityParameters securityParameters, TlsSecret sec
     /**
      * @deprecated Use {@link #PRF(SecurityParameters, TlsSecret, String, byte[], int)} instead.
      */
+    @Deprecated
     public static TlsSecret PRF(TlsContext context, TlsSecret secret, String asciiLabel, byte[] seed, int length)
     {
         return PRF(context.getSecurityParametersHandshake(), secret, asciiLabel, seed, length);
@@ -4086,6 +4089,7 @@ public static boolean isValidCipherSuiteForSignatureAlgorithms(int cipherSuite,
     /**
      * @deprecated Use {@link #isValidVersionForCipherSuite(int, ProtocolVersion)} instead.
      */
+    @Deprecated
     public static boolean isValidCipherSuiteForVersion(int cipherSuite, ProtocolVersion version)
     {
         return isValidVersionForCipherSuite(cipherSuite, version);
@@ -4330,6 +4334,7 @@ public static int[] getSupportedCipherSuites(TlsCrypto crypto, int[] suites)
     /**
      * @deprecated Use {@link #getSupportedCipherSuites(TlsCrypto, int[], int, int)} instead.
      */
+    @Deprecated
     public static int[] getSupportedCipherSuites(TlsCrypto crypto, int[] suites, int suitesCount)
     {
         return getSupportedCipherSuites(crypto, suites, 0, suitesCount);
diff --git a/tls/src/main/java/org/bouncycastle/tls/crypto/impl/TlsAEADCipher.java b/tls/src/main/java/org/bouncycastle/tls/crypto/impl/TlsAEADCipher.java
@@ -47,7 +47,8 @@ public final class TlsAEADCipher
     private final int nonceMode;
     private final AEADNonceGenerator nonceGenerator;
 
-    /** @deprecated Use version with extra 'nonceGeneratorFactory' parameter */ 
+    /** @deprecated Use version with extra 'nonceGeneratorFactory' parameter */
+    @Deprecated
     public TlsAEADCipher(TlsCryptoParameters cryptoParams, TlsAEADCipherImpl encryptCipher,
         TlsAEADCipherImpl decryptCipher, int keySize, int macSize, int aeadType) throws IOException
     {
diff --git a/tls/src/main/java/org/bouncycastle/tls/crypto/impl/jcajce/JcaTlsRSASigner.java b/tls/src/main/java/org/bouncycastle/tls/crypto/impl/jcajce/JcaTlsRSASigner.java
@@ -32,6 +32,7 @@ public class JcaTlsRSASigner
     /**
      * @deprecated Use constructor without 'publicKey' parameter.
      */
+    @Deprecated
     public JcaTlsRSASigner(JcaTlsCrypto crypto, PrivateKey privateKey, PublicKey publicKey)
     {
         this(crypto, privateKey);

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ protected boolean allowTrustedCAIndication()`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`/** @deprecated Use 'serverExtensions' directly, it is now never null */`
	`71`	`+ @Deprecated`
`71`	`72`	`protected Hashtable checkServerExtensions()`
`72`	`73`	`{`
`73`	`74`	`return serverExtensions;`
Original file line number	Diff line number	Diff line change
`@@ -245,6 +245,7 @@ public void encode(TlsContext context, OutputStream messageOutput, OutputStream`
`245`	`245`	`* @throws IOException`
`246`	`246`	`* @deprecated Use version taking a {@link ParseOptions} argument instead.`
`247`	`247`	`*/`
	`248`	`+ @Deprecated`
`248`	`249`	`public static Certificate parse(TlsContext context, InputStream messageInput, OutputStream endPointHashOutput)`
`249`	`250`	`throws IOException`
`250`	`251`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ public int[] getCipherSuites()`
`44`	`44`	`/**`
`45`	`45`	`* @deprecated Use {@link #getVersion()} instead.`
`46`	`46`	`*/`
	`47`	`+ @Deprecated`
`47`	`48`	`public ProtocolVersion getClientVersion()`
`48`	`49`	`{`
`49`	`50`	`return version;`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ static RecordPreview extendRecordSize(RecordPreview a, int recordSize)`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`/** @deprecated Use {@link #getContentLimit} instead */`
	`25`	`+ @Deprecated`
`25`	`26`	`public int getApplicationDataLimit()`
`26`	`27`	`{`
`27`	`28`	`return contentLimit;`
Original file line number	Diff line number	Diff line change
`@@ -177,6 +177,7 @@ public int[] getServerSupportedGroups()`
`177`	`177`	`*`
`178`	`178`	`* @deprecated Will be removed. Use constant CompressionMethod._null instead.`
`179`	`179`	`*/`
	`180`	`+ @Deprecated`
`180`	`181`	`public short getCompressionAlgorithm()`
`181`	`182`	`{`
`182`	`183`	`return CompressionMethod._null;`
`@@ -193,6 +194,7 @@ public short getMaxFragmentLength()`
`193`	`194`	`/**`
`194`	`195`	`* @deprecated Use {@link #getPRFAlgorithm()} instead.`
`195`	`196`	`*/`
	`197`	`+ @Deprecated`
`196`	`198`	`public int getPrfAlgorithm()`
`197`	`199`	`{`
`198`	`200`	`return prfAlgorithm;`
Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,7 @@ public static int getNamedGroup(int signatureScheme)`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`/** @deprecated Use {@link #getCryptoHashAlgorithm(int)} instead. */`
	`198`	`+ @Deprecated`
`198`	`199`	`public static int getRSAPSSCryptoHashAlgorithm(int signatureScheme)`
`199`	`200`	`{`
`200`	`201`	`switch (signatureScheme)`