diff options
-rw-r--r-- | lasso/id-ff/server.c | 2 | ||||
-rw-r--r-- | lasso/id-ff/server.h | 6 | ||||
-rw-r--r-- | lasso/saml-2.0/server.c | 10 | ||||
-rw-r--r-- | lasso/saml-2.0/serverprivate.h | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c index e959376f..882a50b0 100644 --- a/lasso/id-ff/server.c +++ b/lasso/id-ff/server.c @@ -781,7 +781,7 @@ lasso_server_get_encryption_private_key(LassoServer *server) lasso_error_t lasso_server_load_metadata(LassoServer *server, LassoProviderRole role, const gchar *federation_file, const gchar *trusted_roots, GList *blacklisted_entity_ids, - GList **loaded_entity_ids, enum LassoServerLoadMetadataFlag flags) + GList **loaded_entity_ids, LassoServerLoadMetadataFlag flags) { xmlDoc *doc = NULL; xmlNode *root = NULL; diff --git a/lasso/id-ff/server.h b/lasso/id-ff/server.h index 110f5b5e..a1905948 100644 --- a/lasso/id-ff/server.h +++ b/lasso/id-ff/server.h @@ -78,12 +78,12 @@ struct _LassoServerClass { * @LASSO_SERVER_LOAD_METADATA_FLAG_INHERIT_SIGNATURE: when an EntitiesDescriptor is signed, all its * children inherit the trust from this signature and their signature is not checked. */ -enum LassoServerLoadMetadataFlag { +typedef enum { LASSO_SERVER_LOAD_METADATA_FLAG_DEFAULT = 0, LASSO_SERVER_LOAD_METADATA_FLAG_CHECK_ENTITIES_DESCRIPTOR_SIGNATURE = 1, LASSO_SERVER_LOAD_METADATA_FLAG_CHECK_ENTITY_DESCRIPTOR_SIGNATURE = 2, LASSO_SERVER_LOAD_METADATA_FLAG_INHERIT_SIGNATURE = 4 -}; +} LassoServerLoadMetadataFlag; LASSO_EXPORT GType lasso_server_get_type(void); @@ -124,7 +124,7 @@ LASSO_EXPORT lasso_error_t lasso_server_set_encryption_private_key_with_password LASSO_EXPORT lasso_error_t lasso_server_load_metadata(LassoServer *server, LassoProviderRole role, const gchar *federation_file, const gchar *trusted_roots, GList *blacklisted_entity_ids, GList **loaded_entity_ids, - enum LassoServerLoadMetadataFlag flags); + LassoServerLoadMetadataFlag flags); #ifdef __cplusplus } diff --git a/lasso/saml-2.0/server.c b/lasso/saml-2.0/server.c index 75cebecb..f2dc8879 100644 --- a/lasso/saml-2.0/server.c +++ b/lasso/saml-2.0/server.c @@ -114,7 +114,7 @@ _lasso_test_idp_descriptor(xmlNode *node) { static lasso_error_t lasso_saml20_server_load_metadata_entity(LassoServer *server, LassoProviderRole role, xmlDoc *doc, xmlNode *entity, GList *blacklisted_entity_ids, GList **loaded_end, - xmlSecKeysMngr *keys_mngr, enum LassoServerLoadMetadataFlag flags) + xmlSecKeysMngr *keys_mngr, LassoServerLoadMetadataFlag flags) { LassoProvider *provider = NULL; gboolean check_signature = flags & LASSO_SERVER_LOAD_METADATA_FLAG_CHECK_ENTITY_DESCRIPTOR_SIGNATURE; @@ -162,12 +162,12 @@ lasso_saml20_server_load_metadata_entity(LassoServer *server, LassoProviderRole static lasso_error_t lasso_saml20_server_load_metadata_child(LassoServer *server, LassoProviderRole role, xmlDoc *doc, xmlNode *child, GList *blacklisted_entity_ids, - GList **loaded_end, xmlSecKeysMngr *keys_mngr, enum LassoServerLoadMetadataFlag flags); + GList **loaded_end, xmlSecKeysMngr *keys_mngr, LassoServerLoadMetadataFlag flags); static lasso_error_t lasso_saml20_server_load_metadata_entities(LassoServer *server, LassoProviderRole role, xmlDoc *doc, xmlNode *entities, GList *blacklisted_entity_ids, GList **loaded_end, - xmlSecKeysMngr *keys_mngr, enum LassoServerLoadMetadataFlag flags) + xmlSecKeysMngr *keys_mngr, LassoServerLoadMetadataFlag flags) { xmlNode *child; gboolean at_least_one = FALSE; @@ -207,7 +207,7 @@ lasso_saml20_server_load_metadata_entities(LassoServer *server, LassoProviderRol static lasso_error_t lasso_saml20_server_load_metadata_child(LassoServer *server, LassoProviderRole role, xmlDoc *doc, xmlNode *child, GList *blacklisted_entity_ids, GList **loaded_end, - xmlSecKeysMngr *keys_mngr, enum LassoServerLoadMetadataFlag flags) + xmlSecKeysMngr *keys_mngr, LassoServerLoadMetadataFlag flags) { if (xmlSecCheckNodeName(child, BAD_CAST LASSO_SAML2_METADATA_ELEMENT_ENTITY_DESCRIPTOR, @@ -241,7 +241,7 @@ lasso_error_t lasso_saml20_server_load_metadata(LassoServer *server, LassoProviderRole role, xmlDoc *doc, xmlNode *root_node, GList *blacklisted_entity_ids, GList **loaded_entity_ids, - xmlSecKeysMngr *keys_mngr, enum LassoServerLoadMetadataFlag flags) + xmlSecKeysMngr *keys_mngr, LassoServerLoadMetadataFlag flags) { lasso_error_t rc = 0; GList loaded = { .data = NULL, .next = NULL }; diff --git a/lasso/saml-2.0/serverprivate.h b/lasso/saml-2.0/serverprivate.h index 30529d2c..aab2a85e 100644 --- a/lasso/saml-2.0/serverprivate.h +++ b/lasso/saml-2.0/serverprivate.h @@ -36,7 +36,7 @@ int lasso_saml20_server_load_affiliation(LassoServer *server, xmlNode *node); lasso_error_t lasso_saml20_server_load_metadata(LassoServer *server, LassoProviderRole role, xmlDoc *doc, xmlNode *root_node, GList *blacklisted_entity_ids, GList **loaded_entity_ids, xmlSecKeysMngr *keys_mngr, - enum LassoServerLoadMetadataFlag flags); + LassoServerLoadMetadataFlag flags); #ifdef __cplusplus } |