Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Instantiate CmsSigner outside loop #509

Closed
wants to merge 1 commit into from
Closed

Instantiate CmsSigner outside loop #509

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions MimeKit/Cryptography/DefaultSecureMimeContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,17 +393,23 @@ protected override CmsRecipient GetCmsRecipient (MailboxAddress mailbox)
/// </exception>
protected override CmsSigner GetCmsSigner (MailboxAddress mailbox, DigestAlgorithm digestAlgo)
{
X509CertificateRecord recordSigner = null;

foreach (var record in dbase.Find (mailbox, DateTime.UtcNow, true, CmsSignerFields)) {
if (record.KeyUsage != X509KeyUsageFlags.None && (record.KeyUsage & SecureMimeContext.DigitalSignatureKeyUsageFlags) == 0)
continue;

var signer = new CmsSigner (BuildCertificateChain (record.Certificate), record.PrivateKey);
recordSigner = record;
break;
}

if (recordSigner != null) {
var signer = new CmsSigner (BuildCertificateChain (recordSigner.Certificate), recordSigner.PrivateKey);
signer.DigestAlgorithm = digestAlgo;

return signer;
}

throw new CertificateNotFoundException (mailbox, "A valid signing certificate could not be found.");
} else
throw new CertificateNotFoundException (mailbox, "A valid signing certificate could not be found.");
}

/// <summary>
Expand Down