From ebbb4436604550d60ded2e1e4454bd7b7c0727d6 Mon Sep 17 00:00:00 2001 From: Peter Dettman Date: Mon, 31 Jul 2023 15:58:26 +0700 Subject: Misc. cleanup --- crypto/src/crmf/CertificateRequestMessageBuilder.cs | 6 ++---- crypto/src/crypto/operators/Asn1DigestFactory.cs | 2 +- crypto/test/src/crmf/test/CrmfTest.cs | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'crypto') diff --git a/crypto/src/crmf/CertificateRequestMessageBuilder.cs b/crypto/src/crmf/CertificateRequestMessageBuilder.cs index 84c9b7966..34a224df1 100644 --- a/crypto/src/crmf/CertificateRequestMessageBuilder.cs +++ b/crypto/src/crmf/CertificateRequestMessageBuilder.cs @@ -187,10 +187,8 @@ namespace Org.BouncyCastle.Crmf } #endif - public CertificateRequestMessageBuilder SetAuthInfoSender(X509Name sender) - { - return SetAuthInfoSender(new GeneralName(sender)); - } + public CertificateRequestMessageBuilder SetAuthInfoSender(X509Name sender) => + SetAuthInfoSender(new GeneralName(sender)); public CertificateRequestMessageBuilder SetAuthInfoSender(GeneralName sender) { diff --git a/crypto/src/crypto/operators/Asn1DigestFactory.cs b/crypto/src/crypto/operators/Asn1DigestFactory.cs index 753047937..ae34b4ea5 100644 --- a/crypto/src/crypto/operators/Asn1DigestFactory.cs +++ b/crypto/src/crypto/operators/Asn1DigestFactory.cs @@ -8,7 +8,7 @@ namespace Org.BouncyCastle.Crypto.Operators : IDigestFactory { public static Asn1DigestFactory Get(DerObjectIdentifier oid) => - new Asn1DigestFactory(DigestUtilities.GetDigest(oid), oid); + new Asn1DigestFactory(DigestUtilities.GetDigest(oid), oid); public static Asn1DigestFactory Get(string mechanism) => Get(DigestUtilities.GetObjectIdentifier(mechanism)); diff --git a/crypto/test/src/crmf/test/CrmfTest.cs b/crypto/test/src/crmf/test/CrmfTest.cs index f900e0879..50445d363 100644 --- a/crypto/test/src/crmf/test/CrmfTest.cs +++ b/crypto/test/src/crmf/test/CrmfTest.cs @@ -150,7 +150,7 @@ namespace Org.BouncyCastle.Crmf.Tests CrmfObjectIdentifiers.id_regCtrl_pkiArchiveOptions); IsEquals("Archive type", PkiArchiveControl.encryptedPrivKey, archiveControl.ArchiveType); - IsTrue(archiveControl.EnvelopedData); + IsTrue(archiveControl.IsEnvelopedData()); RecipientInformationStore recips = archiveControl.GetEnvelopedData().GetRecipientInfos(); var collection = recips.GetRecipients(); -- cgit 1.4.1