diff options
| -rw-r--r-- | crypto/src/pkcs/PKCS12StoreBuilder.cs | 5 | ||||
| -rw-r--r-- | crypto/src/pkcs/Pkcs12Store.cs | 19 |
2 files changed, 18 insertions, 6 deletions
diff --git a/crypto/src/pkcs/PKCS12StoreBuilder.cs b/crypto/src/pkcs/PKCS12StoreBuilder.cs index 50d927af7..404439fb2 100644 --- a/crypto/src/pkcs/PKCS12StoreBuilder.cs +++ b/crypto/src/pkcs/PKCS12StoreBuilder.cs @@ -16,11 +16,12 @@ namespace Org.BouncyCastle.Pkcs { } - public Pkcs12Store Build() + public Pkcs12Store Build(bool isReverse = false) { - return new Pkcs12Store(keyAlgorithm, keyPrfAlgorithm, certAlgorithm, useDerEncoding); + return new Pkcs12Store(keyAlgorithm, keyPrfAlgorithm, certAlgorithm, useDerEncoding, isReverse); } + public Pkcs12StoreBuilder SetCertAlgorithm(DerObjectIdentifier certAlgorithm) { this.certAlgorithm = certAlgorithm; diff --git a/crypto/src/pkcs/Pkcs12Store.cs b/crypto/src/pkcs/Pkcs12Store.cs index e05805b88..b0cfbd3fb 100644 --- a/crypto/src/pkcs/Pkcs12Store.cs +++ b/crypto/src/pkcs/Pkcs12Store.cs @@ -33,6 +33,7 @@ namespace Org.BouncyCastle.Pkcs private readonly DerObjectIdentifier keyPrfAlgorithm; private readonly DerObjectIdentifier certAlgorithm; private readonly bool useDerEncoding; + private readonly bool isReverse; private AsymmetricKeyEntry unmarkedKeyEntry = null; @@ -75,12 +76,13 @@ namespace Org.BouncyCastle.Pkcs } internal Pkcs12Store(DerObjectIdentifier keyAlgorithm, DerObjectIdentifier keyPrfAlgorithm, - DerObjectIdentifier certAlgorithm, bool useDerEncoding) + DerObjectIdentifier certAlgorithm, bool useDerEncoding, bool isReverse) { this.keyAlgorithm = keyAlgorithm; this.keyPrfAlgorithm = keyPrfAlgorithm; this.certAlgorithm = certAlgorithm; this.useDerEncoding = useDerEncoding; + this.isReverse = isReverse; } protected virtual void LoadKeyBag(PrivateKeyInfo privKeyInfo, Asn1Set bagAttributes) @@ -283,7 +285,11 @@ namespace Org.BouncyCastle.Pkcs m_certs.Clear(); m_chainCerts.Clear(); m_keyCerts.Clear(); - + // m_certOrder.Clear(); + if (isReverse) + { + certBags.Reverse(); + } foreach (SafeBag b in certBags) { CertBag certBag = CertBag.GetInstance(b.BagValue); @@ -348,6 +354,7 @@ namespace Org.BouncyCastle.Pkcs X509CertificateEntry certEntry = new X509CertificateEntry(cert, attributes); m_chainCerts[certID] = certEntry; + // m_certOrder.Add(certID); if (unmarkedKeyEntry != null) { @@ -587,7 +594,9 @@ namespace Org.BouncyCastle.Pkcs if (CollectionUtilities.Remove(m_certs, alias, out var certEntry)) { - m_chainCerts.Remove(new CertID(certEntry)); + CertID certId = new CertID(certEntry); + // m_certOrder.Remove(certId); + m_chainCerts.Remove(certId); } if (m_keys.Remove(alias)) @@ -596,7 +605,9 @@ namespace Org.BouncyCastle.Pkcs { if (CollectionUtilities.Remove(m_keyCerts, id, out var keyCertEntry)) { - m_chainCerts.Remove(new CertID(keyCertEntry)); + CertID certId = new CertID(certEntry); + // m_certOrder.Remove(certId); + m_chainCerts.Remove(certId); } } } |