xmlsec: headers diff between 1.1.2.12 and 1.1.2.13 versions

	base64.h	base64.h

	skipping to change at line 30	skipping to change at line 30
	#include <xmlsec/xmlsec.h>	#include <xmlsec/xmlsec.h>
	#include <xmlsec/transforms.h>	#include <xmlsec/transforms.h>

	/**	/**
	* XMLSEC_BASE64_LINESIZE:	* XMLSEC_BASE64_LINESIZE:
	*	*
	* The default maximum base64 encoded line size.	* The default maximum base64 encoded line size.
	*/	*/
	#define XMLSEC_BASE64_LINESIZE 64	#define XMLSEC_BASE64_LINESIZE 64


	XMLSEC_EXPORT int xmlSecBase64GetDefaultLineSize ();	XMLSEC_EXPORT int xmlSecBase64GetDefaultLineSize (void);
	XMLSEC_EXPORT void xmlSecBase64SetDefaultLineSize (int columns );	XMLSEC_EXPORT void xmlSecBase64SetDefaultLineSize (int columns );

	/**	/**
	* Base64 Context	* Base64 Context
	*/	*/
	typedef struct _xmlSecBase64Ctx xmlSecBase64 Ctx,	typedef struct _xmlSecBase64Ctx xmlSecBase64 Ctx,
	*xmlSecBase6 4CtxPtr;	*xmlSecBase6 4CtxPtr;

	XMLSEC_EXPORT xmlSecBase64CtxPtr xmlSecBase64CtxCreate (int encode,	XMLSEC_EXPORT xmlSecBase64CtxPtr xmlSecBase64CtxCreate (int encode,
	int columns );	int columns );

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	keys.h	keys.h

	skipping to change at line 101	skipping to change at line 101
	const xmlC har* identifier);	const xmlC har* identifier);
	XMLSEC_EXPORT void xmlSecKeyUseWithDebugDump (xmlSecKeyUs eWithPtr keyUseWith,	XMLSEC_EXPORT void xmlSecKeyUseWithDebugDump (xmlSecKeyUs eWithPtr keyUseWith,
	FILE* outpu t);	FILE* outpu t);
	XMLSEC_EXPORT void xmlSecKeyUseWithDebugXmlDump (xmlSecKeyUs eWithPtr keyUseWith,	XMLSEC_EXPORT void xmlSecKeyUseWithDebugXmlDump (xmlSecKeyUs eWithPtr keyUseWith,
	FILE* outpu t);	FILE* outpu t);

	/**	/**
	* xmlSecKeyUseWith:	* xmlSecKeyUseWith:
	* @application: the application.	* @application: the application.
	* @identifier: the identifier.	* @identifier: the identifier.

		* @reserved1: reserved for future use.
		* @reserved2: reserved for future use.
	*	*
	* Information about application and user of the key.	* Information about application and user of the key.
	*/	*/
	struct _xmlSecKeyUseWith {	struct _xmlSecKeyUseWith {
	xmlChar* application;	xmlChar* application;
	xmlChar* identifier;	xmlChar* identifier;

	void* reserved1;	void* reserved1;
	void* reserved2;	void* reserved2;
	};	};

	skipping to change at line 133	skipping to change at line 135
	*	*
	*************************************************************************/	*************************************************************************/
	typedef struct _xmlSecKeyReq xmlSecKeyReq, *xmlSecKeyReqP tr;	typedef struct _xmlSecKeyReq xmlSecKeyReq, *xmlSecKeyReqP tr;

	/**	/**
	* xmlSecKeyReq:	* xmlSecKeyReq:
	* @keyId: the desired key value klass.	* @keyId: the desired key value klass.
	* @keyType: the desired key type.	* @keyType: the desired key type.
	* @keyUsage: the desired key usage.	* @keyUsage: the desired key usage.
	* @keyBitsSize: the desired key size (in bits!).	* @keyBitsSize: the desired key size (in bits!).

	* @keyUseWith: the desired key use with application/identifier inf	* @keyUseWithList: the desired key use with application/identifier inf
	ormation.	ormation.
		* @reserved1: reserved for future use.
		* @reserved2: reserved for future use.
		*
	* The key requirements information.	* The key requirements information.
	*/	*/
	struct _xmlSecKeyReq {	struct _xmlSecKeyReq {
	xmlSecKeyDataId keyId;	xmlSecKeyDataId keyId;
	xmlSecKeyDataType keyType;	xmlSecKeyDataType keyType;
	xmlSecKeyUsage keyUsage;	xmlSecKeyUsage keyUsage;
	xmlSecSize keyBitsSize;	xmlSecSize keyBitsSize;
	xmlSecPtrList keyUseWithList;	xmlSecPtrList keyUseWithList;

	void* reserved1;	void* reserved1;

	void* eserved2;	void* reserved2;
	};	};

	XMLSEC_EXPORT int xmlSecKeyReqInitialize (xmlSecKeyRe qPtr keyReq);	XMLSEC_EXPORT int xmlSecKeyReqInitialize (xmlSecKeyRe qPtr keyReq);
	XMLSEC_EXPORT void xmlSecKeyReqFinalize (xmlSecKeyRe qPtr keyReq);	XMLSEC_EXPORT void xmlSecKeyReqFinalize (xmlSecKeyRe qPtr keyReq);
	XMLSEC_EXPORT void xmlSecKeyReqReset (xmlSecKeyRe qPtr keyReq);	XMLSEC_EXPORT void xmlSecKeyReqReset (xmlSecKeyRe qPtr keyReq);
	XMLSEC_EXPORT int xmlSecKeyReqCopy (xmlSecKeyRe qPtr dst,	XMLSEC_EXPORT int xmlSecKeyReqCopy (xmlSecKeyRe qPtr dst,
	xmlSecKeyRe qPtr src);	xmlSecKeyRe qPtr src);
	XMLSEC_EXPORT int xmlSecKeyReqMatchKey (xmlSecKeyRe qPtr keyReq,	XMLSEC_EXPORT int xmlSecKeyReqMatchKey (xmlSecKeyRe qPtr keyReq,
	xmlSecKeyPt r key);	xmlSecKeyPt r key);
	XMLSEC_EXPORT int xmlSecKeyReqMatchKeyValue (xmlSecKeyRe qPtr keyReq,	XMLSEC_EXPORT int xmlSecKeyReqMatchKeyValue (xmlSecKeyRe qPtr keyReq,

End of changes. 3 change blocks.
	4 lines changed or deleted	8 lines changed or added

	transforms.h	transforms.h

	skipping to change at line 888	skipping to change at line 888
	/**	/**
	* xmlSecTransformInclC14NWithCommentsId:	* xmlSecTransformInclC14NWithCommentsId:
	*	*
	* The regular (inclusive) C14N with comments transform klass.	* The regular (inclusive) C14N with comments transform klass.
	*/	*/
	#define xmlSecTransformInclC14NWithCommentsId \	#define xmlSecTransformInclC14NWithCommentsId \
	xmlSecTransformInclC14NWithCommentsGetKlass()	xmlSecTransformInclC14NWithCommentsGetKlass()
	XMLSEC_EXPORT xmlSecTransformId xmlSecTransformInclC14NWithCommentsG etKlass(void);	XMLSEC_EXPORT xmlSecTransformId xmlSecTransformInclC14NWithCommentsG etKlass(void);

	/**	/**

		* xmlSecTransformInclC14N11Id:
		*
		* The regular (inclusive) C14N 1.1 without comments transform klass.
		*/
		#define xmlSecTransformInclC14N11Id \
		xmlSecTransformInclC14N11GetKlass()
		XMLSEC_EXPORT xmlSecTransformId xmlSecTransformInclC14N11GetKlass
		(void);

		/**
		* xmlSecTransformInclC14N11WithCommentsId:
		*
		* The regular (inclusive) C14N 1.1 with comments transform klass.
		*/
		#define xmlSecTransformInclC14N11WithCommentsId \
		xmlSecTransformInclC14N11WithCommentsGetKlass()
		XMLSEC_EXPORT xmlSecTransformId xmlSecTransformInclC14N11WithComment
		sGetKlass(void);

		/**
	* xmlSecTransformExclC14NId	* xmlSecTransformExclC14NId
	*	*
	* The exclusive C14N without comments transform klass.	* The exclusive C14N without comments transform klass.
	*/	*/
	#define xmlSecTransformExclC14NId \	#define xmlSecTransformExclC14NId \
	xmlSecTransformExclC14NGetKlass()	xmlSecTransformExclC14NGetKlass()
	XMLSEC_EXPORT xmlSecTransformId xmlSecTransformExclC14NGetKlass (void);	XMLSEC_EXPORT xmlSecTransformId xmlSecTransformExclC14NGetKlass (void);

	/**	/**
	* xmlSecTransformExclC14NWithCommentsId:	* xmlSecTransformExclC14NWithCommentsId:

	skipping to change at line 969	skipping to change at line 987
	*/	*/
	#define xmlSecTransformRemoveXmlTagsC14NId \	#define xmlSecTransformRemoveXmlTagsC14NId \
	xmlSecTransformRemoveXmlTagsC14NGetKlass()	xmlSecTransformRemoveXmlTagsC14NGetKlass()
	XMLSEC_EXPORT xmlSecTransformId xmlSecTransformRemoveXmlTagsC14NGetK lass(void);	XMLSEC_EXPORT xmlSecTransformId xmlSecTransformRemoveXmlTagsC14NGetK lass(void);

	/**	/**
	* xmlSecTransformVisa3DHackId:	* xmlSecTransformVisa3DHackId:
	*	*
	* Selects node subtree by given node id string. The only reason why we nee d this	* Selects node subtree by given node id string. The only reason why we nee d this
	* is Visa3D protocol. It doesn't follow XML/XPointer/XMLDSig specs and all ows	* is Visa3D protocol. It doesn't follow XML/XPointer/XMLDSig specs and all ows

	* something like "#12345" in the URI attribute. Since we couldn't evaluate	* invalid XPointer expressions in the URI attribute. Since we couldn't eva
	such	luate
	* expressions thru XPath/XPointer engine, we need to have this hack here.	* such expressions thru XPath/XPointer engine, we need to have this hack h
		ere.
	*/	*/
	#define xmlSecTransformVisa3DHackId \	#define xmlSecTransformVisa3DHackId \
	xmlSecTransformVisa3DHackGetKlass()	xmlSecTransformVisa3DHackGetKlass()
	XMLSEC_EXPORT xmlSecTransformId xmlSecTransformVisa3DHackGetKlass (void);	XMLSEC_EXPORT xmlSecTransformId xmlSecTransformVisa3DHackGetKlass (void);
	XMLSEC_EXPORT int xmlSecTransformVisa3DHackSetID (xml SecTransformPtr transform,	XMLSEC_EXPORT int xmlSecTransformVisa3DHackSetID (xml SecTransformPtr transform,
	con st xmlChar* id);	con st xmlChar* id);

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif /* __cplusplus */	#endif /* __cplusplus */

End of changes. 2 change blocks.
	3 lines changed or deleted	24 lines changed or added

	version.h	version.h

	skipping to change at line 24	skipping to change at line 24
	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C" {	extern "C" {
	#endif /* __cplusplus */	#endif /* __cplusplus */

	/**	/**
	* XMLSEC_VERSION:	* XMLSEC_VERSION:
	*	*
	* The library version string in the format	* The library version string in the format
	* "<major-number>.<minor-number>.<sub-minor-number>".	* "<major-number>.<minor-number>.<sub-minor-number>".
	*/	*/

	#define XMLSEC_VERSION "1.2.12"	#define XMLSEC_VERSION "1.2.13"

	/**	/**
	* XMLSEC_VERSION_MAJOR:	* XMLSEC_VERSION_MAJOR:
	*	*
	* The library major version number.	* The library major version number.
	*/	*/
	#define XMLSEC_VERSION_MAJOR 1	#define XMLSEC_VERSION_MAJOR 1

	/**	/**
	* XMLSEC_VERSION_MINOR:	* XMLSEC_VERSION_MINOR:
	*	*
	* The library minor version number.	* The library minor version number.
	*/	*/
	#define XMLSEC_VERSION_MINOR 2	#define XMLSEC_VERSION_MINOR 2

	/**	/**
	* XMLSEC_VERSION_SUBMINOR:	* XMLSEC_VERSION_SUBMINOR:
	*	*
	* The library sub-minor version number.	* The library sub-minor version number.
	*/	*/

	#define XMLSEC_VERSION_SUBMINOR 12	#define XMLSEC_VERSION_SUBMINOR 13

	/**	/**
	* XMLSEC_VERSION_INFO:	* XMLSEC_VERSION_INFO:
	*	*
	* The library version info string in the format	* The library version info string in the format
	* "<major-number>+<minor-number>:<sub-minor-number>:<minor-number>".	* "<major-number>+<minor-number>:<sub-minor-number>:<minor-number>".
	*/	*/

	#define XMLSEC_VERSION_INFO "3:12:2"	#define XMLSEC_VERSION_INFO "3:13:2"

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif /* __cplusplus */	#endif /* __cplusplus */

	#endif /* __XMLSEC_VERSION_H__ */	#endif /* __XMLSEC_VERSION_H__ */

End of changes. 3 change blocks.
	3 lines changed or deleted	3 lines changed or added

	xmltree.h	xmltree.h

	skipping to change at line 18	skipping to change at line 18
	*	*
	* Copyright (C) 2002-2003 Aleksey Sanin <aleksey@aleksey.com>	* Copyright (C) 2002-2003 Aleksey Sanin <aleksey@aleksey.com>
	*/	*/
	#ifndef __XMLSEC_TREE_H__	#ifndef __XMLSEC_TREE_H__
	#define __XMLSEC_TREE_H__	#define __XMLSEC_TREE_H__

	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C" {	extern "C" {
	#endif /* __cplusplus */	#endif /* __cplusplus */


		#include <stdio.h>

	#include <libxml/tree.h>	#include <libxml/tree.h>
	#include <libxml/xpath.h>	#include <libxml/xpath.h>
	#include <xmlsec/xmlsec.h>	#include <xmlsec/xmlsec.h>

	/**	/**
	* xmlSecNodeGetName:	* xmlSecNodeGetName:
	* @node: the pointer to node.	* @node: the pointer to node.
	*	*
	* Macro. Returns node's name.	* Macro. Returns node's name.
	*/	*/

	skipping to change at line 98	skipping to change at line 100
	xmlSecSize len);	xmlSecSize len);

	XMLSEC_EXPORT xmlDocPtr xmlSecCreateTree (const xmlCh ar* rootNodeName,	XMLSEC_EXPORT xmlDocPtr xmlSecCreateTree (const xmlCh ar* rootNodeName,
	const xmlChar* root NodeNs);	const xmlChar* root NodeNs);
	XMLSEC_EXPORT int xmlSecIsEmptyNode (xmlNodePtr node);	XMLSEC_EXPORT int xmlSecIsEmptyNode (xmlNodePtr node);
	XMLSEC_EXPORT int xmlSecIsEmptyString (const xmlChar* str) ;	XMLSEC_EXPORT int xmlSecIsEmptyString (const xmlChar* str) ;
	XMLSEC_EXPORT xmlChar* xmlSecGetQName (xmlNodePtr node,	XMLSEC_EXPORT xmlChar* xmlSecGetQName (xmlNodePtr node,
	const xmlChar* href ,	const xmlChar* href ,
	const xmlChar* loca l);	const xmlChar* loca l);


		XMLSEC_EXPORT int xmlSecPrintXmlString (FILE * fd,
		const xmlChar * st
		r);

	/**	/**
	* xmlSecIsHex:	* xmlSecIsHex:
	* @c: the character.	* @c: the character.
	*	*
	* Macro. Returns 1 if @c is a hex digit or 0 other wise.	* Macro. Returns 1 if @c is a hex digit or 0 other wise.
	*/	*/
	#define xmlSecIsHex(c) \	#define xmlSecIsHex(c) \
	(( (('0' <= (c)) && ((c) <= '9')) \|\| \	(( (('0' <= (c)) && ((c) <= '9')) \|\| \
	(('a' <= (c)) && ((c) <= 'f')) \|\| \	(('a' <= (c)) && ((c) <= 'f')) \|\| \
	(('A' <= (c)) && ((c) <= 'F')) ) ? 1 : 0)	(('A' <= (c)) && ((c) <= 'F')) ) ? 1 : 0)

	skipping to change at line 125	skipping to change at line 130
	#define xmlSecGetHex(c) \	#define xmlSecGetHex(c) \
	( (('0' <= (c)) && ((c) <= '9')) ? (c) - '0' : \	( (('0' <= (c)) && ((c) <= '9')) ? (c) - '0' : \
	( (('a' <= (c)) && ((c) <= 'f')) ? (c) - 'a' + 10 : \	( (('a' <= (c)) && ((c) <= 'f')) ? (c) - 'a' + 10 : \
	( (('A' <= (c)) && ((c) <= 'F')) ? (c) - 'A' + 10 : 0 )))	( (('A' <= (c)) && ((c) <= 'F')) ? (c) - 'A' + 10 : 0 )))

	/*************************************************************************	/*************************************************************************
	*	*
	* QName <-> Integer mapping	* QName <-> Integer mapping
	*	*
	************************************************************************/	************************************************************************/

	typedef struct _xmlSecQName2IntegerInfo xmlSecQName2
	IntegerInfo,
	*xmlSecQName2Integer
	InfoPtr;
	typedef const struct _xmlSecQName2IntegerInfo* xmlSecQName2IntegerI
	nfoConstPtr;


		/**
		* xmlSecQName2IntegerInfo:
		* @qnameHref: the QName href
		* @qnameLocalPart: the QName local
		* @intValue: the integer value
		*
		* QName <-> Integer conversion definition.
		*/
		typedef struct _xmlSecQName2IntegerInfo xmlSecQName2IntegerInfo, *xm
		lSecQName2IntegerInfoPtr;
	struct _xmlSecQName2IntegerInfo {	struct _xmlSecQName2IntegerInfo {
	const xmlChar* qnameHref;	const xmlChar* qnameHref;
	const xmlChar* qnameLocalPart;	const xmlChar* qnameLocalPart;
	int intValue;	int intValue;
	};	};


		/**
		* xmlSecQName2IntegerInfoConstPtr:
		*
		* Pointer to constant QName <-> Integer conversion definition.
		*/
		typedef const xmlSecQName2IntegerInfo * xmlSecQName2IntegerI
		nfoConstPtr;

	XMLSEC_EXPORT xmlSecQName2IntegerInfoConstPtr xmlSecQName2IntegerGetInfo	XMLSEC_EXPORT xmlSecQName2IntegerInfoConstPtr xmlSecQName2IntegerGetInfo
	(xmlSecQName 2IntegerInfoConstPtr info,	(xmlSecQName 2IntegerInfoConstPtr info,
	int intValu e);	int intValu e);
	XMLSEC_EXPORT int xmlSecQName2IntegerGetInteger (xmlSecQName 2IntegerInfoConstPtr info,	XMLSEC_EXPORT int xmlSecQName2IntegerGetInteger (xmlSecQName 2IntegerInfoConstPtr info,
	const xmlCh ar* qnameHref,	const xmlCh ar* qnameHref,
	const xmlCh ar* qnameLocalPart,	const xmlCh ar* qnameLocalPart,
	int* intVal ue);	int* intVal ue);
	XMLSEC_EXPORT int xmlSecQName2IntegerGetIntegerFromString	XMLSEC_EXPORT int xmlSecQName2IntegerGetIntegerFromString
	(xmlSecQName 2IntegerInfoConstPtr info,	(xmlSecQName 2IntegerInfoConstPtr info,
	xmlNodePtr node,	xmlNodePtr node,

	skipping to change at line 177	skipping to change at line 196
	int intValu e,	int intValu e,
	const xmlCh ar* name,	const xmlCh ar* name,
	FILE* outpu t);	FILE* outpu t);
	XMLSEC_EXPORT void xmlSecQName2IntegerDebugXmlDump(xmlSecQName2 IntegerInfoConstPtr info,	XMLSEC_EXPORT void xmlSecQName2IntegerDebugXmlDump(xmlSecQName2 IntegerInfoConstPtr info,
	int intValu e,	int intValu e,
	const xmlCh ar* name,	const xmlCh ar* name,
	FILE* outpu t);	FILE* outpu t);

	/*************************************************************************	/*************************************************************************
	*	*

	* QName <-> Bits mask mapping	* QName <-> Bitmask mapping
	*	*
	************************************************************************/	************************************************************************/


		/**
		* xmlSecBitMask:
		*
		* Bitmask datatype.
		*/
	typedef unsigned int xmlSecBitMask;	typedef unsigned int xmlSecBitMask;

	typedef struct _xmlSecQName2BitMaskInfo xmlSecQName2
	BitMaskInfo,	/**
	*xmlSecQName2BitMask	* xmlSecQName2BitMaskInfo:
	InfoPtr;	* @qnameHref: the QName href
	typedef const struct _xmlSecQName2BitMaskInfo* xmlSecQName2BitMaskI	* @qnameLocalPart: the QName local
	nfoConstPtr;	* @mask: the bitmask value
		*
		* QName <-> Bitmask conversion definition.
		*/
		typedef struct _xmlSecQName2BitMaskInfo xmlSecQName2BitMaskInfo, *xm
		lSecQName2BitMaskInfoPtr;

	struct _xmlSecQName2BitMaskInfo {	struct _xmlSecQName2BitMaskInfo {
	const xmlChar* qnameHref;	const xmlChar* qnameHref;
	const xmlChar* qnameLocalPart;	const xmlChar* qnameLocalPart;
	xmlSecBitMask mask;	xmlSecBitMask mask;
	};	};


		/**
		* xmlSecQName2BitMaskInfoConstPtr:
		*
		* Pointer to constant QName <-> Bitmask conversion definition.
		*/
		typedef const xmlSecQName2BitMaskInfo* xmlSecQName2BitMaskInfoConst
		Ptr;

	XMLSEC_EXPORT xmlSecQName2BitMaskInfoConstPtr xmlSecQName2BitMaskGetInfo	XMLSEC_EXPORT xmlSecQName2BitMaskInfoConstPtr xmlSecQName2BitMaskGetInfo
	(xmlSecQName 2BitMaskInfoConstPtr info,	(xmlSecQName 2BitMaskInfoConstPtr info,
	xmlSecBitMa sk mask);	xmlSecBitMa sk mask);
	XMLSEC_EXPORT int xmlSecQName2BitMaskGetBitMask (xmlSecQName 2BitMaskInfoConstPtr info,	XMLSEC_EXPORT int xmlSecQName2BitMaskGetBitMask (xmlSecQName 2BitMaskInfoConstPtr info,
	const xmlCh ar* qnameLocalPart,	const xmlCh ar* qnameLocalPart,
	const xmlCh ar* qnameHref,	const xmlCh ar* qnameHref,
	xmlSecBitMa sk* mask);	xmlSecBitMa sk* mask);
	XMLSEC_EXPORT int xmlSecQName2BitMaskNodesRead (xmlSecQName 2BitMaskInfoConstPtr info,	XMLSEC_EXPORT int xmlSecQName2BitMaskNodesRead (xmlSecQName 2BitMaskInfoConstPtr info,
	xmlNodePtr* node,	xmlNodePtr* node,
	const xmlCh ar* nodeName,	const xmlCh ar* nodeName,

End of changes. 9 change blocks.
	13 lines changed or deleted	51 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/

	keysdata.h	keysdata.h

	skipping to change at line 215	skipping to change at line 215
	*	*
	* xmlSecKeyDataFormat	* xmlSecKeyDataFormat
	*	*
	*************************************************************************/	*************************************************************************/
	/**	/**
	* xmlSecKeyDataFormat:	* xmlSecKeyDataFormat:
	* @xmlSecKeyDataFormatUnknown: the key data format is unkno wn.	* @xmlSecKeyDataFormatUnknown: the key data format is unkno wn.
	* @xmlSecKeyDataFormatBinary: the binary key data.	* @xmlSecKeyDataFormatBinary: the binary key data.
	* @xmlSecKeyDataFormatPem: the PEM key data (cert or public/pri vate key).	* @xmlSecKeyDataFormatPem: the PEM key data (cert or public/pri vate key).
	* @xmlSecKeyDataFormatDer: the DER key data (cert or public/pri vate key).	* @xmlSecKeyDataFormatDer: the DER key data (cert or public/pri vate key).

	* @xmlSecKeyDataFormatPkcs8Pem: the PKCS#8 PEM private key.	* @xmlSecKeyDataFormatPkcs8Pem: the PKCS8 PEM private key.
	* @xmlSecKeyDataFormatPkcs8Der: the PKCS#8 DER private key.	* @xmlSecKeyDataFormatPkcs8Der: the PKCS8 DER private key.
	* @xmlSecKeyDataFormatPkcs12: the PKCS12 format (bag of keys and c erts)	* @xmlSecKeyDataFormatPkcs12: the PKCS12 format (bag of keys and c erts)
	* @xmlSecKeyDataFormatCertPem: the PEM cert.	* @xmlSecKeyDataFormatCertPem: the PEM cert.
	* @xmlSecKeyDataFormatCertDer: the DER cert.	* @xmlSecKeyDataFormatCertDer: the DER cert.
	*	*
	* The key data format (binary, der, pem, etc.).	* The key data format (binary, der, pem, etc.).
	*/	*/
	typedef enum {	typedef enum {
	xmlSecKeyDataFormatUnknown = 0,	xmlSecKeyDataFormatUnknown = 0,
	xmlSecKeyDataFormatBinary,	xmlSecKeyDataFormatBinary,
	xmlSecKeyDataFormatPem,	xmlSecKeyDataFormatPem,

End of changes. 1 change blocks.
	2 lines changed or deleted	2 lines changed or added

	private.h	private.h

	skipping to change at line 335	skipping to change at line 335
	xml SecSize dataSize,	xml SecSize dataSize,
	xml SecKeyDataFormat format);	xml SecKeyDataFormat format);
	/**	/**
	* xmlSecCryptoDLFunctions:	* xmlSecCryptoDLFunctions:
	* @cryptoInit: the xmlsec-crypto library initializa tion method.	* @cryptoInit: the xmlsec-crypto library initializa tion method.
	* @cryptoShutdown: the xmlsec-crypto library shutdown method.	* @cryptoShutdown: the xmlsec-crypto library shutdown method.
	* @cryptoKeysMngrInit: the xmlsec-crypto library keys manag er init method.	* @cryptoKeysMngrInit: the xmlsec-crypto library keys manag er init method.
	* @keyDataAesGetKlass: the method to get pointer to AES key data klass.	* @keyDataAesGetKlass: the method to get pointer to AES key data klass.
	* @keyDataDesGetKlass: the method to get pointer to DES key data klass.	* @keyDataDesGetKlass: the method to get pointer to DES key data klass.
	* @keyDataDsaGetKlass: the method to get pointer to DSA key data klass.	* @keyDataDsaGetKlass: the method to get pointer to DSA key data klass.

		* @keyDataGost2001GetKlass: the method to get pointer to GOST 2001 key d ata klass.
	* @keyDataHmacGetKlass: the method to get pointer to HMAC key data k lass.	* @keyDataHmacGetKlass: the method to get pointer to HMAC key data k lass.
	* @keyDataRsaGetKlass: the method to get pointer to RSA key data klass.	* @keyDataRsaGetKlass: the method to get pointer to RSA key data klass.
	* @keyDataX509GetKlass: the method to get pointer to X509 key data k lass.	* @keyDataX509GetKlass: the method to get pointer to X509 key data k lass.
	* @keyDataRawX509CertGetKlass: the method to get pointer to raw X50 9 cert key data klass.	* @keyDataRawX509CertGetKlass: the method to get pointer to raw X50 9 cert key data klass.
	* @x509StoreGetKlass: the method to get pointer to X509 key data s tore.	* @x509StoreGetKlass: the method to get pointer to X509 key data s tore.
	* @transformAes128CbcGetKlass: the method to get pointer to AES 128 encryption transform.	* @transformAes128CbcGetKlass: the method to get pointer to AES 128 encryption transform.
	* @transformAes192CbcGetKlass: the method to get pointer to AES 192 encryption transform.	* @transformAes192CbcGetKlass: the method to get pointer to AES 192 encryption transform.
	* @transformAes256CbcGetKlass: the method to get pointer to AES 256 encryption transform.	* @transformAes256CbcGetKlass: the method to get pointer to AES 256 encryption transform.
	* @transformKWAes128GetKlass: the method to get pointer to AES 128 key wra pper transform.	* @transformKWAes128GetKlass: the method to get pointer to AES 128 key wra pper transform.
	* @transformKWAes192GetKlass: the method to get pointer to AES 192 key wra pper transform.	* @transformKWAes192GetKlass: the method to get pointer to AES 192 key wra pper transform.
	* @transformKWAes256GetKlass: the method to get pointer to AES 256 key wra pper transform.	* @transformKWAes256GetKlass: the method to get pointer to AES 256 key wra pper transform.
	* @transformDes3CbcGetKlass: the method to get pointer to Triple DES encr yption transform.	* @transformDes3CbcGetKlass: the method to get pointer to Triple DES encr yption transform.
	* @transformKWDes3GetKlass: the method to get pointer to Triple DES key wrapper transform.	* @transformKWDes3GetKlass: the method to get pointer to Triple DES key wrapper transform.
	* @transformDsaSha1GetKlass: the method to get pointer to DSA-SHA1 signat ure transform.	* @transformDsaSha1GetKlass: the method to get pointer to DSA-SHA1 signat ure transform.

		* @transformGost2001GostR3411_94GetKlass: the method to get pointer to GOS T2001 transform.
	* @transformHmacMd5GetKlass: the method to get pointer to HMAC-MD5 transf orm.	* @transformHmacMd5GetKlass: the method to get pointer to HMAC-MD5 transf orm.
	* @transformHmacRipemd160GetKlass: the method to get pointer to HMAC-RIPEM D160 transform.	* @transformHmacRipemd160GetKlass: the method to get pointer to HMAC-RIPEM D160 transform.
	* @transformHmacSha1GetKlass: the method to get pointer to HMAC-SHA1 trans form.	* @transformHmacSha1GetKlass: the method to get pointer to HMAC-SHA1 trans form.
	* @transformHmacSha224GetKlass: the method to get pointer to HMAC-SHA224 t ransform.	* @transformHmacSha224GetKlass: the method to get pointer to HMAC-SHA224 t ransform.
	* @transformHmacSha256GetKlass: the method to get pointer to HMAC-SHA256 t ransform.	* @transformHmacSha256GetKlass: the method to get pointer to HMAC-SHA256 t ransform.
	* @transformHmacSha384GetKlass: the method to get pointer to HMAC-SHA384 t ransform.	* @transformHmacSha384GetKlass: the method to get pointer to HMAC-SHA384 t ransform.
	* @transformHmacSha512GetKlass: the method to get pointer to HMAC-SHA512 t ransform.	* @transformHmacSha512GetKlass: the method to get pointer to HMAC-SHA512 t ransform.
	* @transformMd5GetKlass: the method to get pointer to MD5 digest tran sform.	* @transformMd5GetKlass: the method to get pointer to MD5 digest tran sform.
	* @transformRipemd160GetKlass: the method to get pointer to RIPEMD1 60 digest transform.	* @transformRipemd160GetKlass: the method to get pointer to RIPEMD1 60 digest transform.
	* @transformRsaMd5GetKlass: the method to get pointer to RSA-MD5 signatu re transform.	* @transformRsaMd5GetKlass: the method to get pointer to RSA-MD5 signatu re transform.
	* @transformRsaRipemd160GetKlass: the method to get pointer to RSA-RIPEMD1 60 signature transform.	* @transformRsaRipemd160GetKlass: the method to get pointer to RSA-RIPEMD1 60 signature transform.
	* @transformRsaSha1GetKlass: the method to get pointer to RSA-SHA1 signat ure transform.	* @transformRsaSha1GetKlass: the method to get pointer to RSA-SHA1 signat ure transform.
	* @transformRsaSha224GetKlass: the method to get pointer to RSA-SHA 224 signature transform.	* @transformRsaSha224GetKlass: the method to get pointer to RSA-SHA 224 signature transform.
	* @transformRsaSha256GetKlass: the method to get pointer to RSA-SHA 256 signature transform.	* @transformRsaSha256GetKlass: the method to get pointer to RSA-SHA 256 signature transform.
	* @transformRsaSha384GetKlass: the method to get pointer to RSA-SHA 384 signature transform.	* @transformRsaSha384GetKlass: the method to get pointer to RSA-SHA 384 signature transform.
	* @transformRsaSha512GetKlass: the method to get pointer to RSA-SHA 512 signature transform.	* @transformRsaSha512GetKlass: the method to get pointer to RSA-SHA 512 signature transform.
	* @transformRsaPkcs1GetKlass: the method to get pointer to RSA-PKCS1_5 key transport transform.	* @transformRsaPkcs1GetKlass: the method to get pointer to RSA-PKCS1_5 key transport transform.
	* @transformRsaOaepGetKlass: the method to get pointer to RSA-OAEP key tr ansport transform.	* @transformRsaOaepGetKlass: the method to get pointer to RSA-OAEP key tr ansport transform.

		* @transformGostR3411_94GetKlass: the method to get pointer to GOST R3411 transform.
	* @transformSha1GetKlass: the method to get pointer to SHA1 digest tra nsform.	* @transformSha1GetKlass: the method to get pointer to SHA1 digest tra nsform.
	* @transformSha224GetKlass: the method to get pointer to SHA224 digest t ransform.	* @transformSha224GetKlass: the method to get pointer to SHA224 digest t ransform.
	* @transformSha256GetKlass: the method to get pointer to SHA256 digest t ransform.	* @transformSha256GetKlass: the method to get pointer to SHA256 digest t ransform.
	* @transformSha384GetKlass: the method to get pointer to SHA384 digest t ransform.	* @transformSha384GetKlass: the method to get pointer to SHA384 digest t ransform.
	* @transformSha512GetKlass: the method to get pointer to SHA512 digest t ransform.	* @transformSha512GetKlass: the method to get pointer to SHA512 digest t ransform.
	* @cryptoAppInit: the default crypto engine initialization met hod.	* @cryptoAppInit: the default crypto engine initialization met hod.
	* @cryptoAppShutdown: the default crypto engine shutdown method.	* @cryptoAppShutdown: the default crypto engine shutdown method.
	* @cryptoAppDefaultKeysMngrInit: the default keys manager init method .	* @cryptoAppDefaultKeysMngrInit: the default keys manager init method .
	* @cryptoAppDefaultKeysMngrAdoptKey: the default keys manager adopt key m ethod.	* @cryptoAppDefaultKeysMngrAdoptKey: the default keys manager adopt key m ethod.
	* @cryptoAppDefaultKeysMngrLoad: the default keys manager load method .	* @cryptoAppDefaultKeysMngrLoad: the default keys manager load method .

	skipping to change at line 474	skipping to change at line 477
	xmlSecCryptoAppKeyLoadMethod cryptoAppKeyLoad;	xmlSecCryptoAppKeyLoadMethod cryptoAppKeyLoad;
	xmlSecCryptoAppKeyLoadMemoryMethod cryptoAppKeyLoadMemory;	xmlSecCryptoAppKeyLoadMemoryMethod cryptoAppKeyLoadMemory;
	xmlSecCryptoAppPkcs12LoadMethod cryptoAppPkcs12Load;	xmlSecCryptoAppPkcs12LoadMethod cryptoAppPkcs12Load;
	xmlSecCryptoAppPkcs12LoadMemoryMethod cryptoAppPkcs12LoadMemory;	xmlSecCryptoAppPkcs12LoadMemoryMethod cryptoAppPkcs12LoadMemory;
	xmlSecCryptoAppKeyCertLoadMethod cryptoAppKeyCertLoad;	xmlSecCryptoAppKeyCertLoadMethod cryptoAppKeyCertLoad;
	xmlSecCryptoAppKeyCertLoadMemoryMethod cryptoAppKeyCertLoadMemory;	xmlSecCryptoAppKeyCertLoadMemoryMethod cryptoAppKeyCertLoadMemory;
	void* cryptoAppDefaultPwdCallback ;	void* cryptoAppDefaultPwdCallback ;
	};	};

	#include <libxml/xmlstring.h>	#include <libxml/xmlstring.h>


		/**
		* xmlSecStrPrintf:
		*
		* Prints a string (see @xmlStrPrintf).
		*/
	#define xmlSecStrPrintf xmlStrPrintf	#define xmlSecStrPrintf xmlStrPrintf


		/**
		* xmlSecStrVPrintf:
		*
		* Prints a string (see @xmlStrVPrintf).
		*/
	#define xmlSecStrVPrintf xmlStrVPrintf	#define xmlSecStrVPrintf xmlStrVPrintf

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif /* __cplusplus */	#endif /* __cplusplus */

	#endif /* __XMLSEC_PRIVATE_H__ */	#endif /* __XMLSEC_PRIVATE_H__ */

End of changes. 5 change blocks.
	0 lines changed or deleted	15 lines changed or added

	strings.h	strings.h

	skipping to change at line 264	skipping to change at line 264
	*	*
	* C14N strings	* C14N strings
	*	*
	************************************************************************/	************************************************************************/
	XMLSEC_EXPORT_VAR const xmlChar xmlSecNameC14N[];	XMLSEC_EXPORT_VAR const xmlChar xmlSecNameC14N[];
	XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefC14N[];	XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefC14N[];

	XMLSEC_EXPORT_VAR const xmlChar xmlSecNameC14NWithComments[];	XMLSEC_EXPORT_VAR const xmlChar xmlSecNameC14NWithComments[];
	XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefC14NWithComments[];	XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefC14NWithComments[];


		XMLSEC_EXPORT_VAR const xmlChar xmlSecNameC14N11[];
		XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefC14N11[];

		XMLSEC_EXPORT_VAR const xmlChar xmlSecNameC14N11WithComments[];
		XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefC14N11WithComments[];

	XMLSEC_EXPORT_VAR const xmlChar xmlSecNameExcC14N[];	XMLSEC_EXPORT_VAR const xmlChar xmlSecNameExcC14N[];
	XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefExcC14N[];	XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefExcC14N[];

	XMLSEC_EXPORT_VAR const xmlChar xmlSecNameExcC14NWithComments[];	XMLSEC_EXPORT_VAR const xmlChar xmlSecNameExcC14NWithComments[];
	XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefExcC14NWithComments[];	XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefExcC14NWithComments[];

	XMLSEC_EXPORT_VAR const xmlChar xmlSecNsExcC14N[];	XMLSEC_EXPORT_VAR const xmlChar xmlSecNsExcC14N[];
	XMLSEC_EXPORT_VAR const xmlChar xmlSecNsExcC14NWithComments[];	XMLSEC_EXPORT_VAR const xmlChar xmlSecNsExcC14NWithComments[];

	XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeInclusiveNamespaces[];	XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeInclusiveNamespaces[];

End of changes. 1 change blocks.
	0 lines changed or deleted	6 lines changed or added