Next integration phase, metadata and trust conversion.

[shibboleth/cpp-sp.git] / xmlproviders / internal.h

diff --git a/xmlproviders/internal.h b/xmlproviders/internal.h
index d9b38ac..a3abfdf 100644 (file)
--- a/xmlproviders/internal.h
+++ b/xmlproviders/internal.h
@@ -25,9 +25,19 @@
 #ifndef __internal_h__
 #define __internal_h__
 
-#include <saml/saml.h>
-#include <shib/shib.h>
-#include <shib/shib-threads.h>
+#ifdef WIN32
+# define _CRT_NONSTDC_NO_DEPRECATE 1
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+
+// eventually we might be able to support autoconf via cygwin...
+#if defined (_MSC_VER) || defined(__BORLANDC__)
+# include "config_win32.h"
+#else
+# include "config.h"
+#endif
+
+#include <shib-target/shib-target.h>
 #include <openssl/ssl.h>
 
 #define XMLPROVIDERS_LOGCAT "XMLProviders"
@@ -35,56 +45,19 @@
 #define SHIB_L(s) ::XML::Literals::s
 #define SHIB_L_QNAME(p,s) ::XML::Literals::p##_##s
 
-// direct OpenSSL error content to log4cpp
 void log_openssl();
 
-// build an OpenSSL object out of a base-64 encoded DER buffer (XML style)
-X509_CRL* B64_to_CRL(const char* buf);
-X509* B64_to_X509(const char* buf);
-   
 class XML
 {
 public:
         // URI constants
     static const XMLCh SHIB_NS[];
     static const XMLCh SHIB_SCHEMA_ID[];
-    static const XMLCh SHIBMETA_NS[];
-    static const XMLCh SHIBMETA_SCHEMA_ID[];
     static const XMLCh CREDS_NS[];
     static const XMLCh CREDS_SCHEMA_ID[];
-    static const XMLCh TRUST_NS[];
-    static const XMLCh TRUST_SCHEMA_ID[];
-    static const XMLCh SAML2ASSERT_NS[];
-    static const XMLCh SAML2ASSERT_SCHEMA_ID[];
-    static const XMLCh SAML2META_NS[];
-    static const XMLCh SAML2META_SCHEMA_ID[];
-    static const XMLCh XMLENC_NS[];
-    static const XMLCh XMLENC_SCHEMA_ID[];
-        
-    // ds:KeyInfo RetrievalMethods
-    static const XMLCh XMLSIG_RETMETHOD_RAWX509[];  // http://www.w3.org/2000/09/xmldsig#rawX509Certificate
-    static const XMLCh XMLSIG_RETMETHOD_RAWX509CRL[]; // http://www.w3.org/2000/09/xmldsig-more#rawX509CRL
 
     struct Literals
     {
-        // old metadata constants
-        static const XMLCh AttributeAuthority[];
-        static const XMLCh Contact[];
-        static const XMLCh Domain[];
-        static const XMLCh Email[];
-        static const XMLCh ErrorURL[];
-        static const XMLCh HandleService[];
-        static const XMLCh InvalidHandle[];
-        static const XMLCh Name[];
-        static const XMLCh OriginSite[];
-        static const XMLCh SiteGroup[];
-
-        static const XMLCh administrative[];
-        static const XMLCh billing[];
-        static const XMLCh other[];
-        static const XMLCh support[];
-        static const XMLCh technical[];
-
         // credentials constants
         static const XMLCh CAPath[];
         static const XMLCh Certificate[];
@@ -98,18 +71,6 @@ public:
         static const XMLCh password[];
         static const XMLCh Path[];
         
-        // trust constants
-        static const XMLCh Exponent[];
-        static const XMLCh KeyAuthority[];
-        static const XMLCh KeyName[];
-        static const XMLCh Modulus[];
-        static const XMLCh RetrievalMethod[];
-        static const XMLCh RSAKeyValue[];
-        static const XMLCh Trust[];
-        static const XMLCh URI[];
-        static const XMLCh VerifyDepth[];
-        static const XMLCh X509CRL[];
-
         // SAML attribute constants
         static const XMLCh Accept[];
         static const XMLCh Alias[];
@@ -121,6 +82,7 @@ public:
         static const XMLCh CaseSensitive[];
         static const XMLCh Factory[];
         static const XMLCh Header[];
+        static const XMLCh Name[];
         static const XMLCh Namespace[];
         static const XMLCh Scope[];
         static const XMLCh Scoped[];
@@ -132,76 +94,15 @@ public:
         static const XMLCh regexp[];
         static const XMLCh xpath[];
 
-        static const XMLCh Include[];
-        static const XMLCh Exclude[];
         static const XMLCh url[];
-        static const XMLCh verify[];
         
-        // new metadata constants
-        static const XMLCh AdditionalMetadataLocation[];
-        static const XMLCh AffiliateMember[];
-        static const XMLCh AffiliationDescriptor[];
-        static const XMLCh affiliationOwnerID[];
-        static const XMLCh Algorithm[];
-        static const XMLCh ArtifactResolutionService[];
-        static const XMLCh AssertionConsumerService[];
-        static const XMLCh AssertionIDRequestService[];
-        static const XMLCh AttributeAuthorityDescriptor[];
-        static const XMLCh AttributeConsumingService[];
-        static const XMLCh AttributeProfile[];
-        static const XMLCh AttributeService[];
-        static const XMLCh AuthnAuthorityDescriptor[];
-        static const XMLCh AuthnQueryService[];
-        static const XMLCh AuthnRequestsSigned[];
-        static const XMLCh AuthzService[];
-        static const XMLCh cacheDuration[];
-        static const XMLCh Company[];
-        static const XMLCh ContactPerson[];
-        static const XMLCh contactType[];
-        static const XMLCh DigestMethod[];
-        static const XMLCh EmailAddress[];
-        static const XMLCh encryption[];
-        static const XMLCh EncryptionMethod[];
-        static const XMLCh EntitiesDescriptor[];
-        static const XMLCh EntityDescriptor[];
-        static const XMLCh entityID[];
-        static const XMLCh errorURL[];
-        static const XMLCh Extensions[];
-        static const XMLCh GivenName[];
-        static const XMLCh IDPSSODescriptor[];
-        static const XMLCh index[];
-        static const XMLCh isDefault[];
-        static const XMLCh isRequired[];
-        static const XMLCh KeyDescriptor[];
-        static const XMLCh KeySize[];
-        static const XMLCh ManageNameIDService[];
-        static const XMLCh _namespace[];
-        static const XMLCh NameFormat[];
-        static const XMLCh NameIDFormat[];
-        static const XMLCh NameIDMappingService[];
-        static const XMLCh OAEParams[];
-        static const XMLCh Organization[];
-        static const XMLCh OrganizationName[];
-        static const XMLCh OrganizationDisplayName[];
-        static const XMLCh OrganizationURL[];
-        static const XMLCh PDPDescriptor[];
-        static const XMLCh protocolSupportEnumeration[];
-        static const XMLCh RequestedAttribute[];
-        static const XMLCh ResponseLocation[];
-        static const XMLCh RoleDescriptor[];
-        static const XMLCh ServiceDescription[];
-        static const XMLCh ServiceName[];
-        static const XMLCh signing[];
-        static const XMLCh SingleLogoutService[];
-        static const XMLCh SingleSignOnService[];
-        static const XMLCh SourceID[];
-        static const XMLCh SPSSODescriptor[];
-        static const XMLCh SurName[];
-        static const XMLCh TelephoneNumber[];
-        static const XMLCh use[];
-        static const XMLCh validUntil[];
-        static const XMLCh WantAuthnRequestsSigned[];
-        static const XMLCh WantAssertionsSigned[];
+        // access control constants
+        static const XMLCh AccessControl[];
+        static const XMLCh AND[];
+        static const XMLCh NOT[];
+        static const XMLCh OR[];
+        static const XMLCh require[];
+        static const XMLCh Rule[];
     };
 };