Clean up warnings

5 files changed, 11 insertions, 8 deletions

diff --git a/crypto/src/asn1/gm/GMObjectIdentifiers.cs b/crypto/src/asn1/gm/GMObjectIdentifiers.cs
index 65b8e9132..587f50490 100644
--- a/crypto/src/asn1/gm/GMObjectIdentifiers.cs
+++ b/crypto/src/asn1/gm/GMObjectIdentifiers.cs
@@ -48,16 +48,16 @@ namespace Org.BouncyCastle.Asn1.GM
         public static readonly DerObjectIdentifier sm2encrypt = sm_scheme.Branch("301.3");
 
         /**
-         * <Information security technology — Cryptographic application identifier criterion specification>
-         * <url>http&#058;//c.gb688.cn/bzgk/gb/showGb&#63;type=online&hcno=252CF0F72A7BE339A56DEA7D774E8994</url>,
+         * &lt;Information security technology — Cryptographic application identifier criterion specification&gt;
+         * <url>http://c.gb688.cn/bzgk/gb/showGb?type=online&amp;hcno=252CF0F72A7BE339A56DEA7D774E8994</url>,
          * Page 21 only cover from 301.1 to 301.3
-         * */
+         */
         public static readonly DerObjectIdentifier wapip192v1 = sm_scheme.Branch("301.101");
 
         /**
-         * <WAPI certificate management—Part 5: Example of certificate format (draft)>
-         * <url>http&#058;//www.chinabwips.org.cn/zqyjgs1.htm</url> and
-         * <url>http&#058;//www.chinabwips.org.cn/doc/101.pdf</url>,
+         * &lt;WAPI certificate management—Part 5: Example of certificate format (draft)&gt;
+         * <url>http://www.chinabwips.org.cn/zqyjgs1.htm</url> and
+         * <url>http://www.chinabwips.org.cn/doc/101.pdf</url>,
          * Page 9 and page 10 states the OID of ECDSA-192 algorithm based on SHA-256 is 1.2.156.11235.1.1.1
          * */
         public static readonly DerObjectIdentifier wapi192v1 = new DerObjectIdentifier("1.2.156.11235.1.1.1");
diff --git a/crypto/src/pqc/crypto/sphincsplus/SPHINCSPlusParameters.cs b/crypto/src/pqc/crypto/sphincsplus/SPHINCSPlusParameters.cs
index 4fbd62735..40e7059bf 100644
--- a/crypto/src/pqc/crypto/sphincsplus/SPHINCSPlusParameters.cs
+++ b/crypto/src/pqc/crypto/sphincsplus/SPHINCSPlusParameters.cs
@@ -131,6 +131,7 @@ namespace Org.BouncyCastle.Pqc.Crypto.SphincsPlus
 
         static SphincsPlusParameters()
         {
+#pragma warning disable CS0618 // Type or member is obsolete
             SphincsPlusParameters[] all = new SphincsPlusParameters[]{
                 SphincsPlusParameters.sha2_128f, SphincsPlusParameters.sha2_128s,
                 SphincsPlusParameters.sha2_192f, SphincsPlusParameters.sha2_192s,
@@ -151,6 +152,7 @@ namespace Org.BouncyCastle.Pqc.Crypto.SphincsPlus
                 SphincsPlusParameters.haraka_192f_simple, SphincsPlusParameters.haraka_192s_simple,
                 SphincsPlusParameters.haraka_256f_simple, SphincsPlusParameters.haraka_256s_simple,
             };
+#pragma warning restore CS0618 // Type or member is obsolete
 
             for (int i = 0; i < all.Length; ++i)
             {
diff --git a/crypto/src/pqc/crypto/utils/PqcPublicKeyFactory.cs b/crypto/src/pqc/crypto/utils/PqcPublicKeyFactory.cs
index 0b5cf0031..32321f30b 100644
--- a/crypto/src/pqc/crypto/utils/PqcPublicKeyFactory.cs
+++ b/crypto/src/pqc/crypto/utils/PqcPublicKeyFactory.cs
@@ -240,7 +240,7 @@ namespace Org.BouncyCastle.Pqc.Crypto.Utilities
 
                     return new SphincsPlusPublicKeyParameters(spParams, Arrays.CopyOfRange(keyEnc, 4, keyEnc.Length));
                 }
-                catch (Exception e)
+                catch (Exception)
                 {
                     byte[] keyEnc = keyInfo.PublicKey.GetOctets();
 
diff --git a/crypto/src/pqc/crypto/utils/PqcUtilities.cs b/crypto/src/pqc/crypto/utils/PqcUtilities.cs
index b7cac6203..f3097c721 100644
--- a/crypto/src/pqc/crypto/utils/PqcUtilities.cs
+++ b/crypto/src/pqc/crypto/utils/PqcUtilities.cs
@@ -215,6 +215,7 @@ namespace Org.BouncyCastle.Pqc.Crypto.Utilities
             hqcOids[HqcParameters.hqc192] = BCObjectIdentifiers.hqc192;
             hqcOids[HqcParameters.hqc256] = BCObjectIdentifiers.hqc256;
 
+#pragma warning disable CS0618 // Type or member is obsolete
             sphincsPlusOids[SphincsPlusParameters.sha2_128s] = BCObjectIdentifiers.sphincsPlus_sha2_128s_r3;
             sphincsPlusOids[SphincsPlusParameters.sha2_128f] = BCObjectIdentifiers.sphincsPlus_sha2_128f_r3;
             sphincsPlusOids[SphincsPlusParameters.shake_128s] = BCObjectIdentifiers.sphincsPlus_shake_128s_r3;
@@ -277,6 +278,7 @@ namespace Org.BouncyCastle.Pqc.Crypto.Utilities
             sphincsPlusParams[BCObjectIdentifiers.sphincsPlus_sha2_256f] = SphincsPlusParameters.sha2_256f_simple;
             sphincsPlusParams[BCObjectIdentifiers.sphincsPlus_shake_256s] = SphincsPlusParameters.shake_256s_simple;
             sphincsPlusParams[BCObjectIdentifiers.sphincsPlus_shake_256f] = SphincsPlusParameters.shake_256f_simple;
+#pragma warning restore CS0618 // Type or member is obsolete
         }
 
         internal static DerObjectIdentifier McElieceOidLookup(CmceParameters parameters)
diff --git a/crypto/test/src/cms/test/SignedDataTest.cs b/crypto/test/src/cms/test/SignedDataTest.cs
index 158fc0ea9..d536111ae 100644
--- a/crypto/test/src/cms/test/SignedDataTest.cs
+++ b/crypto/test/src/cms/test/SignedDataTest.cs
@@ -1517,7 +1517,6 @@ namespace Org.BouncyCastle.Cms.Tests
 
         public void TestEncryptionAlgECPublicKey()
         {
-            bool isValid = true;
             byte[] sigBlock = Base64.Decode(
 				"MIIEdwYJKoZIhvcNAQcCoIIEaDCCBGQCAQExDzANBglghkgBZQMEAgEFADAUBgkqhkiG9w" +
 				"0BBwGgBwQFAQIDBAWgggMPMIIDCzCCAm6gAwIBAgIJALt88oa4pHaNMAkGByqGSM49BAEw" +