Multi-line svn commit, see body.

[shibboleth/cpp-xmltooling.git] / xmltooling / security / CredentialCriteria.h

diff --git a/xmltooling/security/CredentialCriteria.h b/xmltooling/security/CredentialCriteria.h
index d331c89..2936f1a 100644 (file)
--- a/xmltooling/security/CredentialCriteria.h
+++ b/xmltooling/security/CredentialCriteria.h
@@ -42,7 +42,7 @@ namespace xmltooling {
     {
         MAKE_NONCOPYABLE(CredentialCriteria);
     public:
-        CredentialCriteria() : m_keyUsage(UNSPECIFIED_CREDENTIAL), m_keySize(0), m_key(NULL),
+        CredentialCriteria() : m_keyUsage(Credential::UNSPECIFIED_CREDENTIAL), m_keySize(0), m_key(NULL),
             m_keyInfo(NULL), m_nativeKeyInfo(NULL), m_credential(NULL) {
         }
         virtual ~CredentialCriteria() {
@@ -56,23 +56,13 @@ namespace xmltooling {
          * @return true iff the Credential is consistent with this criteria
          */
         virtual bool matches(const Credential& credential) const;
-
-        /**
-         * Enumeration of use cases for credentials. 
-         */
-        enum UsageType {
-            UNSPECIFIED_CREDENTIAL,
-            SIGNING_CREDENTIAL,
-            TLS_CREDENTIAL,
-            ENCRYPTION_CREDENTIAL
-        };
-        
+       
         /**
          * Get the key usage criteria.
          * 
          * @return the usage.
          */
-        UsageType getUsage() const {
+        Credential::UsageTypes getUsage() const {
             return m_keyUsage;
         }
     
@@ -81,7 +71,7 @@ namespace xmltooling {
          * 
          * @param usage the usage to set
          */
-        void setUsage(UsageType usage) {
+        void setUsage(Credential::UsageTypes usage) {
             m_keyUsage = usage;
         }
 
@@ -301,7 +291,7 @@ namespace xmltooling {
         }
 
     private:
-        UsageType m_keyUsage;
+        Credential::UsageTypes m_keyUsage;
         unsigned int m_keySize;
         std::string m_peerName,m_keyAlgorithm;
         std::set<std::string> m_keyNames;