Upgrade to lasso 2.3.6 in order to completely fix the libxml 2.9 dependency
ChangeLog Since 2.3.5: * fix a bug when receiving a signature using the InclusiveNamespaces PrefixList by copying namespace declaration from upper level at the level of the signed node. * fix compilation warning on recent version of GCC
This commit is contained in:
manu
parent
e059e7e469
commit
c6fc7dbcf6
11 changed files with 704 additions and 242 deletions
|
|
@ -1,9 +1,9 @@
|
|||
# $NetBSD: Makefile.common,v 1.6 2012/09/28 11:52:22 obache Exp $
|
||||
# $NetBSD: Makefile.common,v 1.7 2012/10/23 18:16:15 manu Exp $
|
||||
#
|
||||
# used by security/lasso/Makefile
|
||||
# used by security/py-lasso/Makefile
|
||||
|
||||
DISTNAME= lasso-2.3.5
|
||||
DISTNAME= lasso-2.3.6
|
||||
CATEGORIES= security
|
||||
MASTER_SITES= http://dev.entrouvert.org/lasso/
|
||||
|
||||
|
|
|
|||
|
|
@ -1,67 +1,33 @@
|
|||
@comment $NetBSD: PLIST,v 1.7 2011/04/04 08:30:30 manu Exp $
|
||||
lib/pkgconfig/lasso.pc
|
||||
lib/liblasso.la
|
||||
include/lasso/xml/saml-2.0/saml2_action.h
|
||||
include/lasso/xml/saml-2.0/saml2_advice.h
|
||||
include/lasso/xml/saml-2.0/saml2_assertion.h
|
||||
include/lasso/xml/saml-2.0/saml2_attribute.h
|
||||
include/lasso/xml/saml-2.0/saml2_attribute_statement.h
|
||||
include/lasso/xml/saml-2.0/saml2_attribute_value.h
|
||||
include/lasso/xml/saml-2.0/saml2_audience_restriction.h
|
||||
include/lasso/xml/saml-2.0/saml2_authn_context.h
|
||||
include/lasso/xml/saml-2.0/saml2_authn_statement.h
|
||||
include/lasso/xml/saml-2.0/saml2_authz_decision_statement.h
|
||||
include/lasso/xml/saml-2.0/saml2_base_idabstract.h
|
||||
include/lasso/xml/saml-2.0/saml2_condition_abstract.h
|
||||
include/lasso/xml/saml-2.0/saml2_conditions.h
|
||||
include/lasso/xml/saml-2.0/saml2_encrypted_element.h
|
||||
include/lasso/xml/saml-2.0/saml2_evidence.h
|
||||
include/lasso/xml/saml-2.0/saml2_key_info_confirmation_data.h
|
||||
include/lasso/xml/saml-2.0/saml2_name_id.h
|
||||
include/lasso/xml/saml-2.0/saml2_one_time_use.h
|
||||
include/lasso/xml/saml-2.0/saml2_proxy_restriction.h
|
||||
include/lasso/xml/saml-2.0/saml2_statement_abstract.h
|
||||
include/lasso/xml/saml-2.0/saml2_subject_confirmation_data.h
|
||||
include/lasso/xml/saml-2.0/saml2_subject_confirmation.h
|
||||
include/lasso/xml/saml-2.0/saml2_subject.h
|
||||
include/lasso/xml/saml-2.0/saml2_subject_locality.h
|
||||
include/lasso/xml/saml-2.0/saml2_strings.h
|
||||
include/lasso/xml/saml-2.0/saml2_xsd.h
|
||||
include/lasso/xml/saml-2.0/samlp2_artifact_resolve.h
|
||||
include/lasso/xml/saml-2.0/samlp2_artifact_response.h
|
||||
include/lasso/xml/saml-2.0/samlp2_assertion_id_request.h
|
||||
include/lasso/xml/saml-2.0/samlp2_attribute_query.h
|
||||
include/lasso/xml/saml-2.0/samlp2_authn_query.h
|
||||
include/lasso/xml/saml-2.0/samlp2_authn_request.h
|
||||
include/lasso/xml/saml-2.0/samlp2_authz_decision_query.h
|
||||
include/lasso/xml/saml-2.0/samlp2_extensions.h
|
||||
include/lasso/xml/saml-2.0/samlp2_idp_entry.h
|
||||
include/lasso/xml/saml-2.0/samlp2_idp_list.h
|
||||
include/lasso/xml/saml-2.0/samlp2_logout_request.h
|
||||
include/lasso/xml/saml-2.0/samlp2_logout_response.h
|
||||
include/lasso/xml/saml-2.0/samlp2_manage_name_id_request.h
|
||||
include/lasso/xml/saml-2.0/samlp2_manage_name_id_response.h
|
||||
include/lasso/xml/saml-2.0/samlp2_name_id_mapping_request.h
|
||||
include/lasso/xml/saml-2.0/samlp2_name_id_mapping_response.h
|
||||
include/lasso/xml/saml-2.0/samlp2_name_id_policy.h
|
||||
include/lasso/xml/saml-2.0/samlp2_request_abstract.h
|
||||
include/lasso/xml/saml-2.0/samlp2_requested_authn_context.h
|
||||
include/lasso/xml/saml-2.0/samlp2_response.h
|
||||
include/lasso/xml/saml-2.0/samlp2_scoping.h
|
||||
include/lasso/xml/saml-2.0/samlp2_status_code.h
|
||||
include/lasso/xml/saml-2.0/samlp2_status_detail.h
|
||||
include/lasso/xml/saml-2.0/samlp2_status.h
|
||||
include/lasso/xml/saml-2.0/samlp2_status_response.h
|
||||
include/lasso/xml/saml-2.0/samlp2_subject_query_abstract.h
|
||||
include/lasso/xml/saml-2.0/samlp2_terminate.h
|
||||
include/lasso/xml/soap-1.1/soap_body.h
|
||||
include/lasso/xml/soap-1.1/soap_detail.h
|
||||
include/lasso/xml/soap-1.1/soap_fault.h
|
||||
include/lasso/xml/soap-1.1/soap_envelope.h
|
||||
include/lasso/xml/soap-1.1/soap_header.h
|
||||
include/lasso/xml/soap-1.1/xml_soap11.h
|
||||
include/lasso/xml/strings.h
|
||||
include/lasso/xml/xml.h
|
||||
@comment $NetBSD: PLIST,v 1.8 2012/10/23 18:16:15 manu Exp $
|
||||
include/lasso/backward_comp.h
|
||||
include/lasso/ctypes.h
|
||||
include/lasso/debug.h
|
||||
include/lasso/errors.h
|
||||
include/lasso/export.h
|
||||
include/lasso/id-ff/defederation.h
|
||||
include/lasso/id-ff/federation.h
|
||||
include/lasso/id-ff/identity.h
|
||||
include/lasso/id-ff/lecp.h
|
||||
include/lasso/id-ff/login.h
|
||||
include/lasso/id-ff/logout.h
|
||||
include/lasso/id-ff/name_identifier_mapping.h
|
||||
include/lasso/id-ff/name_registration.h
|
||||
include/lasso/id-ff/profile.h
|
||||
include/lasso/id-ff/provider.h
|
||||
include/lasso/id-ff/server.h
|
||||
include/lasso/id-ff/session.h
|
||||
include/lasso/lasso.h
|
||||
include/lasso/lasso_config.h
|
||||
include/lasso/logging.h
|
||||
include/lasso/registry-private.h
|
||||
include/lasso/registry.h
|
||||
include/lasso/saml-2.0/assertion_query.h
|
||||
include/lasso/saml-2.0/ecp.h
|
||||
include/lasso/saml-2.0/name_id_management.h
|
||||
include/lasso/saml-2.0/profile.h
|
||||
include/lasso/saml-2.0/provider.h
|
||||
include/lasso/saml-2.0/saml2_helper.h
|
||||
include/lasso/utils.h
|
||||
include/lasso/xml/ds_key_info.h
|
||||
include/lasso/xml/ds_key_value.h
|
||||
include/lasso/xml/ds_rsa_key_value.h
|
||||
|
|
@ -87,6 +53,59 @@ include/lasso/xml/lib_scoping.h
|
|||
include/lasso/xml/lib_status_response.h
|
||||
include/lasso/xml/lib_subject.h
|
||||
include/lasso/xml/misc_text_node.h
|
||||
include/lasso/xml/saml-2.0/saml2_action.h
|
||||
include/lasso/xml/saml-2.0/saml2_advice.h
|
||||
include/lasso/xml/saml-2.0/saml2_assertion.h
|
||||
include/lasso/xml/saml-2.0/saml2_attribute.h
|
||||
include/lasso/xml/saml-2.0/saml2_attribute_statement.h
|
||||
include/lasso/xml/saml-2.0/saml2_attribute_value.h
|
||||
include/lasso/xml/saml-2.0/saml2_audience_restriction.h
|
||||
include/lasso/xml/saml-2.0/saml2_authn_context.h
|
||||
include/lasso/xml/saml-2.0/saml2_authn_statement.h
|
||||
include/lasso/xml/saml-2.0/saml2_authz_decision_statement.h
|
||||
include/lasso/xml/saml-2.0/saml2_base_idabstract.h
|
||||
include/lasso/xml/saml-2.0/saml2_condition_abstract.h
|
||||
include/lasso/xml/saml-2.0/saml2_conditions.h
|
||||
include/lasso/xml/saml-2.0/saml2_encrypted_element.h
|
||||
include/lasso/xml/saml-2.0/saml2_evidence.h
|
||||
include/lasso/xml/saml-2.0/saml2_key_info_confirmation_data.h
|
||||
include/lasso/xml/saml-2.0/saml2_name_id.h
|
||||
include/lasso/xml/saml-2.0/saml2_one_time_use.h
|
||||
include/lasso/xml/saml-2.0/saml2_proxy_restriction.h
|
||||
include/lasso/xml/saml-2.0/saml2_statement_abstract.h
|
||||
include/lasso/xml/saml-2.0/saml2_strings.h
|
||||
include/lasso/xml/saml-2.0/saml2_subject.h
|
||||
include/lasso/xml/saml-2.0/saml2_subject_confirmation.h
|
||||
include/lasso/xml/saml-2.0/saml2_subject_confirmation_data.h
|
||||
include/lasso/xml/saml-2.0/saml2_subject_locality.h
|
||||
include/lasso/xml/saml-2.0/saml2_xsd.h
|
||||
include/lasso/xml/saml-2.0/samlp2_artifact_resolve.h
|
||||
include/lasso/xml/saml-2.0/samlp2_artifact_response.h
|
||||
include/lasso/xml/saml-2.0/samlp2_assertion_id_request.h
|
||||
include/lasso/xml/saml-2.0/samlp2_attribute_query.h
|
||||
include/lasso/xml/saml-2.0/samlp2_authn_query.h
|
||||
include/lasso/xml/saml-2.0/samlp2_authn_request.h
|
||||
include/lasso/xml/saml-2.0/samlp2_authz_decision_query.h
|
||||
include/lasso/xml/saml-2.0/samlp2_extensions.h
|
||||
include/lasso/xml/saml-2.0/samlp2_idp_entry.h
|
||||
include/lasso/xml/saml-2.0/samlp2_idp_list.h
|
||||
include/lasso/xml/saml-2.0/samlp2_logout_request.h
|
||||
include/lasso/xml/saml-2.0/samlp2_logout_response.h
|
||||
include/lasso/xml/saml-2.0/samlp2_manage_name_id_request.h
|
||||
include/lasso/xml/saml-2.0/samlp2_manage_name_id_response.h
|
||||
include/lasso/xml/saml-2.0/samlp2_name_id_mapping_request.h
|
||||
include/lasso/xml/saml-2.0/samlp2_name_id_mapping_response.h
|
||||
include/lasso/xml/saml-2.0/samlp2_name_id_policy.h
|
||||
include/lasso/xml/saml-2.0/samlp2_request_abstract.h
|
||||
include/lasso/xml/saml-2.0/samlp2_requested_authn_context.h
|
||||
include/lasso/xml/saml-2.0/samlp2_response.h
|
||||
include/lasso/xml/saml-2.0/samlp2_scoping.h
|
||||
include/lasso/xml/saml-2.0/samlp2_status.h
|
||||
include/lasso/xml/saml-2.0/samlp2_status_code.h
|
||||
include/lasso/xml/saml-2.0/samlp2_status_detail.h
|
||||
include/lasso/xml/saml-2.0/samlp2_status_response.h
|
||||
include/lasso/xml/saml-2.0/samlp2_subject_query_abstract.h
|
||||
include/lasso/xml/saml-2.0/samlp2_terminate.h
|
||||
include/lasso/xml/saml_advice.h
|
||||
include/lasso/xml/saml_assertion.h
|
||||
include/lasso/xml/saml_attribute.h
|
||||
|
|
@ -103,48 +122,25 @@ include/lasso/xml/saml_statement_abstract.h
|
|||
include/lasso/xml/saml_subject.h
|
||||
include/lasso/xml/saml_subject_confirmation.h
|
||||
include/lasso/xml/saml_subject_locality.h
|
||||
include/lasso/xml/samlp_request.h
|
||||
include/lasso/xml/saml_subject_statement.h
|
||||
include/lasso/xml/saml_subject_statement_abstract.h
|
||||
include/lasso/xml/samlp_request.h
|
||||
include/lasso/xml/samlp_request_abstract.h
|
||||
include/lasso/xml/samlp_response.h
|
||||
include/lasso/xml/samlp_response_abstract.h
|
||||
include/lasso/xml/samlp_status.h
|
||||
include/lasso/xml/samlp_status_code.h
|
||||
include/lasso/xml/soap-1.1/soap_body.h
|
||||
include/lasso/xml/soap-1.1/soap_detail.h
|
||||
include/lasso/xml/soap-1.1/soap_envelope.h
|
||||
include/lasso/xml/soap-1.1/soap_fault.h
|
||||
include/lasso/xml/soap-1.1/soap_header.h
|
||||
include/lasso/xml/soap-1.1/xml_soap11.h
|
||||
include/lasso/xml/strings.h
|
||||
include/lasso/xml/xml.h
|
||||
include/lasso/xml/xml_enc.h
|
||||
include/lasso/id-ff/defederation.h
|
||||
include/lasso/id-ff/federation.h
|
||||
include/lasso/id-ff/identity.h
|
||||
include/lasso/id-ff/lecp.h
|
||||
include/lasso/id-ff/login.h
|
||||
include/lasso/id-ff/logout.h
|
||||
include/lasso/id-ff/name_identifier_mapping.h
|
||||
include/lasso/id-ff/name_registration.h
|
||||
include/lasso/id-ff/profile.h
|
||||
include/lasso/id-ff/provider.h
|
||||
include/lasso/id-ff/server.h
|
||||
include/lasso/id-ff/session.h
|
||||
include/lasso/saml-2.0/assertion_query.h
|
||||
include/lasso/saml-2.0/ecp.h
|
||||
include/lasso/saml-2.0/profile.h
|
||||
include/lasso/saml-2.0/name_id_management.h
|
||||
include/lasso/saml-2.0/provider.h
|
||||
include/lasso/saml-2.0/saml2_helper.h
|
||||
include/lasso/backward_comp.h
|
||||
include/lasso/ctypes.h
|
||||
include/lasso/export.h
|
||||
include/lasso/lasso.h
|
||||
include/lasso/lasso_config.h
|
||||
include/lasso/logging.h
|
||||
include/lasso/errors.h
|
||||
include/lasso/registry.h
|
||||
include/lasso/debug.h
|
||||
include/lasso/utils.h
|
||||
include/lasso/registry-private.h
|
||||
share/doc/lasso/writing-a-c-sp.txt
|
||||
share/doc/lasso/writing-a-php-sp.txt
|
||||
share/doc/lasso/writing-a-java-sp.txt
|
||||
share/doc/lasso/writing-a-saml2-php-sp.txt
|
||||
lib/liblasso.la
|
||||
lib/pkgconfig/lasso.pc
|
||||
share/doc/lasso/book.rst
|
||||
share/doc/lasso/common-knowledge.rst
|
||||
share/doc/lasso/getting-lasso.rst
|
||||
|
|
@ -155,6 +151,10 @@ share/doc/lasso/liberty-architecture.rst
|
|||
share/doc/lasso/other-profiles.rst
|
||||
share/doc/lasso/preface.rst
|
||||
share/doc/lasso/single-sign-on.rst
|
||||
share/doc/lasso/writing-a-c-sp.txt
|
||||
share/doc/lasso/writing-a-java-sp.txt
|
||||
share/doc/lasso/writing-a-php-sp.txt
|
||||
share/doc/lasso/writing-a-saml2-php-sp.txt
|
||||
share/gtk-doc/html/lasso/annotation-glossary.html
|
||||
share/gtk-doc/html/lasso/api-index.html
|
||||
share/gtk-doc/html/lasso/architecture.html
|
||||
|
|
@ -164,20 +164,11 @@ share/gtk-doc/html/lasso/idwsf.html
|
|||
share/gtk-doc/html/lasso/idwsf2.html
|
||||
share/gtk-doc/html/lasso/index.html
|
||||
share/gtk-doc/html/lasso/index.sgml
|
||||
share/gtk-doc/html/lasso/lasso-Addon-to-SAML-2.0-profile-for-ID-WSF-2.0-bootsraping.html
|
||||
share/gtk-doc/html/lasso/lasso-Base-Strings.html
|
||||
share/gtk-doc/html/lasso/lasso-Error-Codes.html
|
||||
share/gtk-doc/html/lasso/lasso-ID-WSF-1.0-Strings.html
|
||||
share/gtk-doc/html/lasso/lasso-Initialization-functions.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoAssertionQuery.html
|
||||
share/gtk-doc/html/lasso/lasso.html
|
||||
share/gtk-doc/html/lasso/lasso-Addon-to-SAML-20-profile-for-ID-WSF-20-bootsraping.html
|
||||
share/gtk-doc/html/lasso/lasso-ID-WSF-10-Strings.html
|
||||
share/gtk-doc/html/lasso/lasso-SAML-20-Strings.html
|
||||
share/gtk-doc/html/lasso/lasso-SOAP-Binding-utility-function-for-ID-WSF-20.html
|
||||
share/gtk-doc/html/lasso/lasso-Strings-for-ID-FF-12.html
|
||||
share/gtk-doc/html/lasso/lasso-Strings-for-ID-WSF-20.html
|
||||
share/gtk-doc/html/lasso/lasso-Utility-functions-for-ID-WSF-10.html
|
||||
share/gtk-doc/html/lasso/lasso-Utility-functions-for-SAML-20.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoAuthentication.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoDataService.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoDefederation.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoDiscoAuthenticateRequester.html
|
||||
|
|
@ -199,8 +190,8 @@ share/gtk-doc/html/lasso/lasso-LassoDiscoRequestedServiceType.html
|
|||
share/gtk-doc/html/lasso/lasso-LassoDiscoResourceID.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoDiscoResourceOffering.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoDiscoSendSingleLogout.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoDiscovery.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoDiscoServiceInstance.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoDiscovery.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoDsKeyInfo.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoDsKeyValue.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoDsRsaKeyValue.html
|
||||
|
|
@ -213,7 +204,6 @@ share/gtk-doc/html/lasso/lasso-LassoDstQuery.html
|
|||
share/gtk-doc/html/lasso/lasso-LassoDstQueryItem.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoDstQueryResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoEcp.html
|
||||
share/gtk-doc/html/lasso/up.png
|
||||
share/gtk-doc/html/lasso/lasso-LassoFederation.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DataService.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoAbstract.html
|
||||
|
|
@ -224,7 +214,6 @@ share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoRequestedService.html
|
|||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSecurityContext.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoServiceContext.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoServiceType.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2Discovery.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDAssociationAdd.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDAssociationAddResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDAssociationDelete.html
|
||||
|
|
@ -233,7 +222,6 @@ share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDAssociationQuery.html
|
|||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDAssociationQueryResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDDelete.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDDeleteResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIsHelp.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDQuery.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDQueryResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDRegister.html
|
||||
|
|
@ -241,10 +229,11 @@ share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDRegisterResponse.html
|
|||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDReplace.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDReplaceResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMetadata.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2Discovery.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstDataResponseBase.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstDeleteItemBase.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefAppData.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstDeleteResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefAppData.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefCreate.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefCreateItem.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefCreateResponse.html
|
||||
|
|
@ -254,7 +243,6 @@ share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefDelete.html
|
|||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefDeleteItem.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefDeleteResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefItemData.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIsItem.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefModify.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefModifyItem.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefModifyResponse.html
|
||||
|
|
@ -265,7 +253,6 @@ share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefResultQuery.html
|
|||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefTestItem.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRequest.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstResultQueryBase.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIsText.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstTestItemBase.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2ImsIdentityMappingRequest.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2ImsIdentityMappingResponse.html
|
||||
|
|
@ -275,17 +262,16 @@ share/gtk-doc/html/lasso/lasso-LassoIdWsf2Profile.html
|
|||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsAddCollectionRequest.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsAddCollectionResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsAddEntityRequest.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsItemData.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsAddEntityResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsAddKnownEntityRequest.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsAddKnownEntityResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsAddToCollectionRequest.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsGetObjectInfoRequest.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsGetObjectInfoResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsItemData.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsListMembersRequest.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsListMembersResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsNotification.html
|
||||
share/gtk-doc/html/lasso/lasso-registry.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsNotify.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsObject.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsQueryObjectsRequest.html
|
||||
|
|
@ -295,8 +281,8 @@ share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsRemoveEntityRequest.html
|
|||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsRemoveFromCollectionRequest.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsRequestAbstract.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsResolveIdentifierRequest.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsResolveInput.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsResolveIdentifierResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsResolveInput.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsResponseAbstract.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsSetObjectInfoRequest.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsTestMembershipRequest.html
|
||||
|
|
@ -305,7 +291,6 @@ share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2Consent.html
|
|||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2CredentialsContext.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2EndpointUpdate.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2RedirectRequest.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdentity.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2Sender.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2TargetIdentity.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2Timeout.html
|
||||
|
|
@ -316,7 +301,6 @@ share/gtk-doc/html/lasso/lasso-LassoIdWsf2SecToken.html
|
|||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2SecTokenPolicy.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2SecTransitedProviderPath.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsNotification.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2UtilEmpty.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsNotifyResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefAppData.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefCreate.html
|
||||
|
|
@ -327,7 +311,6 @@ share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefDataResponse.html
|
|||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefDelete.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefDeleteItem.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefDeleteResponse.html
|
||||
share/gtk-doc/html/lasso/lasso.devhelp
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefItem.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefItemData.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefModify.html
|
||||
|
|
@ -338,53 +321,43 @@ share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefNotify.html
|
|||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefNotifyResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefQuery.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefQueryItem.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIsInquiry.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefQueryResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefResultQuery.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefSubscription.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefTestItem.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsSubscription.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2UtilEmpty.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2UtilResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2UtilStatus.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdWsf2Utilextension.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIdentity.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoInteractionProfileService.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIsInquiryElement.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLecp.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIsInteractionRequest.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIsInteractionResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIsInteractionStatement.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIsParameter.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIsRedirectRequest.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIsSelect.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoIsUserInteraction.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibAssertion.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibAuthenticationStatement.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibAuthnContext.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibAuthnRequest.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibIDPEntry.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibAuthnRequestEnvelope.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibAuthnResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibAuthnResponseEnvelope.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibFederationTerminationNotification.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibIDPEntries.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibIDPEntry.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibIDPList.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibLogoutRequest.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibLogoutResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibNameIdentifierMappingRequest.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibNameIdentifierMappingResponse.html
|
||||
share/gtk-doc/html/lasso/lasso.devhelp2
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibRegisterNameIdentifierRequest.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibRegisterNameIdentifierResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibRequestAuthnContext.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibScoping.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibStatusResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLibSubject.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLogin.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoLogout.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoMiscTextNode.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoNameIdManagement.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoNameIdentifierMapping.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoNode.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoNameRegistration.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoPersonalProfileService.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoProfile.html
|
||||
|
|
@ -441,7 +414,6 @@ share/gtk-doc/html/lasso/lasso-LassoSamlp2ArtifactResolve.html
|
|||
share/gtk-doc/html/lasso/lasso-LassoSamlp2ArtifactResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSamlp2AssertionIDRequest.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSamlp2AttributeQuery.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSamlpStatus.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSamlp2AuthnQuery.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSamlp2AuthnRequest.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSamlp2AuthzDecisionQuery.html
|
||||
|
|
@ -469,16 +441,17 @@ share/gtk-doc/html/lasso/lasso-LassoSamlpRequest.html
|
|||
share/gtk-doc/html/lasso/lasso-LassoSamlpRequestAbstract.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSamlpResponse.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSamlpResponseAbstract.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSamlpStatus.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSamlpStatusCode.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSecResourceAccessStatement.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoServer.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSession.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSoapBindingConsent.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSoapBindingCorrelation.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSoapBindingExtTimeout.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSoapBindingExtCredential.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSoapBindingExtCredentialsContext.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSoapBindingExtServiceInstanceUpdate.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSoapBindingExtTimeout.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSoapBindingProcessingContext.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSoapBindingProvider.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoSoapBindingUsageDirective.html
|
||||
|
|
@ -504,10 +477,36 @@ share/gtk-doc/html/lasso/lasso-LassoWsSec1SecurityTokenReference.html
|
|||
share/gtk-doc/html/lasso/lasso-LassoWsSec1TransformationParameters.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoWsUtil1Timestamp.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoWsfProfile.html
|
||||
share/gtk-doc/html/lasso/lasso-LassoWsseUsernameToken.html
|
||||
share/gtk-doc/html/lasso/lasso-SAML-2.0-Strings.html
|
||||
share/gtk-doc/html/lasso/lasso-SOAP-Binding-utility-function-for-ID-WSF-2.0.html
|
||||
share/gtk-doc/html/lasso/lasso-Strings-for-ID-FF-1.2.html
|
||||
share/gtk-doc/html/lasso/lasso-Strings-for-ID-WSF-2.0.html
|
||||
share/gtk-doc/html/lasso/lasso-Strings-for-SOAP.html
|
||||
share/gtk-doc/html/lasso/lasso-Strings-for-WS-*.html
|
||||
share/gtk-doc/html/lasso/lasso-Strings-for-XML-DSIG.html
|
||||
share/gtk-doc/html/lasso/lasso-Utility-functions-for-ID-WSF-1.0.html
|
||||
share/gtk-doc/html/lasso/lasso-Utility-functions-for-SAML-2.0.html
|
||||
share/gtk-doc/html/lasso/lasso-assertion-query.html
|
||||
share/gtk-doc/html/lasso/lasso-authentication.html
|
||||
share/gtk-doc/html/lasso/lasso-is-help.html
|
||||
share/gtk-doc/html/lasso/lasso-is-inquiry-element.html
|
||||
share/gtk-doc/html/lasso/lasso-is-inquiry.html
|
||||
share/gtk-doc/html/lasso/lasso-is-interaction-request.html
|
||||
share/gtk-doc/html/lasso/lasso-is-interaction-response.html
|
||||
share/gtk-doc/html/lasso/lasso-is-interaction-statement.html
|
||||
share/gtk-doc/html/lasso/lasso-is-item.html
|
||||
share/gtk-doc/html/lasso/lasso-is-parameter.html
|
||||
share/gtk-doc/html/lasso/lasso-is-redirect-request.html
|
||||
share/gtk-doc/html/lasso/lasso-is-select.html
|
||||
share/gtk-doc/html/lasso/lasso-is-text.html
|
||||
share/gtk-doc/html/lasso/lasso-is-user-interaction.html
|
||||
share/gtk-doc/html/lasso/lasso-login.html
|
||||
share/gtk-doc/html/lasso/lasso-node.html
|
||||
share/gtk-doc/html/lasso/lasso-registry.html
|
||||
share/gtk-doc/html/lasso/lasso-wsse-username-token.html
|
||||
share/gtk-doc/html/lasso/lasso.devhelp
|
||||
share/gtk-doc/html/lasso/lasso.devhelp2
|
||||
share/gtk-doc/html/lasso/lasso.html
|
||||
share/gtk-doc/html/lasso/left.png
|
||||
share/gtk-doc/html/lasso/pt01.html
|
||||
share/gtk-doc/html/lasso/right.png
|
||||
|
|
@ -515,6 +514,7 @@ share/gtk-doc/html/lasso/rn01.html
|
|||
share/gtk-doc/html/lasso/saml2.html
|
||||
share/gtk-doc/html/lasso/soap.html
|
||||
share/gtk-doc/html/lasso/style.css
|
||||
share/gtk-doc/html/lasso/up.png
|
||||
share/gtk-doc/html/lasso/ws-addr.html
|
||||
share/gtk-doc/html/lasso/xml-dsig.html
|
||||
share/gtk-doc/html/lasso/xml-idff.html
|
||||
|
|
|
|||
|
|
@ -1,12 +1,16 @@
|
|||
$NetBSD: distinfo,v 1.11 2012/09/28 11:59:18 obache Exp $
|
||||
$NetBSD: distinfo,v 1.12 2012/10/23 18:16:15 manu Exp $
|
||||
|
||||
SHA1 (lasso-2.3.5.tar.gz) = 3ba022e85a2d05cd00e45d41f8f59a94b71b75b0
|
||||
RMD160 (lasso-2.3.5.tar.gz) = 24660682b34c38a556b9ea902066cc9b0f74e9a7
|
||||
Size (lasso-2.3.5.tar.gz) = 3907467 bytes
|
||||
SHA1 (lasso-2.3.6.tar.gz) = 92689a873b83e02efb4a6c3a375f040a9e75c95c
|
||||
RMD160 (lasso-2.3.6.tar.gz) = 5e1aaba807d453c1fad28be6a8f06d908159b3fe
|
||||
Size (lasso-2.3.6.tar.gz) = 3940027 bytes
|
||||
SHA1 (patch-bindings-java-wrapper_top.c) = 16f98d5edb21ca97f05a3d108a04da8be2ec2ed4
|
||||
SHA1 (patch-bindings-php5-wrapper_source_top.c) = 21c92807633ce96188f6bbdf72129d16f5784f19
|
||||
SHA1 (patch-bindings-python-wrapper_top.c) = db730c2443e1a618f0719cd190a30a2bba241961
|
||||
SHA1 (patch-docs-reference-lasso-lasso-sections.txt) = 9e6936b0c019b8fb8b9493f914241131b684cbfc
|
||||
SHA1 (patch-lasso-errors_c) = 5c0fe304cd9cce6d926362c248ffe60c2c7357c5
|
||||
SHA1 (patch-lasso-errors_c_in) = d4663edb280d38a0cb1a422d9b95b1d344012f63
|
||||
SHA1 (patch-lasso-id-ff-provider.c) = 9312c67a8e81eeea95b888745a2b9f504a36a36f
|
||||
SHA1 (patch-lasso-xml-tools.c) = 1cbc77b8fb9e6a4ecf0c1fe5017cca2782f343e4
|
||||
SHA1 (patch-lasso_id-ff_lecp.c) = c19d443664e6a68f37573d54add51998ffa2622b
|
||||
SHA1 (patch-lasso_id-ff_session.c) = 9fd9c5f413e96f24658c897e9ac10b5c6df253bd
|
||||
SHA1 (patch-lasso_saml-2.0_ecp.c) = 135f10c1d8b146963f0ccaa74ab5b871317b3111
|
||||
SHA1 (patch-lasso-xml-tools.c) = fa0feb771cfdec56bd76fdc9e3d65eae4a78332f
|
||||
SHA1 (patch-lasso_id-ff_lecp.c) = 90b0d3b06a6582f779706b671c497ad7a556a116
|
||||
SHA1 (patch-lasso_id-ff_session.c) = 839277d013e219c5ba91bae1ab75cef5d99d9286
|
||||
SHA1 (patch-lasso_saml-2.0_ecp.c) = cb946f383b9d3fed4ce794deb96a143077746a2c
|
||||
|
|
|
|||
74
security/lasso/patches/patch-bindings-java-wrapper_top.c
Normal file
74
security/lasso/patches/patch-bindings-java-wrapper_top.c
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
$NetBSD: patch-bindings-java-wrapper_top.c,v 1.1 2012/10/23 18:16:15 manu Exp $
|
||||
|
||||
Patch from upstream to support libxml >= 2.9.0. From commit message:
|
||||
|
||||
Libxml stopped exposing the internal of the xmlOutputBuffer structure;
|
||||
it was replace by proper use of the API and of the xmlBuffer structure.
|
||||
|
||||
There could be regression for older version of libxml as some functions
|
||||
appeared in recent version of libxml; but the reference API document
|
||||
does not give any introduction date for functions so it's hard to be
|
||||
sure.
|
||||
|
||||
diff --git a/bindings/java/wrapper_top.c b/bindings/java/wrapper_top.c
|
||||
index dfdec34..54bdeef 100644
|
||||
--- bindings/java/wrapper_top.c
|
||||
+++ bindings/java/wrapper_top.c
|
||||
@@ -282,35 +282,39 @@ jstring_to_string(JNIEnv *env, jstring jstr, char **str) {
|
||||
|
||||
|
||||
/* xmlNode handling */
|
||||
+static xmlBuffer*
|
||||
+xmlnode_to_xmlbuffer(xmlNode *node)
|
||||
+{
|
||||
+ xmlOutputBufferPtr output_buffer;
|
||||
+ xmlBuffer *buffer;
|
||||
+
|
||||
+ if (! node)
|
||||
+ return NULL;
|
||||
+
|
||||
+ buffer = xmlBufferCreate();
|
||||
+ output_buffer = xmlOutputBufferCreateBuffer(buffer, NULL);
|
||||
+ xmlNodeDumpOutput(output_buffer, NULL, node, 0, 0, NULL);
|
||||
+ xmlOutputBufferClose(output_buffer);
|
||||
+ xmlBufferAdd(buffer, BAD_CAST "", 1);
|
||||
+
|
||||
+ return buffer;
|
||||
+}
|
||||
+
|
||||
static int
|
||||
xml_node_to_jstring(JNIEnv *env, xmlNode *xmlnode, jstring *jstr) {
|
||||
- xmlOutputBufferPtr buf = NULL;
|
||||
+ xmlBuffer *buffer;
|
||||
|
||||
g_error_if_fail(env);
|
||||
if (! xmlnode) {
|
||||
*jstr = NULL;
|
||||
return 1;
|
||||
}
|
||||
-
|
||||
- buf = xmlAllocOutputBuffer(NULL);
|
||||
- if (buf) {
|
||||
- int ret = 1;
|
||||
- xmlNodeDumpOutput(buf, NULL, xmlnode, 0, 1, NULL);
|
||||
- xmlOutputBufferFlush(buf);
|
||||
- xmlChar *str = NULL;
|
||||
- if (buf->conv == NULL) {
|
||||
- str = buf->buffer->content;
|
||||
- } else {
|
||||
- str = buf->conv->content;
|
||||
- }
|
||||
- ret = string_to_jstring(env, (char*)str, jstr);
|
||||
- xmlOutputBufferClose(buf);
|
||||
- return ret;
|
||||
- } else {
|
||||
+ buffer = xmlnode_to_xmlbuffer(xmlnode);
|
||||
+ if (! buffer) {
|
||||
exception(env, "could not alloc an xml output buffer");
|
||||
return 0;
|
||||
}
|
||||
- return 1;
|
||||
+ return string_to_jstring(env, (char*)xmlBufferContent(buffer), jstr);
|
||||
}
|
||||
|
||||
/** Convert a java string to an xml node. Return 0 if it failed with an exception
|
||||
|
|
@ -0,0 +1,74 @@
|
|||
$NetBSD: patch-bindings-php5-wrapper_source_top.c,v 1.1 2012/10/23 18:16:15 manu Exp $
|
||||
|
||||
Patch from upstream to support libxml >= 2.9.0. From commit message:
|
||||
|
||||
Libxml stopped exposing the internal of the xmlOutputBuffer structure;
|
||||
it was replace by proper use of the API and of the xmlBuffer structure.
|
||||
|
||||
There could be regression for older version of libxml as some functions
|
||||
appeared in recent version of libxml; but the reference API document
|
||||
does not give any introduction date for functions so it's hard to be
|
||||
sure.
|
||||
|
||||
diff --git a/bindings/php5/wrapper_source_top.c b/bindings/php5/wrapper_source_top.c
|
||||
index 67a279a..0b1db97 100644
|
||||
--- bindings/php5/wrapper_source_top.c
|
||||
+++ bindings/php5/wrapper_source_top.c
|
||||
@@ -119,31 +119,41 @@ free_glist(GList **list, GFunc free_function) {
|
||||
}
|
||||
/* Conversion functions */
|
||||
|
||||
+static xmlBuffer*
|
||||
+xmlnode_to_xmlbuffer(xmlNode *node)
|
||||
+{
|
||||
+ xmlOutputBufferPtr output_buffer;
|
||||
+ xmlBuffer *buffer;
|
||||
+
|
||||
+ if (! node)
|
||||
+ return NULL;
|
||||
+
|
||||
+ buffer = xmlBufferCreate();
|
||||
+ output_buffer = xmlOutputBufferCreateBuffer(buffer, NULL);
|
||||
+ xmlNodeDumpOutput(output_buffer, NULL, node, 0, 0, NULL);
|
||||
+ xmlOutputBufferClose(output_buffer);
|
||||
+ xmlBufferAdd(buffer, BAD_CAST "", 1);
|
||||
+
|
||||
+ return buffer;
|
||||
+}
|
||||
+
|
||||
static char*
|
||||
get_string_from_xml_node(xmlNode *xmlnode)
|
||||
{
|
||||
- xmlOutputBufferPtr buf;
|
||||
- char *xmlString;
|
||||
+ xmlBuffer *buffer;
|
||||
+ char *result;
|
||||
|
||||
if (xmlnode == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
-
|
||||
- buf = xmlAllocOutputBuffer(NULL);
|
||||
- if (buf == NULL) {
|
||||
- xmlString = NULL;
|
||||
+ buffer = xmlnode_to_xmlbuffer(xmlnode);
|
||||
+ if (buffer == NULL) {
|
||||
+ result = NULL;
|
||||
} else {
|
||||
- xmlNodeDumpOutput(buf, NULL, xmlnode, 0, 1, NULL);
|
||||
- xmlOutputBufferFlush(buf);
|
||||
- if (buf->conv == NULL) {
|
||||
- xmlString = estrdup((char*)buf->buffer->content);
|
||||
- } else {
|
||||
- xmlString = estrdup((char*)buf->conv->content);
|
||||
- }
|
||||
- xmlOutputBufferClose(buf);
|
||||
+ result = estrdup((char*)xmlBufferContent(buffer));
|
||||
+ xmlBufferFree(buffer);
|
||||
}
|
||||
-
|
||||
- return xmlString;
|
||||
+ return result;
|
||||
}
|
||||
|
||||
static xmlNode*
|
||||
68
security/lasso/patches/patch-bindings-python-wrapper_top.c
Normal file
68
security/lasso/patches/patch-bindings-python-wrapper_top.c
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
$NetBSD: patch-bindings-python-wrapper_top.c,v 1.1 2012/10/23 18:16:15 manu Exp $
|
||||
|
||||
Patch from upstream to support libxml >= 2.9.0. From commit message:
|
||||
|
||||
Libxml stopped exposing the internal of the xmlOutputBuffer structure;
|
||||
it was replace by proper use of the API and of the xmlBuffer structure.
|
||||
|
||||
There could be regression for older version of libxml as some functions
|
||||
appeared in recent version of libxml; but the reference API document
|
||||
does not give any introduction date for functions so it's hard to be
|
||||
sure.
|
||||
|
||||
diff --git a/bindings/python/wrapper_top.c b/bindings/python/wrapper_top.c
|
||||
index 7879bb1..2c68437 100644
|
||||
--- bindings/python/wrapper_top.c
|
||||
+++ bindings/python/wrapper_top.c
|
||||
@@ -103,28 +103,40 @@ get_dict_from_hashtable_of_strings(GHashTable *value)
|
||||
return proxy;
|
||||
}
|
||||
|
||||
+static xmlBuffer*
|
||||
+xmlnode_to_xmlbuffer(xmlNode *node)
|
||||
+{
|
||||
+ xmlOutputBufferPtr output_buffer;
|
||||
+ xmlBuffer *buffer;
|
||||
+
|
||||
+ if (! node)
|
||||
+ return NULL;
|
||||
+
|
||||
+ buffer = xmlBufferCreate();
|
||||
+ output_buffer = xmlOutputBufferCreateBuffer(buffer, NULL);
|
||||
+ xmlNodeDumpOutput(output_buffer, NULL, node, 0, 0, NULL);
|
||||
+ xmlOutputBufferClose(output_buffer);
|
||||
+ xmlBufferAdd(buffer, BAD_CAST "", 1);
|
||||
+
|
||||
+ return buffer;
|
||||
+}
|
||||
+
|
||||
static PyObject*
|
||||
get_pystring_from_xml_node(xmlNode *xmlnode)
|
||||
{
|
||||
- xmlOutputBufferPtr buf;
|
||||
PyObject *pystring = NULL;
|
||||
+ xmlBuffer *buffer;
|
||||
|
||||
if (xmlnode == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
+ buffer = xmlnode_to_xmlbuffer(xmlnode);
|
||||
|
||||
- buf = xmlAllocOutputBuffer(NULL);
|
||||
- if (buf == NULL) {
|
||||
+ if (buffer == NULL) {
|
||||
pystring = NULL;
|
||||
} else {
|
||||
- xmlNodeDumpOutput(buf, NULL, xmlnode, 0, 1, NULL);
|
||||
- xmlOutputBufferFlush(buf);
|
||||
- if (buf->conv == NULL) {
|
||||
- pystring = PyString_FromString((char*)buf->buffer->content);
|
||||
- } else {
|
||||
- pystring = PyString_FromString((char*)buf->conv->content);
|
||||
- }
|
||||
- xmlOutputBufferClose(buf);
|
||||
+ pystring = PyString_FromString((char*)xmlBufferContent(buffer));
|
||||
+ xmlBufferFree(buffer);
|
||||
}
|
||||
|
||||
return pystring;
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
$NetBSD: patch-docs-reference-lasso-lasso-sections.txt,v 1.1 2012/10/23 18:16:15 manu Exp $
|
||||
|
||||
Patch from upstream to support libxml >= 2.9.0. From commit message:
|
||||
|
||||
Libxml stopped exposing the internal of the xmlOutputBuffer structure;
|
||||
it was replace by proper use of the API and of the xmlBuffer structure.
|
||||
|
||||
There could be regression for older version of libxml as some functions
|
||||
appeared in recent version of libxml; but the reference API document
|
||||
does not give any introduction date for functions so it's hard to be
|
||||
sure.
|
||||
|
||||
diff --git a/docs/reference/lasso/lasso-sections.txt b/docs/reference/lasso/lasso-sections.txt
|
||||
index 74d998a..ee44d06 100644
|
||||
--- docs/reference/lasso/lasso-sections.txt
|
||||
+++ docs/reference/lasso/lasso-sections.txt
|
||||
@@ -1,4 +1,10 @@
|
||||
<SECTION>
|
||||
+<FILE>utilities</FILE>
|
||||
+<TITLE>Utilities</TITLE>
|
||||
+LassoServe_CLASS
|
||||
+</SECTION>
|
||||
+
|
||||
+<SECTION>
|
||||
<FILE>server</FILE>
|
||||
<TITLE>LassoServer</TITLE>
|
||||
LassoServer
|
||||
@@ -6060,7 +6066,7 @@ LASSO_PROVIDER_ERROR_MISSING_PUBLIC_KEY
|
||||
</SECTION>
|
||||
|
||||
<SECTION>
|
||||
-<FILE>init</FILE>
|
||||
+<FILE>lasso</FILE>
|
||||
<TITLE>Initialization functions</TITLE>
|
||||
LASSO_EXPORT
|
||||
LASSO_EXPORT_VAR
|
||||
|
|
@ -1,64 +1,147 @@
|
|||
$NetBSD: patch-lasso-xml-tools.c,v 1.2 2012/09/28 11:59:18 obache Exp $
|
||||
$NetBSD: patch-lasso-xml-tools.c,v 1.3 2012/10/23 18:16:15 manu Exp $
|
||||
|
||||
* XXX
|
||||
* for libxml>=2.9.0
|
||||
Patch from upstream to support libxml >= 2.9.0. From commit message:
|
||||
|
||||
--- lasso/xml/tools.c.orig 2011-01-05 13:57:32.000000000 +0000
|
||||
Libxml stopped exposing the internal of the xmlOutputBuffer structure;
|
||||
it was replace by proper use of the API and of the xmlBuffer structure.
|
||||
|
||||
There could be regression for older version of libxml as some functions
|
||||
appeared in recent version of libxml; but the reference API document
|
||||
does not give any introduction date for functions so it's hard to be
|
||||
sure.
|
||||
|
||||
diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c
|
||||
index c4b3c8a..cda8775 100644
|
||||
--- lasso/xml/tools.c
|
||||
+++ lasso/xml/tools.c
|
||||
@@ -27,6 +27,7 @@
|
||||
/* permit importation of timegm for glibc2, wait for people to complain it does not work on their
|
||||
* system. */
|
||||
#define _BSD_SOURCE
|
||||
+#define _NETBSD_SOURCE
|
||||
#include "private.h"
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
@@ -1063,7 +1064,7 @@ lasso_node_build_deflated_query(LassoNod
|
||||
buf = xmlAllocOutputBuffer(handler);
|
||||
xmlNodeDumpOutput(buf, NULL, xmlnode, 0, 0, "utf-8");
|
||||
xmlOutputBufferFlush(buf);
|
||||
- buffer = buf->conv ? buf->conv->content : buf->buffer->content;
|
||||
+ buffer = xmlBufferContent(buf->conv ? buf->conv : buf->buffer);
|
||||
@@ -36,6 +36,7 @@
|
||||
#include <libxml/uri.h>
|
||||
#include <libxml/parser.h>
|
||||
#include <libxml/parserInternals.h>
|
||||
+#include <libxml/xmlIO.h>
|
||||
|
||||
xmlFreeNode(xmlnode);
|
||||
xmlnode = NULL;
|
||||
@@ -1196,6 +1197,11 @@ lasso_concat_url_query(const char *url,
|
||||
*
|
||||
* Return value: TRUE if no error occurred during evaluation, FALSE otherwise.
|
||||
*/
|
||||
+static void
|
||||
+structuredErrorFunc (void *userData, xmlErrorPtr error) {
|
||||
+ *(int *)userData = error->code;
|
||||
#include <openssl/pem.h>
|
||||
#include <openssl/sha.h>
|
||||
@@ -1043,38 +1044,30 @@ lasso_sign_node(xmlNode *xmlnode, const char *id_attr_name, const char *id_value
|
||||
return 0;
|
||||
}
|
||||
|
||||
-gchar*
|
||||
-lasso_node_build_deflated_query(LassoNode *node)
|
||||
+static gchar*
|
||||
+lasso_xmlnode_build_deflated_query(xmlNode *xmlnode)
|
||||
{
|
||||
- /* actually deflated and b64'ed and url-escaped */
|
||||
- xmlNode *xmlnode;
|
||||
- xmlOutputBufferPtr buf;
|
||||
- xmlCharEncodingHandlerPtr handler = NULL;
|
||||
- xmlChar *buffer;
|
||||
+ xmlOutputBuffer *output_buffer;
|
||||
+ xmlBuffer *buffer;
|
||||
xmlChar *ret, *b64_ret;
|
||||
char *rret;
|
||||
unsigned long in_len;
|
||||
int rc = 0;
|
||||
z_stream stream;
|
||||
|
||||
- xmlnode = lasso_node_get_xmlNode(node, FALSE);
|
||||
-
|
||||
- handler = xmlFindCharEncodingHandler("utf-8");
|
||||
- buf = xmlAllocOutputBuffer(handler);
|
||||
- xmlNodeDumpOutput(buf, NULL, xmlnode, 0, 0, "utf-8");
|
||||
- xmlOutputBufferFlush(buf);
|
||||
- buffer = buf->conv ? buf->conv->content : buf->buffer->content;
|
||||
-
|
||||
- xmlFreeNode(xmlnode);
|
||||
- xmlnode = NULL;
|
||||
-
|
||||
- in_len = strlen((char*)buffer);
|
||||
+ buffer = xmlBufferCreate();
|
||||
+ output_buffer = xmlOutputBufferCreateBuffer(buffer, NULL);
|
||||
+ xmlNodeDumpOutput(output_buffer, NULL, xmlnode, 0, 0, NULL);
|
||||
+ xmlOutputBufferClose(output_buffer);
|
||||
+ xmlBufferAdd(buffer, BAD_CAST "", 1);
|
||||
+ lasso_release_xml_node(xmlnode);
|
||||
+ in_len = strlen((char*)xmlBufferContent(buffer));
|
||||
ret = g_malloc(in_len * 2);
|
||||
/* deflating should never increase the required size but we are
|
||||
* more conservative than that. Twice the size should be
|
||||
* enough. */
|
||||
|
||||
- stream.next_in = buffer;
|
||||
+ stream.next_in = (xmlChar*)xmlBufferContent(buffer);
|
||||
stream.avail_in = in_len;
|
||||
stream.next_out = ret;
|
||||
stream.avail_out = in_len * 2;
|
||||
@@ -1097,6 +1090,7 @@ lasso_node_build_deflated_query(LassoNode *node)
|
||||
rc = deflateEnd(&stream);
|
||||
}
|
||||
}
|
||||
+ xmlBufferFree(buffer);
|
||||
if (rc != Z_OK) {
|
||||
lasso_release(ret);
|
||||
message(G_LOG_LEVEL_CRITICAL, "Failed to deflate");
|
||||
@@ -1104,7 +1098,6 @@ lasso_node_build_deflated_query(LassoNode *node)
|
||||
}
|
||||
|
||||
b64_ret = xmlSecBase64Encode(ret, stream.total_out, 0);
|
||||
- xmlOutputBufferClose(buf);
|
||||
lasso_release(ret);
|
||||
|
||||
ret = xmlURIEscapeStr(b64_ret, NULL);
|
||||
@@ -1115,6 +1108,20 @@ lasso_node_build_deflated_query(LassoNode *node)
|
||||
return rret;
|
||||
}
|
||||
|
||||
+gchar*
|
||||
+lasso_node_build_deflated_query(LassoNode *node)
|
||||
+{
|
||||
+ /* actually deflated and b64'ed and url-escaped */
|
||||
+ xmlNode *xmlnode;
|
||||
+ gchar *result;
|
||||
+
|
||||
+ xmlnode = lasso_node_get_xmlNode(node, FALSE);
|
||||
+ result = lasso_xmlnode_build_deflated_query(xmlnode);
|
||||
+ xmlFreeNode(xmlnode);
|
||||
+ return result;
|
||||
+}
|
||||
+
|
||||
+
|
||||
gboolean
|
||||
lasso_eval_xpath_expression(xmlXPathContextPtr xpath_ctx, const char *expression,
|
||||
xmlXPathObjectPtr *xpath_object_ptr, int *xpath_error_code)
|
||||
@@ -1205,10 +1211,6 @@ lasso_eval_xpath_expression(xmlXPathCont
|
||||
xmlStructuredErrorFunc oldStructuredErrorFunc;
|
||||
gboolean rc = TRUE;
|
||||
lasso_node_init_from_deflated_query_part(LassoNode *node, char *deflate_string)
|
||||
{
|
||||
@@ -2144,22 +2151,21 @@ cleanup:
|
||||
char*
|
||||
lasso_xmlnode_to_string(xmlNode *node, gboolean format, int level)
|
||||
{
|
||||
- xmlOutputBufferPtr buf;
|
||||
- xmlCharEncodingHandlerPtr handler = NULL;
|
||||
- xmlChar *buffer;
|
||||
+ xmlOutputBufferPtr output_buffer;
|
||||
+ xmlBuffer *buffer;
|
||||
char *str;
|
||||
|
||||
- void structuredErrorFunc (G_GNUC_UNUSED void *userData, xmlErrorPtr error) {
|
||||
- errorCode = error->code;
|
||||
- }
|
||||
-
|
||||
g_return_val_if_fail(xpath_ctx != NULL && expression != NULL, FALSE);
|
||||
if (! node)
|
||||
return NULL;
|
||||
|
||||
if (xpath_error_code) { /* reset */
|
||||
@@ -1216,6 +1218,7 @@ lasso_eval_xpath_expression(xmlXPathCont
|
||||
}
|
||||
oldStructuredErrorFunc = xpath_ctx->error;
|
||||
xpath_ctx->error = structuredErrorFunc;
|
||||
+ xpath_ctx->userData = &errorCode;
|
||||
xpath_object = xmlXPathEvalExpression((xmlChar*)expression, xpath_ctx);
|
||||
xpath_ctx->error = oldStructuredErrorFunc;
|
||||
|
||||
@@ -2156,7 +2159,7 @@ lasso_xmlnode_to_string(xmlNode *node, g
|
||||
buf = xmlAllocOutputBuffer(handler);
|
||||
xmlNodeDumpOutput(buf, NULL, node, level, format ? 1 : 0, "utf-8");
|
||||
xmlOutputBufferFlush(buf);
|
||||
- handler = xmlFindCharEncodingHandler("utf-8");
|
||||
- buf = xmlAllocOutputBuffer(handler);
|
||||
- xmlNodeDumpOutput(buf, NULL, node, level, format ? 1 : 0, "utf-8");
|
||||
- xmlOutputBufferFlush(buf);
|
||||
- buffer = buf->conv ? buf->conv->content : buf->buffer->content;
|
||||
+ buffer = xmlBufferContent(buf->conv ? buf->conv : buf->buffer);
|
||||
+ buffer = xmlBufferCreate();
|
||||
+ output_buffer = xmlOutputBufferCreateBuffer(buffer, NULL);
|
||||
+ xmlNodeDumpOutput(output_buffer, NULL, node, level, format ? 1 : 0, NULL);
|
||||
+ xmlOutputBufferClose(output_buffer);
|
||||
+ xmlBufferAdd(buffer, BAD_CAST "", 1);
|
||||
/* do not mix XML and GLib strings, so we must copy */
|
||||
str = g_strdup((char*)buffer);
|
||||
xmlOutputBufferClose(buf);
|
||||
- str = g_strdup((char*)buffer);
|
||||
- xmlOutputBufferClose(buf);
|
||||
+ str = g_strdup((char*)xmlBufferContent(buffer));
|
||||
+ xmlBufferFree(buffer);
|
||||
|
||||
return str;
|
||||
}
|
||||
--
|
||||
1.7.4.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,24 +1,68 @@
|
|||
$NetBSD: patch-lasso_id-ff_lecp.c,v 1.1 2012/09/28 11:59:18 obache Exp $
|
||||
$NetBSD: patch-lasso_id-ff_lecp.c,v 1.2 2012/10/23 18:16:15 manu Exp $
|
||||
|
||||
* for libxml2>=2.9.0
|
||||
Patch from upstream to support libxml >= 2.9.0. From commit message:
|
||||
|
||||
--- lasso/id-ff/lecp.c.orig 2011-01-05 13:57:32.000000000 +0000
|
||||
Libxml stopped exposing the internal of the xmlOutputBuffer structure;
|
||||
it was replace by proper use of the API and of the xmlBuffer structure.
|
||||
|
||||
There could be regression for older version of libxml as some functions
|
||||
appeared in recent version of libxml; but the reference API document
|
||||
does not give any introduction date for functions so it's hard to be
|
||||
sure.
|
||||
|
||||
diff --git a/lasso/id-ff/lecp.c b/lasso/id-ff/lecp.c
|
||||
index 6ca9515..1dd53b6 100644
|
||||
--- lasso/id-ff/lecp.c
|
||||
+++ lasso/id-ff/lecp.c
|
||||
@@ -96,7 +96,7 @@ lasso_lecp_build_authn_request_envelope_
|
||||
xmlOutputBufferFlush(buf);
|
||||
@@ -58,8 +58,6 @@ lasso_lecp_build_authn_request_envelope_msg(LassoLecp *lecp)
|
||||
LassoProfile *profile;
|
||||
gchar *assertionConsumerServiceURL;
|
||||
xmlNode *msg;
|
||||
- xmlOutputBuffer *buf;
|
||||
- xmlCharEncodingHandler *handler;
|
||||
|
||||
lasso_assign_string(profile->msg_body,
|
||||
g_return_val_if_fail(LASSO_IS_LECP(lecp), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
|
||||
|
||||
@@ -89,16 +87,7 @@ lasso_lecp_build_authn_request_envelope_msg(LassoLecp *lecp)
|
||||
LASSO_PROFILE(lecp)->server->certificate;
|
||||
msg = lasso_node_get_xmlNode(LASSO_NODE(lecp->authnRequestEnvelope), FALSE);
|
||||
|
||||
- /* msg is not SOAP but straight XML */
|
||||
- handler = xmlFindCharEncodingHandler("utf-8");
|
||||
- buf = xmlAllocOutputBuffer(handler);
|
||||
- xmlNodeDumpOutput(buf, NULL, msg, 0, 0, "utf-8");
|
||||
- xmlOutputBufferFlush(buf);
|
||||
-
|
||||
- lasso_assign_string(profile->msg_body,
|
||||
- (char*)(buf->conv ? buf->conv->content : buf->buffer->content));
|
||||
+ (char*)(xmlBufferContent(buf->conv ? buf->conv : buf->buffer)));
|
||||
xmlOutputBufferClose(buf);
|
||||
xmlFreeNode(msg);
|
||||
- xmlOutputBufferClose(buf);
|
||||
- xmlFreeNode(msg);
|
||||
+ lasso_assign_new_string(profile->msg_body, lasso_xmlnode_to_string(msg, 0, 0))
|
||||
|
||||
@@ -342,7 +342,7 @@ lasso_lecp_process_authn_request_envelop
|
||||
xmlNodeDumpOutput(buf, NULL, soap_envelope, 0, 0, "utf-8");
|
||||
xmlOutputBufferFlush(buf);
|
||||
LASSO_PROFILE(lecp)->msg_body = g_strdup( (char*)(
|
||||
if (profile->msg_body == NULL) {
|
||||
return LASSO_PROFILE_ERROR_BUILDING_REQUEST_FAILED;
|
||||
@@ -299,8 +288,6 @@ lasso_lecp_process_authn_request_envelope_msg(LassoLecp *lecp, const char *reque
|
||||
xmlXPathContext *xpathCtx;
|
||||
xmlXPathObject *xpathObj;
|
||||
xmlNode *soap_envelope, *soap_body, *authn_request;
|
||||
- xmlOutputBuffer *buf;
|
||||
- xmlCharEncodingHandler *handler;
|
||||
|
||||
g_return_val_if_fail(LASSO_IS_LECP(lecp), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
|
||||
g_return_val_if_fail(request_msg != NULL, LASSO_PARAM_ERROR_INVALID_VALUE);
|
||||
@@ -337,13 +324,8 @@ lasso_lecp_process_authn_request_envelope_msg(LassoLecp *lecp, const char *reque
|
||||
soap_body = xmlNewTextChild(soap_envelope, NULL, (xmlChar*)"Body", NULL);
|
||||
xmlAddChild(soap_body, authn_request);
|
||||
|
||||
- handler = xmlFindCharEncodingHandler("utf-8");
|
||||
- buf = xmlAllocOutputBuffer(handler);
|
||||
- xmlNodeDumpOutput(buf, NULL, soap_envelope, 0, 0, "utf-8");
|
||||
- xmlOutputBufferFlush(buf);
|
||||
- LASSO_PROFILE(lecp)->msg_body = g_strdup( (char*)(
|
||||
- buf->conv ? buf->conv->content : buf->buffer->content));
|
||||
+ buf->conv ? xmlBufferContent(buf->conv) : xmlBufferContent(buf->buffer)));
|
||||
xmlOutputBufferClose(buf);
|
||||
- xmlOutputBufferClose(buf);
|
||||
+ lasso_assign_new_string(LASSO_PROFILE(lecp)->msg_body,
|
||||
+ lasso_xmlnode_to_string(soap_envelope, 0, 0));
|
||||
xmlFreeNode(soap_envelope);
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,48 @@
|
|||
$NetBSD: patch-lasso_id-ff_session.c,v 1.1 2012/09/28 11:59:18 obache Exp $
|
||||
$NetBSD: patch-lasso_id-ff_session.c,v 1.2 2012/10/23 18:16:15 manu Exp $
|
||||
|
||||
* for libxml2>=2.9.0
|
||||
Patch from upstream to support libxml >= 2.9.0. From commit message:
|
||||
|
||||
--- lasso/id-ff/session.c.orig 2011-01-05 13:57:32.000000000 +0000
|
||||
Libxml stopped exposing the internal of the xmlOutputBuffer structure;
|
||||
it was replace by proper use of the API and of the xmlBuffer structure.
|
||||
|
||||
There could be regression for older version of libxml as some functions
|
||||
appeared in recent version of libxml; but the reference API document
|
||||
does not give any introduction date for functions so it's hard to be
|
||||
sure.
|
||||
|
||||
diff --git a/lasso/id-ff/session.c b/lasso/id-ff/session.c
|
||||
index a64f379..f770348 100644
|
||||
--- lasso/id-ff/session.c
|
||||
+++ lasso/id-ff/session.c
|
||||
@@ -450,7 +450,7 @@ xmlNode_to_base64(xmlNode *node) {
|
||||
goto cleanup;
|
||||
xmlNodeDumpOutput(buf, NULL, node, 0, 0, "utf-8");
|
||||
xmlOutputBufferFlush(buf);
|
||||
@@ -437,27 +437,12 @@ add_assertion_childnode(gchar *key, LassoLibAssertion *value, DumpContext *conte
|
||||
|
||||
xmlChar *
|
||||
xmlNode_to_base64(xmlNode *node) {
|
||||
- xmlOutputBufferPtr buf = NULL;
|
||||
- xmlCharEncodingHandlerPtr handler = NULL;
|
||||
- xmlChar *buffer = NULL;
|
||||
+ gchar *buffer = NULL;
|
||||
xmlChar *ret = NULL;
|
||||
|
||||
- handler = xmlFindCharEncodingHandler("utf-8");
|
||||
- if (! handler)
|
||||
- goto cleanup;
|
||||
- buf = xmlAllocOutputBuffer(handler);
|
||||
- if (! buf)
|
||||
- goto cleanup;
|
||||
- xmlNodeDumpOutput(buf, NULL, node, 0, 0, "utf-8");
|
||||
- xmlOutputBufferFlush(buf);
|
||||
- buffer = buf->conv ? buf->conv->content : buf->buffer->content;
|
||||
+ buffer = xmlBufferContent(buf->conv ? buf->conv : buf->buffer);
|
||||
|
||||
ret = xmlSecBase64Encode(buffer, strlen((char*)buffer), 0);
|
||||
-
|
||||
- ret = xmlSecBase64Encode(buffer, strlen((char*)buffer), 0);
|
||||
-
|
||||
-cleanup:
|
||||
- if (buf)
|
||||
- xmlOutputBufferClose(buf);
|
||||
-
|
||||
+ buffer = lasso_xmlnode_to_string(node, 0, 0);
|
||||
+ ret = xmlSecBase64Encode(BAD_CAST buffer, strlen((char*)buffer), 0);
|
||||
+ lasso_release_string(buffer);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,24 +1,70 @@
|
|||
$NetBSD: patch-lasso_saml-2.0_ecp.c,v 1.1 2012/09/28 11:59:18 obache Exp $
|
||||
$NetBSD: patch-lasso_saml-2.0_ecp.c,v 1.2 2012/10/23 18:16:15 manu Exp $
|
||||
|
||||
* for libxml2>=2.9.0
|
||||
Patch from upstream to support libxml >= 2.9.0. From commit message:
|
||||
|
||||
--- lasso/saml-2.0/ecp.c.orig 2011-01-05 13:57:32.000000000 +0000
|
||||
Libxml stopped exposing the internal of the xmlOutputBuffer structure;
|
||||
it was replace by proper use of the API and of the xmlBuffer structure.
|
||||
|
||||
There could be regression for older version of libxml as some functions
|
||||
appeared in recent version of libxml; but the reference API document
|
||||
does not give any introduction date for functions so it's hard to be
|
||||
sure.
|
||||
|
||||
diff --git a/lasso/saml-2.0/ecp.c b/lasso/saml-2.0/ecp.c
|
||||
index 655162c..9ef9d97 100644
|
||||
--- lasso/saml-2.0/ecp.c
|
||||
+++ lasso/saml-2.0/ecp.c
|
||||
@@ -175,7 +175,7 @@ lasso_ecp_process_authn_request_msg(Lass
|
||||
xmlNodeDumpOutput(buf, NULL, xmlnode, 0, 0, "utf-8");
|
||||
xmlOutputBufferFlush(buf);
|
||||
LASSO_PROFILE(ecp)->msg_body = g_strdup(
|
||||
@@ -128,8 +128,6 @@ lasso_ecp_process_authn_request_msg(LassoEcp *ecp, const char *authn_request_msg
|
||||
xmlXPathContext *xpathCtx;
|
||||
xmlXPathObject *xpathObj;
|
||||
xmlNode *xmlnode;
|
||||
- xmlOutputBuffer *buf;
|
||||
- xmlCharEncodingHandler *handler;
|
||||
LassoProfile *profile;
|
||||
LassoProvider *remote_provider;
|
||||
|
||||
@@ -170,13 +168,8 @@ lasso_ecp_process_authn_request_msg(LassoEcp *ecp, const char *authn_request_msg
|
||||
xpathObj = NULL;
|
||||
|
||||
xmlnode = xmlDocGetRootElement(doc);
|
||||
- handler = xmlFindCharEncodingHandler("utf-8");
|
||||
- buf = xmlAllocOutputBuffer(handler);
|
||||
- xmlNodeDumpOutput(buf, NULL, xmlnode, 0, 0, "utf-8");
|
||||
- xmlOutputBufferFlush(buf);
|
||||
- LASSO_PROFILE(ecp)->msg_body = g_strdup(
|
||||
- (char*)(buf->conv ? buf->conv->content : buf->buffer->content));
|
||||
+ (char*)(xmlBufferContent(buf->conv ? buf->conv : buf->buffer)));
|
||||
xmlOutputBufferClose(buf);
|
||||
- xmlOutputBufferClose(buf);
|
||||
+ lasso_assign_new_string(LASSO_PROFILE(ecp)->msg_body,
|
||||
+ lasso_xmlnode_to_string(xmlnode, 0, 0))
|
||||
lasso_release_doc(doc);
|
||||
|
||||
@@ -276,7 +276,7 @@ lasso_ecp_process_response_msg(LassoEcp
|
||||
xmlNodeDumpOutput(buf, NULL, new_envelope, 0, 0, "utf-8");
|
||||
xmlOutputBufferFlush(buf);
|
||||
LASSO_PROFILE(ecp)->msg_body = g_strdup(
|
||||
- (char*)(buf->conv ? buf->conv->content : buf->buffer->content));
|
||||
+ (char*)(xmlBufferContent(buf->conv ? buf->conv : buf->buffer)));
|
||||
xmlOutputBufferClose(buf);
|
||||
profile->remote_providerID = lasso_server_get_first_providerID_by_role(profile->server, LASSO_PROVIDER_ROLE_IDP);
|
||||
@@ -206,8 +199,6 @@ lasso_ecp_process_response_msg(LassoEcp *ecp, const char *response_msg)
|
||||
xmlXPathObject *xpathObj;
|
||||
xmlNode *new_envelope, *header, *paos_response, *ecp_relay_state;
|
||||
xmlNode *body = NULL;
|
||||
- xmlOutputBuffer *buf;
|
||||
- xmlCharEncodingHandler *handler;
|
||||
xmlNs *soap_env_ns, *ecp_ns;
|
||||
|
||||
g_return_val_if_fail(LASSO_IS_ECP(ecp), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
|
||||
@@ -270,17 +261,9 @@ lasso_ecp_process_response_msg(LassoEcp *ecp, const char *response_msg)
|
||||
}
|
||||
|
||||
xmlAddChild(new_envelope, body);
|
||||
-
|
||||
- handler = xmlFindCharEncodingHandler("utf-8");
|
||||
- buf = xmlAllocOutputBuffer(handler);
|
||||
- xmlNodeDumpOutput(buf, NULL, new_envelope, 0, 0, "utf-8");
|
||||
- xmlOutputBufferFlush(buf);
|
||||
- LASSO_PROFILE(ecp)->msg_body = g_strdup(
|
||||
- (char*)(buf->conv ? buf->conv->content : buf->buffer->content));
|
||||
- xmlOutputBufferClose(buf);
|
||||
-
|
||||
+ lasso_assign_new_string(LASSO_PROFILE(ecp)->msg_body,
|
||||
+ lasso_xmlnode_to_string(new_envelope, 0, 0))
|
||||
lasso_release_doc(doc);
|
||||
-
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue