From 6ca2f2f9b941289f42d0ef0d2ef8f0cfa1e4ac86 Mon Sep 17 00:00:00 2001
From: David Hook <dgh@bouncycastle.org>
Date: Tue, 15 Jan 2019 08:05:41 +1100
Subject: refactor of PKMacBuilder

---
 crypto/src/asn1/cmp/GeneralPKIMessage.cs   |  49 -------------
 crypto/src/asn1/cmp/ProtectedPkiMessage.cs | 107 -----------------------------
 2 files changed, 156 deletions(-)
 delete mode 100644 crypto/src/asn1/cmp/GeneralPKIMessage.cs
 delete mode 100644 crypto/src/asn1/cmp/ProtectedPkiMessage.cs

(limited to 'crypto/src/asn1/cmp')

diff --git a/crypto/src/asn1/cmp/GeneralPKIMessage.cs b/crypto/src/asn1/cmp/GeneralPKIMessage.cs
deleted file mode 100644
index d91b8ef7e..000000000
--- a/crypto/src/asn1/cmp/GeneralPKIMessage.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Org.BouncyCastle.Asn1.Cmp
-{
-    public class GeneralPKIMessage
-    {
-        private readonly PkiMessage pkiMessage;
-
-        private static PkiMessage parseBytes(byte[] encoding)
-        {
-            return PkiMessage.GetInstance(Asn1Object.FromByteArray(encoding));
-        }
-
-        public GeneralPKIMessage(PkiMessage pkiMessage)
-        {
-            this.pkiMessage = pkiMessage;
-        }
-
-        public GeneralPKIMessage(byte[] encoding) : this(parseBytes(encoding))
-        {
-        }
-
-        public PkiHeader Header {
-            get {
-                return pkiMessage.Header;
-            }
-        }
-
-        public PkiBody Body
-        {
-            get
-            {
-                return pkiMessage.Body;
-            }
-        }
-
-        public bool HasProtection
-        {
-            get { return pkiMessage.Protection != null; }
-        }
-
-        public PkiMessage ToAsn1Structure()
-        {
-            return pkiMessage;
-        }
-    }
-}
diff --git a/crypto/src/asn1/cmp/ProtectedPkiMessage.cs b/crypto/src/asn1/cmp/ProtectedPkiMessage.cs
deleted file mode 100644
index c39f06ad0..000000000
--- a/crypto/src/asn1/cmp/ProtectedPkiMessage.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using Org.BouncyCastle.Asn1.X509;
-using Org.BouncyCastle.X509;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Org.BouncyCastle.Asn1.Crmf;
-using Org.BouncyCastle.Asn1.Pkcs;
-using Org.BouncyCastle.Crypto;
-using Org.BouncyCastle.Crypto.Operators;
-using Org.BouncyCastle.Crypto.Paddings;
-using Org.BouncyCastle.Utilities;
-using Org.BouncyCastle.Utilities.Encoders;
-
-namespace Org.BouncyCastle.Asn1.Cmp
-{
-   
-    public class ProtectedPkiMessage
-    {
-        private PkiMessage pkiMessage;
-        
-
-        public ProtectedPkiMessage(GeneralPKIMessage pkiMessage)
-        {
-            
-            if (!pkiMessage.HasProtection)
-            {
-                throw new ArgumentException("pki message not protected");
-            }
-
-            this.pkiMessage = pkiMessage.ToAsn1Structure();
-        }
-           
-        public ProtectedPkiMessage(PkiMessage pkiMessage)
-        {
-            if (pkiMessage.Header.ProtectionAlg == null)
-            {
-                throw new ArgumentException("pki message not protected");
-            }
-
-            this.pkiMessage = pkiMessage;
-        }
-
-        public PkiHeader Header { get { return pkiMessage.Header; } }
-        public PkiBody Body { get { return pkiMessage.Body; } }
-
-        public PkiMessage ToAsn1Message() { return pkiMessage; }
-
-        public bool HasPasswordBasedMacProtected { get { return Header.ProtectionAlg.Algorithm.Equals(CmpObjectIdentifiers.passwordBasedMac); } }
-
-        public X509Certificate[] GetCertificates()
-        {
-            CmpCertificate[] certs = pkiMessage.GetExtraCerts();
-
-            if (certs == null)
-            {
-                return new X509Certificate[0];
-            }
-
-            X509Certificate[] res = new X509Certificate[certs.Length];
-           for (int t=0; t<certs.Length;t++)
-            {
-                res[t] = new X509Certificate(X509CertificateStructure.GetInstance(certs[t].GetEncoded()));
-            }
-
-            return res;
-        }
-        
-
-        
-
-        public bool Verify(IVerifierFactory verifier)
-        {
-           Asn1EncodableVector avec = new Asn1EncodableVector();
-           avec.Add(pkiMessage.Header);
-           avec.Add(pkiMessage.Body);
-           byte[] enc =   new DerSequence(avec).GetDerEncoded();
-
-           IStreamCalculator streamCalculator = verifier.CreateCalculator();
-
-           streamCalculator.Stream.Write(enc,0,enc.Length);
-           streamCalculator.Stream.Flush();
-           streamCalculator.Stream.Close();
-          
-           IVerifier result = (IVerifier) streamCalculator.GetResult();     
-           return result.IsVerified(pkiMessage.Protection.GetBytes());          
-        }
-
-
-        public bool Verify(Asn1MacFactoryProvider asn1Factory, byte[] password)
-        {
-            if (!CmpObjectIdentifiers.passwordBasedMac.Equals(pkiMessage.Header.ProtectionAlg.Algorithm))
-            {
-                throw new InvalidOperationException("protection algorithm is not mac based");
-            }
-
-            PbmParameter parameter = PbmParameter.GetInstance(pkiMessage.Header.ProtectionAlg.Parameters);
-
-            PkMacFactory macFactory = (PkMacFactory)asn1Factory.CreateMacFactory(parameter);
-                            
-            macFactory.Password = password;
-            MacVerifierFactory macVerifierFactory = new MacVerifierFactory(macFactory);
-
-            return Verify(macVerifierFactory);       
-        }
-
-    }
-}
-- 
cgit 1.5.1