From 3b69c33550cd0c44c05f74c62227b93b6af2589d Mon Sep 17 00:00:00 2001 From: Peter Dettman Date: Thu, 21 Apr 2022 19:22:59 +0700 Subject: Refactoring --- crypto/src/tls/crypto/impl/bc/BcTlsEd25519Signer.cs | 5 ----- crypto/src/tls/crypto/impl/bc/BcTlsEd25519Verifier.cs | 5 ----- crypto/src/tls/crypto/impl/bc/BcTlsEd448Signer.cs | 5 ----- crypto/src/tls/crypto/impl/bc/BcTlsEd448Verifier.cs | 5 ----- crypto/src/tls/crypto/impl/bc/BcTlsRsaPssSigner.cs | 5 ----- crypto/src/tls/crypto/impl/bc/BcTlsRsaPssVerifier.cs | 5 ----- crypto/src/tls/crypto/impl/bc/BcTlsSigner.cs | 5 ++++- crypto/src/tls/crypto/impl/bc/BcTlsVerifier.cs | 5 ++++- 8 files changed, 8 insertions(+), 32 deletions(-) (limited to 'crypto/src/tls') diff --git a/crypto/src/tls/crypto/impl/bc/BcTlsEd25519Signer.cs b/crypto/src/tls/crypto/impl/bc/BcTlsEd25519Signer.cs index c8fc99e18..04a296876 100644 --- a/crypto/src/tls/crypto/impl/bc/BcTlsEd25519Signer.cs +++ b/crypto/src/tls/crypto/impl/bc/BcTlsEd25519Signer.cs @@ -13,11 +13,6 @@ namespace Org.BouncyCastle.Tls.Crypto.Impl.BC { } - public override byte[] GenerateRawSignature(SignatureAndHashAlgorithm algorithm, byte[] hash) - { - throw new NotSupportedException(); - } - public override TlsStreamSigner GetStreamSigner(SignatureAndHashAlgorithm algorithm) { if (algorithm == null || SignatureScheme.From(algorithm) != SignatureScheme.ed25519) diff --git a/crypto/src/tls/crypto/impl/bc/BcTlsEd25519Verifier.cs b/crypto/src/tls/crypto/impl/bc/BcTlsEd25519Verifier.cs index 238c04ab7..a787bb92a 100644 --- a/crypto/src/tls/crypto/impl/bc/BcTlsEd25519Verifier.cs +++ b/crypto/src/tls/crypto/impl/bc/BcTlsEd25519Verifier.cs @@ -13,11 +13,6 @@ namespace Org.BouncyCastle.Tls.Crypto.Impl.BC { } - public override bool VerifyRawSignature(DigitallySigned digitallySigned, byte[] hash) - { - throw new NotSupportedException(); - } - public override TlsStreamVerifier GetStreamVerifier(DigitallySigned digitallySigned) { SignatureAndHashAlgorithm algorithm = digitallySigned.Algorithm; diff --git a/crypto/src/tls/crypto/impl/bc/BcTlsEd448Signer.cs b/crypto/src/tls/crypto/impl/bc/BcTlsEd448Signer.cs index 06d4d7ad9..07f8ec90d 100644 --- a/crypto/src/tls/crypto/impl/bc/BcTlsEd448Signer.cs +++ b/crypto/src/tls/crypto/impl/bc/BcTlsEd448Signer.cs @@ -13,11 +13,6 @@ namespace Org.BouncyCastle.Tls.Crypto.Impl.BC { } - public override byte[] GenerateRawSignature(SignatureAndHashAlgorithm algorithm, byte[] hash) - { - throw new NotSupportedException(); - } - public override TlsStreamSigner GetStreamSigner(SignatureAndHashAlgorithm algorithm) { if (algorithm == null || SignatureScheme.From(algorithm) != SignatureScheme.ed448) diff --git a/crypto/src/tls/crypto/impl/bc/BcTlsEd448Verifier.cs b/crypto/src/tls/crypto/impl/bc/BcTlsEd448Verifier.cs index 3634eeaa7..7940d0757 100644 --- a/crypto/src/tls/crypto/impl/bc/BcTlsEd448Verifier.cs +++ b/crypto/src/tls/crypto/impl/bc/BcTlsEd448Verifier.cs @@ -13,11 +13,6 @@ namespace Org.BouncyCastle.Tls.Crypto.Impl.BC { } - public override bool VerifyRawSignature(DigitallySigned digitallySigned, byte[] hash) - { - throw new NotSupportedException(); - } - public override TlsStreamVerifier GetStreamVerifier(DigitallySigned digitallySigned) { SignatureAndHashAlgorithm algorithm = digitallySigned.Algorithm; diff --git a/crypto/src/tls/crypto/impl/bc/BcTlsRsaPssSigner.cs b/crypto/src/tls/crypto/impl/bc/BcTlsRsaPssSigner.cs index 2c1b41120..3e7d1ceef 100644 --- a/crypto/src/tls/crypto/impl/bc/BcTlsRsaPssSigner.cs +++ b/crypto/src/tls/crypto/impl/bc/BcTlsRsaPssSigner.cs @@ -22,11 +22,6 @@ namespace Org.BouncyCastle.Tls.Crypto.Impl.BC this.m_signatureScheme = signatureScheme; } - public override byte[] GenerateRawSignature(SignatureAndHashAlgorithm algorithm, byte[] hash) - { - throw new NotSupportedException(); - } - public override TlsStreamSigner GetStreamSigner(SignatureAndHashAlgorithm algorithm) { if (algorithm == null || SignatureScheme.From(algorithm) != m_signatureScheme) diff --git a/crypto/src/tls/crypto/impl/bc/BcTlsRsaPssVerifier.cs b/crypto/src/tls/crypto/impl/bc/BcTlsRsaPssVerifier.cs index 4f5ca79d8..dc8cebdd9 100644 --- a/crypto/src/tls/crypto/impl/bc/BcTlsRsaPssVerifier.cs +++ b/crypto/src/tls/crypto/impl/bc/BcTlsRsaPssVerifier.cs @@ -22,11 +22,6 @@ namespace Org.BouncyCastle.Tls.Crypto.Impl.BC this.m_signatureScheme = signatureScheme; } - public override bool VerifyRawSignature(DigitallySigned digitallySigned, byte[] hash) - { - throw new NotSupportedException(); - } - public override TlsStreamVerifier GetStreamVerifier(DigitallySigned digitallySigned) { SignatureAndHashAlgorithm algorithm = digitallySigned.Algorithm; diff --git a/crypto/src/tls/crypto/impl/bc/BcTlsSigner.cs b/crypto/src/tls/crypto/impl/bc/BcTlsSigner.cs index 841803043..cb510a150 100644 --- a/crypto/src/tls/crypto/impl/bc/BcTlsSigner.cs +++ b/crypto/src/tls/crypto/impl/bc/BcTlsSigner.cs @@ -23,7 +23,10 @@ namespace Org.BouncyCastle.Tls.Crypto.Impl.BC this.m_privateKey = privateKey; } - public abstract byte[] GenerateRawSignature(SignatureAndHashAlgorithm algorithm, byte[] hash); + public virtual byte[] GenerateRawSignature(SignatureAndHashAlgorithm algorithm, byte[] hash) + { + throw new NotSupportedException(); + } public virtual TlsStreamSigner GetStreamSigner(SignatureAndHashAlgorithm algorithm) { diff --git a/crypto/src/tls/crypto/impl/bc/BcTlsVerifier.cs b/crypto/src/tls/crypto/impl/bc/BcTlsVerifier.cs index 4db2c8f53..8a60d185c 100644 --- a/crypto/src/tls/crypto/impl/bc/BcTlsVerifier.cs +++ b/crypto/src/tls/crypto/impl/bc/BcTlsVerifier.cs @@ -28,6 +28,9 @@ namespace Org.BouncyCastle.Tls.Crypto.Impl.BC return null; } - public abstract bool VerifyRawSignature(DigitallySigned digitallySigned, byte[] hash); + public virtual bool VerifyRawSignature(DigitallySigned digitallySigned, byte[] hash) + { + throw new NotSupportedException(); + } } } -- cgit 1.4.1