1 files changed, 22 insertions, 21 deletions
diff --git a/src/include/dkimverify.h b/src/include/dkimverify.h
index 8347957..e1d0a92 100644
--- a/src/include/dkimverify.h
+++ b/src/include/dkimverify.h
@@ -22,6 +22,7 @@
 #ifndef DKIMVERIFY_H
 #define DKIMVERIFY_H
 
+#include <list>
 #include <vector>
 
 #include "dkim.h"
@@ -39,18 +40,18 @@
 #define DKIM_POLICY_INVALID              -53  // internal error
 
 /* dito
-#define DKIM_SIG_VERSION_PRE_02    0
-#define DKIM_SIG_VERSION_02_PLUS   1
+#define DKIM_SIG_VERSION_PRE_02     0
+#define DKIM_SIG_VERSION_02_PLUS    1
 */
 
 class SelectorInfo {
 public:
-  SelectorInfo(const string& sSelector, const string& sDomain);
+  SelectorInfo(const std::string& sSelector, const std::string& sDomain);
   ~SelectorInfo();
 
-  string Domain;
-  string Selector;
-  string Granularity;
+  std::string Domain;
+  std::string Selector;
+  std::string Granularity;
   bool AllowSHA1;
   bool AllowSHA256;
   EVP_PKEY *PublicKey; /* the public key */
@@ -69,16 +70,16 @@ public:
 
   void Hash(const char *szBuffer, unsigned nBufLength, bool IsBody = false);
 
-  string Header;
+  std::string Header;
   unsigned Version;
-  string Domain;
-  string Selector;
-  string SignatureData;
-  string BodyHashData;
-  string IdentityLocalPart;
-  string IdentityDomain;
-  string CanonicalizedData;
-  vector<string> SignedHeaders;
+  std::string Domain;
+  std::string Selector;
+  std::string SignatureData;
+  std::string BodyHashData;
+  std::string IdentityLocalPart;
+  std::string IdentityDomain;
+  std::string CanonicalizedData;
+  std::vector<std::string> SignedHeaders;
   unsigned BodyLength;
   unsigned HeaderCanonicalization;
   unsigned BodyCanonicalization;
@@ -129,14 +130,14 @@ public:
   }
 
 protected:
-  int ParseDKIMSignature(const string& sHeader, SignatureInfo& sig);
+  int ParseDKIMSignature(const std::string& sHeader, SignatureInfo& sig);
 
-  SelectorInfo& GetSelector(const string& sSelector, const string& sDomain);
+  SelectorInfo& GetSelector(const std::string& sSelector, const std::string& sDomain);
 
   // int GetADSP(const std::string& sDomain, int& iADSP);
 
-  list<SignatureInfo> Signatures;
-  list<SelectorInfo> Selectors;
+  std::list<SignatureInfo> Signatures;
+  std::list<SelectorInfo> Selectors;
 
   DKIMDNSCALLBACK m_pfnSelectorCallback;  // selector record callback
   // DKIMDNSCALLBACK m_pfnPracticesCallback;    // ADSP record callback
@@ -147,8 +148,8 @@ protected:
   bool m_SaveCanonicalizedData;
   bool m_AllowUnsignedFromHeaders;
 
-  vector<DKIMVerifyDetails> Details;
-  string Practices;
+  std::vector<DKIMVerifyDetails> Details;
+  std::string Practices;
 };
 
 #endif  //DKIMVERIFY_H