From 33528a6bb2411e4071f36b93862499b9b572197c Mon Sep 17 00:00:00 2001 From: Peter Dettman Date: Fri, 28 Jul 2023 13:01:55 +0700 Subject: Refactoring --- crypto/src/cmp/CertificateConfirmationContent.cs | 2 +- crypto/src/cmp/CertificateConfirmationContentBuilder.cs | 2 +- crypto/src/cmp/CertificateStatus.cs | 2 +- crypto/src/cms/CMSSignedGenerator.cs | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/crypto/src/cmp/CertificateConfirmationContent.cs b/crypto/src/cmp/CertificateConfirmationContent.cs index edd4a28ed..cba78bd2c 100644 --- a/crypto/src/cmp/CertificateConfirmationContent.cs +++ b/crypto/src/cmp/CertificateConfirmationContent.cs @@ -33,7 +33,7 @@ namespace Org.BouncyCastle.Cmp [Obsolete("Use constructor taking 'IDigestAlgorithmFinder' instead")] public CertificateConfirmationContent(CertConfirmContent content, - Org.BouncyCastle.Cms.DefaultDigestAlgorithmIdentifierFinder digestAlgFinder) + Cms.DefaultDigestAlgorithmIdentifierFinder digestAlgFinder) : this(content, (IDigestAlgorithmFinder)digestAlgFinder) { } diff --git a/crypto/src/cmp/CertificateConfirmationContentBuilder.cs b/crypto/src/cmp/CertificateConfirmationContentBuilder.cs index b46c1ab0e..faf0cf998 100644 --- a/crypto/src/cmp/CertificateConfirmationContentBuilder.cs +++ b/crypto/src/cmp/CertificateConfirmationContentBuilder.cs @@ -24,7 +24,7 @@ namespace Org.BouncyCastle.Cmp } [Obsolete("Use constructor taking 'IDigestAlgorithmFinder' instead")] - public CertificateConfirmationContentBuilder(Org.BouncyCastle.Cms.DefaultDigestAlgorithmIdentifierFinder digestAlgFinder) + public CertificateConfirmationContentBuilder(Cms.DefaultDigestAlgorithmIdentifierFinder digestAlgFinder) : this((IDigestAlgorithmFinder)digestAlgFinder) { } diff --git a/crypto/src/cmp/CertificateStatus.cs b/crypto/src/cmp/CertificateStatus.cs index 4df7e0cf5..482e9f7f3 100644 --- a/crypto/src/cmp/CertificateStatus.cs +++ b/crypto/src/cmp/CertificateStatus.cs @@ -17,7 +17,7 @@ namespace Org.BouncyCastle.Cmp private readonly CertStatus m_certStatus; [Obsolete("Use constructor taking 'IDigestAlgorithmFinder' instead")] - public CertificateStatus(Org.BouncyCastle.Cms.DefaultDigestAlgorithmIdentifierFinder digestAlgFinder, + public CertificateStatus(Cms.DefaultDigestAlgorithmIdentifierFinder digestAlgFinder, CertStatus certStatus) : this((IDigestAlgorithmFinder)digestAlgFinder, certStatus) { diff --git a/crypto/src/cms/CMSSignedGenerator.cs b/crypto/src/cms/CMSSignedGenerator.cs index fd8a05d7a..0662e3e47 100644 --- a/crypto/src/cms/CMSSignedGenerator.cs +++ b/crypto/src/cms/CMSSignedGenerator.cs @@ -27,27 +27,27 @@ namespace Org.BouncyCastle.Cms { [Obsolete("Use 'Org.BouncyCastle.Operators.Utilities.DefaultSignatureAlgorithmFinder' instead")] public class DefaultSignatureAlgorithmIdentifierFinder - : Org.BouncyCastle.Operators.Utilities.ISignatureAlgorithmFinder + : Operators.Utilities.ISignatureAlgorithmFinder { // TODO[api] Make virtual public AlgorithmIdentifier Find(string sigAlgName) => - Org.BouncyCastle.Operators.Utilities.DefaultSignatureAlgorithmFinder.Instance.Find(sigAlgName); + Operators.Utilities.DefaultSignatureAlgorithmFinder.Instance.Find(sigAlgName); } [Obsolete("Use 'Org.BouncyCastle.Operators.Utilities.DefaultDigestAlgorithmFinder' instead")] public class DefaultDigestAlgorithmIdentifierFinder - : Org.BouncyCastle.Operators.Utilities.IDigestAlgorithmFinder + : Operators.Utilities.IDigestAlgorithmFinder { // TODO[api] Make virtual public AlgorithmIdentifier Find(AlgorithmIdentifier sigAlgId) => - Org.BouncyCastle.Operators.Utilities.DefaultDigestAlgorithmFinder.Instance.Find(sigAlgId); + Operators.Utilities.DefaultDigestAlgorithmFinder.Instance.Find(sigAlgId); public virtual AlgorithmIdentifier Find(DerObjectIdentifier digAlgOid) => - Org.BouncyCastle.Operators.Utilities.DefaultDigestAlgorithmFinder.Instance.Find(digAlgOid); + Operators.Utilities.DefaultDigestAlgorithmFinder.Instance.Find(digAlgOid); // TODO[api] Make virtual public AlgorithmIdentifier Find(string digAlgName) => - Org.BouncyCastle.Operators.Utilities.DefaultDigestAlgorithmFinder.Instance.Find(digAlgName); + Operators.Utilities.DefaultDigestAlgorithmFinder.Instance.Find(digAlgName); } public abstract class CmsSignedGenerator -- cgit 1.4.1