diff options
| author | Peter Dettman <peter.dettman@bouncycastle.org> | 2024-03-13 01:21:30 +0700 |
|---|---|---|
| committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2024-03-13 01:21:30 +0700 |
| commit | 30f959c64691c30ea7a469ed5c267b740c4c979f (patch) | |
| tree | c4b26d598e2b6378c295739a008b64a7cb5099db /crypto/src/tsp | |
| parent | Refactoring in Asn1 (diff) | |
| download | BouncyCastle.NET-ed25519-30f959c64691c30ea7a469ed5c267b740c4c979f.tar.xz | |
Refactoring in Cms
- stricter (and earlier) OID checks - add TODOs for IDigestAlgorithmFinder usage (inc. noParams)
Diffstat (limited to 'crypto/src/tsp')
| -rw-r--r-- | crypto/src/tsp/TimeStampTokenGenerator.cs | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/crypto/src/tsp/TimeStampTokenGenerator.cs b/crypto/src/tsp/TimeStampTokenGenerator.cs index 986ae33dd..f304a0faf 100644 --- a/crypto/src/tsp/TimeStampTokenGenerator.cs +++ b/crypto/src/tsp/TimeStampTokenGenerator.cs @@ -137,17 +137,19 @@ namespace Org.BouncyCastle.Tsp string digestOID, string tsaPolicyOID, Asn1.Cms.AttributeTable signedAttr, - Asn1.Cms.AttributeTable unsignedAttr) : this( - makeInfoGenerator(key, cert, digestOID, signedAttr, unsignedAttr), - Asn1DigestFactory.Get(OiwObjectIdentifiers.IdSha1), - tsaPolicyOID != null ? new DerObjectIdentifier(tsaPolicyOID):null, false) + Asn1.Cms.AttributeTable unsignedAttr) + : this( + MakeInfoGenerator(key, cert, new DerObjectIdentifier(digestOID), signedAttr, unsignedAttr), + Asn1DigestFactory.Get(OiwObjectIdentifiers.IdSha1), + tsaPolicyOID != null ? new DerObjectIdentifier(tsaPolicyOID) : null, + false) { } - internal static SignerInfoGenerator makeInfoGenerator( + internal static SignerInfoGenerator MakeInfoGenerator( AsymmetricKeyParameter key, X509Certificate cert, - string digestOID, + DerObjectIdentifier digestOid, Asn1.Cms.AttributeTable signedAttr, Asn1.Cms.AttributeTable unsignedAttr) { @@ -187,9 +189,9 @@ namespace Org.BouncyCastle.Tsp // throw new TspException("Can't find a SHA-1 implementation.", e); //} - string digestName = CmsSignedHelper.GetDigestAlgName(digestOID); - string signatureName = digestName + "with" - + CmsSignedHelper.GetEncryptionAlgName(CmsSignedHelper.GetEncOid(key, digestOID)); + string digestName = CmsSignedHelper.GetDigestAlgName(digestOid); + DerObjectIdentifier encOid = CmsSignedHelper.GetEncOid(key, digestOid.Id); + string signatureName = digestName + "with" + CmsSignedHelper.GetEncryptionAlgName(encOid); Asn1SignatureFactory sigfact = new Asn1SignatureFactory(signatureName, key); return new SignerInfoGeneratorBuilder() |