base64.h   base64.h 
skipping to change at line 33 skipping to change at line 33
/** /**
* 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 (void); 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 );
XMLSEC_EXPORT void xmlSecBase64CtxDestroy (xmlSecBase6 4CtxPtr ctx); XMLSEC_EXPORT void xmlSecBase64CtxDestroy (xmlSecBase6 4CtxPtr ctx);
XMLSEC_EXPORT int xmlSecBase64CtxInitialize (xmlSecBase6 4CtxPtr ctx, XMLSEC_EXPORT int xmlSecBase64CtxInitialize (xmlSecBase6 4CtxPtr ctx,
int encode, int encode,
int columns ); int columns );
XMLSEC_EXPORT void xmlSecBase64CtxFinalize (xmlSecBase6 4CtxPtr ctx); XMLSEC_EXPORT void xmlSecBase64CtxFinalize (xmlSecBase6 4CtxPtr ctx);
XMLSEC_EXPORT int xmlSecBase64CtxUpdate (xmlSecBase6 4CtxPtr ctx, XMLSEC_EXPORT int xmlSecBase64CtxUpdate (xmlSecBase6 4CtxPtr ctx,
const xmlSe cByte *in, const xmlSe cByte *in,
xmlSecSize inSize, xmlSecSize inSize,
xmlSecByte *out, xmlSecByte *out,
xmlSecSize outSize); xmlSecSize outSize);
XMLSEC_EXPORT int xmlSecBase64CtxFinal (xmlSecBase6 4CtxPtr ctx, XMLSEC_EXPORT int xmlSecBase64CtxFinal (xmlSecBase6 4CtxPtr ctx,
xmlSecByte *out, xmlSecByte *out,
xmlSecSize outSize); xmlSecSize outSize);
/** /* Standalone routines to do base64 encode/decode "at once" */
* Standalone routine to do base64 encode/decode "at once"
*/
XMLSEC_EXPORT xmlChar* xmlSecBase64Encode (const xmlSe cByte *buf, XMLSEC_EXPORT xmlChar* xmlSecBase64Encode (const xmlSe cByte *buf,
xmlSecSize len, xmlSecSize len,
int columns ); int columns );
XMLSEC_EXPORT int xmlSecBase64Decode (const xmlCh ar* str, XMLSEC_EXPORT int xmlSecBase64Decode (const xmlCh ar* str,
xmlSecByte *buf, xmlSecByte *buf,
xmlSecSize len); xmlSecSize len);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
 End of changes. 2 change blocks. 
6 lines changed or deleted 2 lines changed or added


 keysdata.h   keysdata.h 
skipping to change at line 371 skipping to change at line 371
* The "unknown" id. * The "unknown" id.
*/ */
#define xmlSecKeyDataIdUnknown ((xmlSecKeyDataId)NU LL) #define xmlSecKeyDataIdUnknown ((xmlSecKeyDataId)NU LL)
/** /**
* xmlSecKeyDataInitMethod: * xmlSecKeyDataInitMethod:
* @data: the pointer to key data. * @data: the pointer to key data.
* *
* Key data specific initialization method. * Key data specific initialization method.
* *
* Returns 0 on success or a negative value if an error occurs. * Returns: 0 on success or a negative value if an error occurs.
*/ */
typedef int (*xmlSecKeyDataInitMethod) (xmlSecKeyDa taPtr data); typedef int (*xmlSecKeyDataInitMethod) (xmlSecKeyDa taPtr data);
/** /**
* xmlSecKeyDataDuplicateMethod: * xmlSecKeyDataDuplicateMethod:
* @dst: the pointer to destination key data. * @dst: the pointer to destination key data.
* @src: the poiniter to source key data. * @src: the poiniter to source key data.
* *
* Key data specific duplication (copy) method. * Key data specific duplication (copy) method.
* *
* Returns 0 on success or a negative value if an error occurs. * Returns: 0 on success or a negative value if an error occurs.
*/ */
typedef int (*xmlSecKeyDataDuplicateMethod) (xmlSecKeyDa taPtr dst, typedef int (*xmlSecKeyDataDuplicateMethod) (xmlSecKeyDa taPtr dst,
xmlSecKeyDa taPtr src); xmlSecKeyDa taPtr src);
/** /**
* xmlSecKeyDataFinalizeMethod: * xmlSecKeyDataFinalizeMethod:
* @data: the data. * @data: the data.
* *
* Key data specific finalization method. All the objects and resources all ocated * Key data specific finalization method. All the objects and resources all ocated
* by the key data object must be freed inside this method. * by the key data object must be freed inside this method.
skipping to change at line 405 skipping to change at line 405
/** /**
* xmlSecKeyDataXmlReadMethod: * xmlSecKeyDataXmlReadMethod:
* @id: the data id. * @id: the data id.
* @key: the key. * @key: the key.
* @node: the pointer to data's value XML node. * @node: the pointer to data's value XML node.
* @keyInfoCtx: the <dsig:KeyInfo/> node processing context. * @keyInfoCtx: the <dsig:KeyInfo/> node processing context.
* *
* Key data specific method for reading XML node. * Key data specific method for reading XML node.
* *
* Returns 0 on success or a negative value if an error occurs. * Returns: 0 on success or a negative value if an error occurs.
*/ */
typedef int (*xmlSecKeyDataXmlReadMethod) (xmlSecKeyDa taId id, typedef int (*xmlSecKeyDataXmlReadMethod) (xmlSecKeyDa taId id,
xmlSecKeyPt r key, xmlSecKeyPt r key,
xmlNodePtr node, xmlNodePtr node,
xmlSecKeyIn foCtxPtr keyInfoCtx); xmlSecKeyIn foCtxPtr keyInfoCtx);
/** /**
* xmlSecKeyDataXmlWriteMethod: * xmlSecKeyDataXmlWriteMethod:
* @id: the data id. * @id: the data id.
* @key: the key. * @key: the key.
* @node: the pointer to data's value XML node. * @node: the pointer to data's value XML node.
* @keyInfoCtx: the <dsig:KeyInfo> node processing context. * @keyInfoCtx: the <dsig:KeyInfo> node processing context.
* *
* Key data specific method for writing XML node. * Key data specific method for writing XML node.
* *
* Returns 0 on success or a negative value if an error occurs. * Returns: 0 on success or a negative value if an error occurs.
*/ */
typedef int (*xmlSecKeyDataXmlWriteMethod) (xmlSecKeyDa taId id, typedef int (*xmlSecKeyDataXmlWriteMethod) (xmlSecKeyDa taId id,
xmlSecKeyPt r key, xmlSecKeyPt r key,
xmlNodePtr node, xmlNodePtr node,
xmlSecKeyIn foCtxPtr keyInfoCtx); xmlSecKeyIn foCtxPtr keyInfoCtx);
/** /**
* xmlSecKeyDataBinReadMethod: * xmlSecKeyDataBinReadMethod:
* @id: the data id. * @id: the data id.
* @key: the key. * @key: the key.
* @buf: the input buffer. * @buf: the input buffer.
* @bufSize: the buffer size. * @bufSize: the buffer size.
* @keyInfoCtx: the <dsig:KeyInfo/> node processing context. * @keyInfoCtx: the <dsig:KeyInfo/> node processing context.
* *
* Key data specific method for reading binary buffer. * Key data specific method for reading binary buffer.
* *
* Returns 0 on success or a negative value if an error occurs. * Returns: 0 on success or a negative value if an error occurs.
*/ */
typedef int (*xmlSecKeyDataBinReadMethod) (xmlSecKeyDa taId id, typedef int (*xmlSecKeyDataBinReadMethod) (xmlSecKeyDa taId id,
xmlSecKeyPt r key, xmlSecKeyPt r key,
const xmlSe cByte* buf, const xmlSe cByte* buf,
xmlSecSize bufSize, xmlSecSize bufSize,
xmlSecKeyIn foCtxPtr keyInfoCtx); xmlSecKeyIn foCtxPtr keyInfoCtx);
/** /**
* xmlSecKeyDataBinWriteMethod: * xmlSecKeyDataBinWriteMethod:
* @id: the data id. * @id: the data id.
* @key: the key. * @key: the key.
* @buf: the output buffer. * @buf: the output buffer.
* @bufSize: the buffer size. * @bufSize: the buffer size.
* @keyInfoCtx: the <dsig:KeyInfo/> node processing context. * @keyInfoCtx: the <dsig:KeyInfo/> node processing context.
* *
* Key data specific method for reading binary buffer. * Key data specific method for reading binary buffer.
* *
* Returns 0 on success or a negative value if an error occurs. * Returns: 0 on success or a negative value if an error occurs.
*/ */
typedef int (*xmlSecKeyDataBinWriteMethod) (xmlSecKeyDa taId id, typedef int (*xmlSecKeyDataBinWriteMethod) (xmlSecKeyDa taId id,
xmlSecKeyPt r key, xmlSecKeyPt r key,
xmlSecByte* * buf, xmlSecByte* * buf,
xmlSecSize* bufSize, xmlSecSize* bufSize,
xmlSecKeyIn foCtxPtr keyInfoCtx); xmlSecKeyIn foCtxPtr keyInfoCtx);
/** /**
* xmlSecKeyDataGenerateMethod: * xmlSecKeyDataGenerateMethod:
* @data: the pointer to key data. * @data: the pointer to key data.
* @sizeBits: the key data specific size. * @sizeBits: the key data specific size.
* @type: the required key type (session/permanent, etc.) * @type: the required key type (session/permanent, etc.)
* *
* Key data specific method for generating new key data. * Key data specific method for generating new key data.
* *
* Returns 0 on success or a negative value if an error occurs. * Returns: 0 on success or a negative value if an error occurs.
*/ */
typedef int (*xmlSecKeyDataGenerateMethod) (xmlSecKeyDa taPtr data, typedef int (*xmlSecKeyDataGenerateMethod) (xmlSecKeyDa taPtr data,
xmlSecSize sizeBits, xmlSecSize sizeBits,
xmlSecKeyDa taType type); xmlSecKeyDa taType type);
/** /**
* xmlSecKeyDataGetTypeMethod: * xmlSecKeyDataGetTypeMethod:
* @data: the data. * @data: the data.
* *
* Key data specific method to get the key type. * Key data specific method to get the key type.
* *
* Returns the key type. * Returns: the key type.
*/ */
typedef xmlSecKeyDataType (*xmlSecKeyDataGetTypeMethod) (xmlSecKeyDa taPtr data); typedef xmlSecKeyDataType (*xmlSecKeyDataGetTypeMethod) (xmlSecKeyDa taPtr data);
/** /**
* xmlSecKeyDataGetSizeMethod: * xmlSecKeyDataGetSizeMethod:
* @data: the pointer to key data. * @data: the pointer to key data.
* *
* Key data specific method to get the key size. * Key data specific method to get the key size.
* *
* Returns the key size in bits. * Returns: the key size in bits.
*/ */
typedef xmlSecSize (*xmlSecKeyDataGetSizeMethod) (xmlSecKeyDa taPtr data); typedef xmlSecSize (*xmlSecKeyDataGetSizeMethod) (xmlSecKeyDa taPtr data);
/** /**
* xmlSecKeyDataGetIdentifierMethod: * xmlSecKeyDataGetIdentifierMethod:
* @data: the pointer to key data. * @data: the pointer to key data.
* *
* Key data specific method to get the key data identifier string (for exam ple, * Key data specific method to get the key data identifier string (for exam ple,
* X509 data identifier is the subject of the verified cert). * X509 data identifier is the subject of the verified cert).
* *
* Returns the identifier string or NULL if an error occurs. * Returns: the identifier string or NULL if an error occurs.
*/ */
typedef const xmlChar* (*xmlSecKeyDataGetIdentifierMethod) (xmlSecK eyDataPtr data); typedef const xmlChar* (*xmlSecKeyDataGetIdentifierMethod) (xmlSecK eyDataPtr data);
/** /**
* xmlSecKeyDataDebugDumpMethod: * xmlSecKeyDataDebugDumpMethod:
* @data: the data. * @data: the data.
* @output: the FILE to print debug info (should be open for wri ting). * @output: the FILE to print debug info (should be open for wri ting).
* *
* Key data specific method for printing debug info. * Key data specific method for printing debug info.
*/ */
skipping to change at line 766 skipping to change at line 766
* The "unknown" id. * The "unknown" id.
*/ */
#define xmlSecKeyDataStoreIdUnknown NULL #define xmlSecKeyDataStoreIdUnknown NULL
/** /**
* xmlSecKeyDataStoreInitializeMethod: * xmlSecKeyDataStoreInitializeMethod:
* @store: the data store. * @store: the data store.
* *
* Key data store specific initialization method. * Key data store specific initialization method.
* *
* Returns 0 on success or a negative value if an error occurs. * Returns: 0 on success or a negative value if an error occurs.
*/ */
typedef int (*xmlSecKeyDataStoreInitializeMethod) (xml SecKeyDataStorePtr store); typedef int (*xmlSecKeyDataStoreInitializeMethod) (xml SecKeyDataStorePtr store);
/** /**
* xmlSecKeyDataStoreFinalizeMethod: * xmlSecKeyDataStoreFinalizeMethod:
* @store: the data store. * @store: the data store.
* *
* Key data store specific finalization (destroy) method. * Key data store specific finalization (destroy) method.
*/ */
typedef void (*xmlSecKeyDataStoreFinalizeMethod) (xml SecKeyDataStorePtr store); typedef void (*xmlSecKeyDataStoreFinalizeMethod) (xml SecKeyDataStorePtr store);
 End of changes. 11 change blocks. 
11 lines changed or deleted 11 lines changed or added


 keysmngr.h   keysmngr.h 
skipping to change at line 57 skipping to change at line 57
XMLSEC_EXPORT xmlSecKeyDataStorePtr xmlSecKeysMngrGetDataStore (xml SecKeysMngrPtr mngr, XMLSEC_EXPORT xmlSecKeyDataStorePtr xmlSecKeysMngrGetDataStore (xml SecKeysMngrPtr mngr,
xml SecKeyDataStoreId id); xml SecKeyDataStoreId id);
/** /**
* xmlSecGetKeyCallback: * xmlSecGetKeyCallback:
* @keyInfoNode: the pointer to <dsig:KeyInfo/> node. * @keyInfoNode: the pointer to <dsig:KeyInfo/> node.
* @keyInfoCtx: the pointer to <dsig:KeyInfo/> node processing context. * @keyInfoCtx: the pointer to <dsig:KeyInfo/> node processing context.
* *
* Reads the <dsig:KeyInfo/> node @keyInfoNode and extracts the key. * Reads the <dsig:KeyInfo/> node @keyInfoNode and extracts the key.
* *
* Returns the pointer to key or NULL if the key is not found or * Returns: the pointer to key or NULL if the key is not found or
* an error occurs. * an error occurs.
*/ */
typedef xmlSecKeyPtr (*xmlSecGetKeyCallback) (xmlNodePtr keyInfoN ode, typedef xmlSecKeyPtr (*xmlSecGetKeyCallback) (xmlNodePtr keyInfoN ode,
xmlSecKeyInfoCtxPtr keyInfoCtx); xmlSecKeyInfoCtxPtr keyInfoCtx);
/** /**
* xmlSecKeysMngr: * xmlSecKeysMngr:
* @keysStore: the key store (list of keys known to keys ma nager). * @keysStore: the key store (list of keys known to keys ma nager).
* @storesList: the list of key data stores known to keys manager. * @storesList: the list of key data stores known to keys manager.
* @getKey: the callback used to read <dsig:KeyInfo/> no de. * @getKey: the callback used to read <dsig:KeyInfo/> no de.
skipping to change at line 165 skipping to change at line 165
* The "unknown" id. * The "unknown" id.
*/ */
#define xmlSecKeyStoreIdUnknown ((xmlSecKeyDataStore Id)NULL) #define xmlSecKeyStoreIdUnknown ((xmlSecKeyDataStore Id)NULL)
/** /**
* xmlSecKeyStoreInitializeMethod: * xmlSecKeyStoreInitializeMethod:
* @store: the store. * @store: the store.
* *
* Keys store specific initialization method. * Keys store specific initialization method.
* *
* Returns 0 on success or a negative value if an error occurs. * Returns: 0 on success or a negative value if an error occurs.
*/ */
typedef int (*xmlSecKeyStoreInitializeMethod) (xml SecKeyStorePtr store); typedef int (*xmlSecKeyStoreInitializeMethod) (xml SecKeyStorePtr store);
/** /**
* xmlSecKeyStoreFinalizeMethod: * xmlSecKeyStoreFinalizeMethod:
* @store: the store. * @store: the store.
* *
* Keys store specific finalization (destroy) method. * Keys store specific finalization (destroy) method.
*/ */
typedef void (*xmlSecKeyStoreFinalizeMethod) (xml SecKeyStorePtr store); typedef void (*xmlSecKeyStoreFinalizeMethod) (xml SecKeyStorePtr store);
/** /**
* xmlSecKeyStoreFindKeyMethod: * xmlSecKeyStoreFindKeyMethod:
* @store: the store. * @store: the store.
* @name: the desired key name. * @name: the desired key name.
* @keyInfoCtx: the pointer to key info context. * @keyInfoCtx: the pointer to key info context.
* *
* Keys store specific find method. The caller is responsible for destroyin g * Keys store specific find method. The caller is responsible for destroyin g
* the returned key using #xmlSecKeyDestroy method. * the returned key using #xmlSecKeyDestroy method.
* *
* Returns the pointer to a key or NULL if key is not found or an error occ urs. * Returns: the pointer to a key or NULL if key is not found or an error oc curs.
*/ */
typedef xmlSecKeyPtr (*xmlSecKeyStoreFindKeyMethod) (xmlSecKeySt orePtr store, typedef xmlSecKeyPtr (*xmlSecKeyStoreFindKeyMethod) (xmlSecKeySt orePtr store,
const xmlCh ar* name, const xmlCh ar* name,
xmlSecKeyIn foCtxPtr keyInfoCtx); xmlSecKeyIn foCtxPtr keyInfoCtx);
/** /**
* xmlSecKeyStoreKlass: * xmlSecKeyStoreKlass:
* @klassSize: the store klass size. * @klassSize: the store klass size.
* @objSize: the store obj size. * @objSize: the store obj size.
* @name: the store's name. * @name: the store's name.
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 list.h   list.h 
skipping to change at line 121 skipping to change at line 121
* The "unknown" id. * The "unknown" id.
*/ */
#define xmlSecPtrListIdUnknown NULL #define xmlSecPtrListIdUnknown NULL
/** /**
* xmlSecPtrDuplicateItemMethod: * xmlSecPtrDuplicateItemMethod:
* @ptr: the poinetr to list item. * @ptr: the poinetr to list item.
* *
* Duplicates item @ptr. * Duplicates item @ptr.
* *
* Returns pointer to new item copy or NULL if an error occurs. * Returns: pointer to new item copy or NULL if an error occurs.
*/ */
typedef xmlSecPtr (*xmlSecPtrDuplicateItemMethod) (xmlSecPtr p tr); typedef xmlSecPtr (*xmlSecPtrDuplicateItemMethod) (xmlSecPtr p tr);
/** /**
* xmlSecPtrDestroyItemMethod: * xmlSecPtrDestroyItemMethod:
* @ptr: the poinetr to list item. * @ptr: the poinetr to list item.
* *
* Destroys list item @ptr. * Destroys list item @ptr.
*/ */
typedef void (*xmlSecPtrDestroyItemMethod) (xmlSecPtr p tr); typedef void (*xmlSecPtrDestroyItemMethod) (xmlSecPtr p tr);
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 nodeset.h   nodeset.h 
skipping to change at line 100 skipping to change at line 100
/** /**
* xmlSecNodeSetWalkCallback: * xmlSecNodeSetWalkCallback:
* @nset: the pointer to #xmlSecNodeSet structure. * @nset: the pointer to #xmlSecNodeSet structure.
* @cur: the pointer current XML node. * @cur: the pointer current XML node.
* @parent: the pointer to the @cur parent node. * @parent: the pointer to the @cur parent node.
* @data: the pointer to application specific data. * @data: the pointer to application specific data.
* *
* The callback function called once per each node in the nodes set. * The callback function called once per each node in the nodes set.
* *
* Returns 0 on success or a negative value if an error occurs * Returns: 0 on success or a negative value if an error occurs
* an walk procedure should be interrupted. * an walk procedure should be interrupted.
*/ */
typedef int (*xmlSecNodeSetWalkCallback) (xmlSecNodeSetPtr ns et, typedef int (*xmlSecNodeSetWalkCallback) (xmlSecNodeSetPtr ns et,
xmlNodePtr cur, xmlNodePtr cur,
xmlNodePtr parent, xmlNodePtr parent,
void* data); void* data);
XMLSEC_EXPORT xmlSecNodeSetPtr xmlSecNodeSetCreate (xmlDocPtr doc, XMLSEC_EXPORT xmlSecNodeSetPtr xmlSecNodeSetCreate (xmlDocPtr doc,
xmlNodeSetPtr nodes , xmlNodeSetPtr nodes ,
xmlSecNodeSetType t ype); xmlSecNodeSetType t ype);
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 private.h   private.h 
skipping to change at line 42 skipping to change at line 42
/************************************************************************** *** /************************************************************************** ***
* *
* Crypto Init/shutdown * Crypto Init/shutdown
* *
************************************************************************** **/ ************************************************************************** **/
/** /**
* xmlSecCryptoInitMethod: * xmlSecCryptoInitMethod:
* *
* xmlsec-crypto libraryinitialization method. * xmlsec-crypto libraryinitialization method.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecCryptoInitMethod) (voi d); typedef int (*xmlSecCryptoInitMethod) (voi d);
/** /**
* xmlSecCryptoShutdownMethod: * xmlSecCryptoShutdownMethod:
* *
* xmlsec-crypto library shutdown method. * xmlsec-crypto library shutdown method.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecCryptoShutdownMethod) (voi d); typedef int (*xmlSecCryptoShutdownMethod) (voi d);
/** /**
* xmlSecCryptoKeysMngrInitMethod: * xmlSecCryptoKeysMngrInitMethod:
* @mngr: the pointer to keys manager. * @mngr: the pointer to keys manager.
* *
* Initializes @mngr with xmlsec-crypto library specific data. * Initializes @mngr with xmlsec-crypto library specific data.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecCryptoKeysMngrInitMethod) (xml SecKeysMngrPtr mngr); typedef int (*xmlSecCryptoKeysMngrInitMethod) (xml SecKeysMngrPtr mngr);
/************************************************************************** *** /************************************************************************** ***
* *
* Key data ids * Key data ids
* *
************************************************************************** **/ ************************************************************************** **/
/** /**
* xmlSecCryptoKeyDataGetKlassMethod: * xmlSecCryptoKeyDataGetKlassMethod:
* *
* Gets the key data klass. * Gets the key data klass.
* *
* Returns pointer to key data klass or NULL if an error occurs * Returns: pointer to key data klass or NULL if an error occurs
* (the xmlsec-crypto library is not loaded or this key data klass is not * (the xmlsec-crypto library is not loaded or this key data klass is not
* implemented). * implemented).
*/ */
typedef xmlSecKeyDataId (*xmlSecCryptoKeyDataGetKlassMethod) (void); typedef xmlSecKeyDataId (*xmlSecCryptoKeyDataGetKlassMethod) (void);
/************************************************************************** *** /************************************************************************** ***
* *
* Key data store ids * Key data store ids
* *
************************************************************************** **/ ************************************************************************** **/
/** /**
* xmlSecCryptoKeyDataStoreGetKlassMethod: * xmlSecCryptoKeyDataStoreGetKlassMethod:
* *
* Gets the key data store klass. * Gets the key data store klass.
* *
* Returns pointer to key data store klass or NULL if an error occurs * Returns: pointer to key data store klass or NULL if an error occurs
* (the xmlsec-crypto library is not loaded or this key data store klass is not * (the xmlsec-crypto library is not loaded or this key data store klass is not
* implemented). * implemented).
*/ */
typedef xmlSecKeyDataStoreId (*xmlSecCryptoKeyDataStoreGetKlassMethod)(vo id); typedef xmlSecKeyDataStoreId (*xmlSecCryptoKeyDataStoreGetKlassMethod)(vo id);
/************************************************************************** *** /************************************************************************** ***
* *
* Crypto transforms ids * Crypto transforms ids
* *
************************************************************************** **/ ************************************************************************** **/
/** /**
* xmlSecCryptoTransformGetKlassMethod: * xmlSecCryptoTransformGetKlassMethod:
* *
* Gets the transform klass. * Gets the transform klass.
* *
* Returns pointer to transform klass or NULL if an error occurs * Returns: pointer to transform klass or NULL if an error occurs
* (the xmlsec-crypto library is not loaded or this transform is not * (the xmlsec-crypto library is not loaded or this transform is not
* implemented). * implemented).
*/ */
typedef xmlSecTransformId (*xmlSecCryptoTransformGetKlassMethod) (voi d); typedef xmlSecTransformId (*xmlSecCryptoTransformGetKlassMethod) (voi d);
/************************************************************************** *** /************************************************************************** ***
* *
* High level routines form xmlsec command line utility * High level routines form xmlsec command line utility
* *
************************************************************************** **/ ************************************************************************** **/
/** /**
* xmlSecCryptoAppInitMethod: * xmlSecCryptoAppInitMethod:
* @config: the path to crypto library configuration. * @config: the path to crypto library configuration.
* *
* General crypto engine initialization. This function is used * General crypto engine initialization. This function is used
* by XMLSec command line utility and called before * by XMLSec command line utility and called before
* @xmlSecInit function. * @xmlSecInit function.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecCryptoAppInitMethod) (con st char* config); typedef int (*xmlSecCryptoAppInitMethod) (con st char* config);
/** /**
* xmlSecCryptoAppShutdownMethod: * xmlSecCryptoAppShutdownMethod:
* *
* General crypto engine shutdown. This function is used * General crypto engine shutdown. This function is used
* by XMLSec command line utility and called after * by XMLSec command line utility and called after
* @xmlSecShutdown function. * @xmlSecShutdown function.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecCryptoAppShutdownMethod) (voi d); typedef int (*xmlSecCryptoAppShutdownMethod) (voi d);
/** /**
* xmlSecCryptoAppDefaultKeysMngrInitMethod: * xmlSecCryptoAppDefaultKeysMngrInitMethod:
* @mngr: the pointer to keys manager. * @mngr: the pointer to keys manager.
* *
* Initializes @mngr with simple keys store #xmlSecSimpleKeysStoreId * Initializes @mngr with simple keys store #xmlSecSimpleKeysStoreId
* and a default crypto key data stores. * and a default crypto key data stores.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecCryptoAppDefaultKeysMngrInitMethod) typedef int (*xmlSecCryptoAppDefaultKeysMngrInitMethod)
(xml SecKeysMngrPtr mngr); (xml SecKeysMngrPtr mngr);
/** /**
* xmlSecCryptoAppDefaultKeysMngrAdoptKeyMethod: * xmlSecCryptoAppDefaultKeysMngrAdoptKeyMethod:
* @mngr: the pointer to keys manager. * @mngr: the pointer to keys manager.
* @key: the pointer to key. * @key: the pointer to key.
* *
* Adds @key to the keys manager @mngr created with #xmlSecCryptoAppDefault KeysMngrInit * Adds @key to the keys manager @mngr created with #xmlSecCryptoAppDefault KeysMngrInit
* function. * function.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecCryptoAppDefaultKeysMngrAdoptKeyMeth od) typedef int (*xmlSecCryptoAppDefaultKeysMngrAdoptKeyMeth od)
(xml SecKeysMngrPtr mngr, (xml SecKeysMngrPtr mngr,
xml SecKeyPtr key); xml SecKeyPtr key);
/** /**
* xmlSecCryptoAppDefaultKeysMngrLoadMethod: * xmlSecCryptoAppDefaultKeysMngrLoadMethod:
* @mngr: the pointer to keys manager. * @mngr: the pointer to keys manager.
* @uri: the uri. * @uri: the uri.
* *
* Loads XML keys file from @uri to the keys manager @mngr created * Loads XML keys file from @uri to the keys manager @mngr created
* with #xmlSecCryptoAppDefaultKeysMngrInit function. * with #xmlSecCryptoAppDefaultKeysMngrInit function.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecCryptoAppDefaultKeysMngrLoadMethod) typedef int (*xmlSecCryptoAppDefaultKeysMngrLoadMethod)
(xml SecKeysMngrPtr mngr, (xml SecKeysMngrPtr mngr,
con st char* uri); con st char* uri);
/** /**
* xmlSecCryptoAppDefaultKeysMngrSaveMethod: * xmlSecCryptoAppDefaultKeysMngrSaveMethod:
* @mngr: the pointer to keys manager. * @mngr: the pointer to keys manager.
* @filename: the destination filename. * @filename: the destination filename.
* @type: the type of keys to save (public/private/symmetric). * @type: the type of keys to save (public/private/symmetric).
* *
* Saves keys from @mngr to XML keys file. * Saves keys from @mngr to XML keys file.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecCryptoAppDefaultKeysMngrSaveMethod) typedef int (*xmlSecCryptoAppDefaultKeysMngrSaveMethod)
(xml SecKeysMngrPtr mngr, (xml SecKeysMngrPtr mngr,
con st char* filename, con st char* filename,
xml SecKeyDataType type); xml SecKeyDataType type);
/** /**
* xmlSecCryptoAppKeysMngrCertLoadMethod: * xmlSecCryptoAppKeysMngrCertLoadMethod:
* @mngr: the keys manager. * @mngr: the keys manager.
* @filename: the certificate file. * @filename: the certificate file.
* @format: the certificate file format. * @format: the certificate file format.
* @type: the flag that indicates is the certificate in @filen ame * @type: the flag that indicates is the certificate in @filen ame
* trusted or not. * trusted or not.
* *
* Reads cert from @filename and adds to the list of trusted or known * Reads cert from @filename and adds to the list of trusted or known
* untrusted certs in @store. * untrusted certs in @store.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecCryptoAppKeysMngrCertLoadMethod)(xml SecKeysMngrPtr mngr, typedef int (*xmlSecCryptoAppKeysMngrCertLoadMethod)(xml SecKeysMngrPtr mngr,
con st char *filename, con st char *filename,
xml SecKeyDataFormat format, xml SecKeyDataFormat format,
xml SecKeyDataType type); xml SecKeyDataType type);
/** /**
* xmlSecCryptoAppKeysMngrCertLoadMemoryMethod: * xmlSecCryptoAppKeysMngrCertLoadMemoryMethod:
* @mngr: the keys manager. * @mngr: the keys manager.
* @data: the key data. * @data: the key data.
* @dataSize: the key data size. * @dataSize: the key data size.
* @format: the certificate format. * @format: the certificate format.
* @type: the flag that indicates is the certificate in @data * @type: the flag that indicates is the certificate in @data
* trusted or not. * trusted or not.
* *
* Reads cert from @data and adds to the list of trusted or known * Reads cert from @data and adds to the list of trusted or known
* untrusted certs in @store. * untrusted certs in @store.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecCryptoAppKeysMngrCertLoadMemoryMetho d)(xmlSecKeysMngrPtr mngr, typedef int (*xmlSecCryptoAppKeysMngrCertLoadMemoryMetho d)(xmlSecKeysMngrPtr mngr,
con st xmlSecByte* data, con st xmlSecByte* data,
xml SecSize dataSize, xml SecSize dataSize,
xml SecKeyDataFormat format, xml SecKeyDataFormat format,
xml SecKeyDataType type); xml SecKeyDataType type);
/** /**
* xmlSecCryptoAppKeyLoadMethod: * xmlSecCryptoAppKeyLoadMethod:
* @filename: the key filename. * @filename: the key filename.
* @format: the key file format. * @format: the key file format.
* @pwd: the key file password. * @pwd: the key file password.
* @pwdCallback: the key password callback. * @pwdCallback: the key password callback.
* @pwdCallbackCtx: the user context for password callback. * @pwdCallbackCtx: the user context for password callback.
* *
* Reads key from the a file. * Reads key from the a file.
* *
* Returns pointer to the key or NULL if an error occurs. * Returns: pointer to the key or NULL if an error occurs.
*/ */
typedef xmlSecKeyPtr (*xmlSecCryptoAppKeyLoadMethod) (con st char *filename, typedef xmlSecKeyPtr (*xmlSecCryptoAppKeyLoadMethod) (con st char *filename,
xml SecKeyDataFormat format, xml SecKeyDataFormat format,
con st char *pwd, con st char *pwd,
voi d* pwdCallback, voi d* pwdCallback,
voi d* pwdCallbackCtx); voi d* pwdCallbackCtx);
/** /**
* xmlSecCryptoAppKeyLoadMemoryMethod: * xmlSecCryptoAppKeyLoadMemoryMethod:
* @data: the key data. * @data: the key data.
* @dataSize: the key data size. * @dataSize: the key data size.
* @format: the key data format. * @format: the key data format.
* @pwd: the key data password. * @pwd: the key data password.
* @pwdCallback: the key password callback. * @pwdCallback: the key password callback.
* @pwdCallbackCtx: the user context for password callback. * @pwdCallbackCtx: the user context for password callback.
* *
* Reads key from the binary data buffer. * Reads key from the binary data buffer.
* *
* Returns pointer to the key or NULL if an error occurs. * Returns: pointer to the key or NULL if an error occurs.
*/ */
typedef xmlSecKeyPtr (*xmlSecCryptoAppKeyLoadMemoryMethod) (con st xmlSecByte* data, typedef xmlSecKeyPtr (*xmlSecCryptoAppKeyLoadMemoryMethod) (con st xmlSecByte* data,
xml SecSize dataSize, xml SecSize dataSize,
xml SecKeyDataFormat format, xml SecKeyDataFormat format,
con st char *pwd, con st char *pwd,
voi d* pwdCallback, voi d* pwdCallback,
voi d* pwdCallbackCtx); voi d* pwdCallbackCtx);
/** /**
* xmlSecCryptoAppPkcs12LoadMethod: * xmlSecCryptoAppPkcs12LoadMethod:
* @filename: the PKCS12 key filename. * @filename: the PKCS12 key filename.
* @pwd: the PKCS12 file password. * @pwd: the PKCS12 file password.
* @pwdCallback: the password callback. * @pwdCallback: the password callback.
* @pwdCallbackCtx: the user context for password callback. * @pwdCallbackCtx: the user context for password callback.
* *
* Reads key and all associated certificates from the PKCS12 file. * Reads key and all associated certificates from the PKCS12 file.
* For uniformity, call xmlSecCryptoAppKeyLoad instead of this function. Pa ss * For uniformity, call xmlSecCryptoAppKeyLoad instead of this function. Pa ss
* in format=xmlSecKeyDataFormatPkcs12. * in format=xmlSecKeyDataFormatPkcs12.
* *
* Returns pointer to the key or NULL if an error occurs. * Returns: pointer to the key or NULL if an error occurs.
*/ */
typedef xmlSecKeyPtr (*xmlSecCryptoAppPkcs12LoadMethod) (con st char* filename, typedef xmlSecKeyPtr (*xmlSecCryptoAppPkcs12LoadMethod) (con st char* filename,
con st char* pwd, con st char* pwd,
voi d* pwdCallback, voi d* pwdCallback,
voi d* pwdCallbackCtx); voi d* pwdCallbackCtx);
/** /**
* xmlSecCryptoAppPkcs12LoadMemoryMethod: * xmlSecCryptoAppPkcs12LoadMemoryMethod:
* @data: the pkcs12 data. * @data: the pkcs12 data.
* @dataSize: the pkcs12 data size. * @dataSize: the pkcs12 data size.
* @pwd: the PKCS12 data password. * @pwd: the PKCS12 data password.
* @pwdCallback: the password callback. * @pwdCallback: the password callback.
* @pwdCallbackCtx: the user context for password callback. * @pwdCallbackCtx: the user context for password callback.
* *
* Reads key and all associated certificates from the PKCS12 binary data. * Reads key and all associated certificates from the PKCS12 binary data.
* For uniformity, call xmlSecCryptoAppKeyLoad instead of this function. Pa ss * For uniformity, call xmlSecCryptoAppKeyLoad instead of this function. Pa ss
* in format=xmlSecKeyDataFormatPkcs12. * in format=xmlSecKeyDataFormatPkcs12.
* *
* Returns pointer to the key or NULL if an error occurs. * Returns: pointer to the key or NULL if an error occurs.
*/ */
typedef xmlSecKeyPtr (*xmlSecCryptoAppPkcs12LoadMemoryMethod)(con st xmlSecByte* data, typedef xmlSecKeyPtr (*xmlSecCryptoAppPkcs12LoadMemoryMethod)(con st xmlSecByte* data,
xml SecSize dataSize, xml SecSize dataSize,
con st char* pwd, con st char* pwd,
voi d* pwdCallback, voi d* pwdCallback,
voi d* pwdCallbackCtx); voi d* pwdCallbackCtx);
/** /**
* xmlSecCryptoAppKeyCertLoadMethod: * xmlSecCryptoAppKeyCertLoadMethod:
* @key: the pointer to key. * @key: the pointer to key.
* @filename: the certificate filename. * @filename: the certificate filename.
* @format: the certificate file format. * @format: the certificate file format.
* *
* Reads the certificate from $@filename and adds it to key. * Reads the certificate from $@filename and adds it to key.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecCryptoAppKeyCertLoadMethod) (xml SecKeyPtr key, typedef int (*xmlSecCryptoAppKeyCertLoadMethod) (xml SecKeyPtr key,
con st char* filename, con st char* filename,
xml SecKeyDataFormat format); xml SecKeyDataFormat format);
/** /**
* xmlSecCryptoAppKeyCertLoadMemoryMethod: * xmlSecCryptoAppKeyCertLoadMemoryMethod:
* @key: the pointer to key. * @key: the pointer to key.
* @data: the cert data. * @data: the cert data.
* @dataSize: the cert data size. * @dataSize: the cert data size.
* @format: the certificate data format. * @format: the certificate data format.
* *
* Reads the certificate from binary @data buffer and adds it to key. * Reads the certificate from binary @data buffer and adds it to key.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecCryptoAppKeyCertLoadMemoryMethod)(xm lSecKeyPtr key, typedef int (*xmlSecCryptoAppKeyCertLoadMemoryMethod)(xm lSecKeyPtr key,
con st xmlSecByte* data, con st xmlSecByte* data,
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.
 End of changes. 20 change blocks. 
20 lines changed or deleted 20 lines changed or added


 transforms.h   transforms.h 
skipping to change at line 267 skipping to change at line 267
*************************************************************************/ *************************************************************************/
/** /**
* xmlSecTransformCtxPreExecuteCallback: * xmlSecTransformCtxPreExecuteCallback:
* @transformCtx: the pointer to transform's context. * @transformCtx: the pointer to transform's context.
* *
* The callback called after creating transforms chain but before * The callback called after creating transforms chain but before
* starting data processing. Application can use this callback to * starting data processing. Application can use this callback to
* do additional transforms chain verification or modification and * do additional transforms chain verification or modification and
* aborting transforms execution (if necessary). * aborting transforms execution (if necessary).
* *
* Returns 0 on success and a negative value otherwise (in this case, * Returns: 0 on success and a negative value otherwise (in this case,
* transforms chain will not be executed and xmlsec processing stops). * transforms chain will not be executed and xmlsec processing stops).
*/ */
typedef int (*xmlSecTransformCtxPreExecuteCallback) (xml SecTransformCtxPtr transformCtx); typedef int (*xmlSecTransformCtxPreExecuteCallback) (xml SecTransformCtxPtr transformCtx);
/** /**
* XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK: * XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK:
* *
* If this flag is set then URI ID references are resolved directly * If this flag is set then URI ID references are resolved directly
* without using XPointers. This allows one to sign/verify Visa3D * without using XPointers. This allows one to sign/verify Visa3D
* documents that don't follow XML, XPointer and XML DSig specifications. * documents that don't follow XML, XPointer and XML DSig specifications.
skipping to change at line 576 skipping to change at line 576
* *
* Transform Klass * Transform Klass
* *
************************************************************************/ ************************************************************************/
/** /**
* xmlSecTransformInitializeMethod: * xmlSecTransformInitializeMethod:
* @transform: the pointer to transform object. * @transform: the pointer to transform object.
* *
* The transform specific initialization method. * The transform specific initialization method.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecTransformInitializeMethod) (xmlSecTrans formPtr transform); typedef int (*xmlSecTransformInitializeMethod) (xmlSecTrans formPtr transform);
/** /**
* xmlSecTransformFinalizeMethod: * xmlSecTransformFinalizeMethod:
* @transform: the pointer to transform object. * @transform: the pointer to transform object.
* *
* The transform specific destroy method. * The transform specific destroy method.
*/ */
typedef void (*xmlSecTransformFinalizeMethod) (xmlSecTrans formPtr transform); typedef void (*xmlSecTransformFinalizeMethod) (xmlSecTrans formPtr transform);
/** /**
* xmlSecTransformGetDataTypeMethod: * xmlSecTransformGetDataTypeMethod:
* @transform: the pointer to transform object. * @transform: the pointer to transform object.
* @mode: the mode. * @mode: the mode.
* @transformCtx: the pointer to transform context object. * @transformCtx: the pointer to transform context object.
* *
* The transform specific method to query information about transform * The transform specific method to query information about transform
* data type in specified mode @mode. * data type in specified mode @mode.
* *
* Returns transform data type. * Returns: transform data type.
*/ */
typedef xmlSecTransformDataType (*xmlSecTransformGetDataTypeMethod)( xmlSecTransformPtr transform, typedef xmlSecTransformDataType (*xmlSecTransformGetDataTypeMethod)( xmlSecTransformPtr transform,
xmlSecTrans formMode mode, xmlSecTrans formMode mode,
xmlSecTrans formCtxPtr transformCtx); xmlSecTrans formCtxPtr transformCtx);
/** /**
* xmlSecTransformNodeReadMethod: * xmlSecTransformNodeReadMethod:
* @transform: the pointer to transform object. * @transform: the pointer to transform object.
* @node: the pointer to <dsig:Transform/> node. * @node: the pointer to <dsig:Transform/> node.
* @transformCtx: the pointer to transform context object. * @transformCtx: the pointer to transform context object.
* *
* The transform specific method to read the transform data from * The transform specific method to read the transform data from
* the @node. * the @node.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecTransformNodeReadMethod) (xmlSecTrans formPtr transform, typedef int (*xmlSecTransformNodeReadMethod) (xmlSecTrans formPtr transform,
xmlNodePtr node, xmlNodePtr node,
xmlSecTrans formCtxPtr transformCtx); xmlSecTrans formCtxPtr transformCtx);
/** /**
* xmlSecTransformNodeWriteMethod: * xmlSecTransformNodeWriteMethod:
* @transform: the pointer to transform object. * @transform: the pointer to transform object.
* @node: the pointer to <dsig:Transform/> node. * @node: the pointer to <dsig:Transform/> node.
* @transformCtx: the pointer to transform context object. * @transformCtx: the pointer to transform context object.
* *
* The transform specific method to write transform information to an XML n ode @node. * The transform specific method to write transform information to an XML n ode @node.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecTransformNodeWriteMethod) (xmlSecTrans formPtr transform, typedef int (*xmlSecTransformNodeWriteMethod) (xmlSecTrans formPtr transform,
xmlNodePtr node, xmlNodePtr node,
xmlSecTrans formCtxPtr transformCtx); xmlSecTrans formCtxPtr transformCtx);
/** /**
* xmlSecTransformSetKeyRequirementsMethod: * xmlSecTransformSetKeyRequirementsMethod:
* @transform: the pointer to transform object. * @transform: the pointer to transform object.
* @keyReq: the pointer to key requirements structure. * @keyReq: the pointer to key requirements structure.
* *
* Transform specific method to set transform's key requirements. * Transform specific method to set transform's key requirements.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecTransformSetKeyRequirementsMethod)(xmlSecTra nsformPtr transform, typedef int (*xmlSecTransformSetKeyRequirementsMethod)(xmlSecTra nsformPtr transform,
xmlSecKeyRe qPtr keyReq); xmlSecKeyRe qPtr keyReq);
/** /**
* xmlSecTransformSetKeyMethod: * xmlSecTransformSetKeyMethod:
* @transform: the pointer to transform object. * @transform: the pointer to transform object.
* @key: the pointer to key. * @key: the pointer to key.
* *
* The transform specific method to set the key for use. * The transform specific method to set the key for use.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecTransformSetKeyMethod) (xmlSecTrans formPtr transform, typedef int (*xmlSecTransformSetKeyMethod) (xmlSecTrans formPtr transform,
xmlSecKeyPt r key); xmlSecKeyPt r key);
/** /**
* xmlSecTransformVerifyMethod: * xmlSecTransformVerifyMethod:
* @transform: the pointer to transform object. * @transform: the pointer to transform object.
* @data: the input buffer. * @data: the input buffer.
* @dataSize: the size of input buffer @data. * @dataSize: the size of input buffer @data.
* @transformCtx: the pointer to transform context object. * @transformCtx: the pointer to transform context object.
* *
* The transform specific method to verify transform processing results * The transform specific method to verify transform processing results
* (used by digest and signature transforms). This method sets @status * (used by digest and signature transforms). This method sets @status
* member of the #xmlSecTransform structure to either #xmlSecTransformStatu sOk * member of the #xmlSecTransform structure to either #xmlSecTransformStatu sOk
* if verification succeeded or #xmlSecTransformStatusFail otherwise. * if verification succeeded or #xmlSecTransformStatusFail otherwise.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecTransformVerifyMethod) (xmlSecTrans formPtr transform, typedef int (*xmlSecTransformVerifyMethod) (xmlSecTrans formPtr transform,
const xmlSe cByte* data, const xmlSe cByte* data,
xmlSecSize dataSize, xmlSecSize dataSize,
xmlSecTrans formCtxPtr transformCtx); xmlSecTrans formCtxPtr transformCtx);
/** /**
* xmlSecTransformPushBinMethod: * xmlSecTransformPushBinMethod:
* @transform: the pointer to transform object. * @transform: the pointer to transform object.
* @data: the input binary data, * @data: the input binary data,
* @dataSize: the input data size. * @dataSize: the input data size.
* @final: the flag: if set to 1 then it's the last * @final: the flag: if set to 1 then it's the last
* data chunk. * data chunk.
* @transformCtx: the pointer to transform context object. * @transformCtx: the pointer to transform context object.
* *
* The transform specific method to process data from @data and push * The transform specific method to process data from @data and push
* result to the next transform in the chain. * result to the next transform in the chain.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecTransformPushBinMethod) (xmlSecTrans formPtr transform, typedef int (*xmlSecTransformPushBinMethod) (xmlSecTrans formPtr transform,
const xmlSe cByte* data, const xmlSe cByte* data,
xmlSecSize dataSize, xmlSecSize dataSize,
int final, int final,
xmlSecTrans formCtxPtr transformCtx); xmlSecTrans formCtxPtr transformCtx);
/** /**
* xmlSecTransformPopBinMethod: * xmlSecTransformPopBinMethod:
* @transform: the pointer to transform object. * @transform: the pointer to transform object.
* @data: the buffer to store result data. * @data: the buffer to store result data.
* @maxDataSize: the size of the buffer @data. * @maxDataSize: the size of the buffer @data.
* @dataSize: the pointer to returned data size. * @dataSize: the pointer to returned data size.
* @transformCtx: the pointer to transform context object. * @transformCtx: the pointer to transform context object.
* *
* The transform specific method to pop data from previous transform * The transform specific method to pop data from previous transform
* in the chain and return result in the @data buffer. The size of returned * in the chain and return result in the @data buffer. The size of returned
* data is placed in the @dataSize. * data is placed in the @dataSize.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecTransformPopBinMethod) (xmlSecTrans formPtr transform, typedef int (*xmlSecTransformPopBinMethod) (xmlSecTrans formPtr transform,
xmlSecByte* data, xmlSecByte* data,
xmlSecSize maxDataSize, xmlSecSize maxDataSize,
xmlSecSize* dataSize, xmlSecSize* dataSize,
xmlSecTrans formCtxPtr transformCtx); xmlSecTrans formCtxPtr transformCtx);
/** /**
* xmlSecTransformPushXmlMethod: * xmlSecTransformPushXmlMethod:
* @transform: the pointer to transform object. * @transform: the pointer to transform object.
* @nodes: the input nodes. * @nodes: the input nodes.
* @transformCtx: the pointer to transform context object. * @transformCtx: the pointer to transform context object.
* *
* The transform specific method to process @nodes and push result to the n ext * The transform specific method to process @nodes and push result to the n ext
* transform in the chain. * transform in the chain.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecTransformPushXmlMethod) (xmlSecTrans formPtr transform, typedef int (*xmlSecTransformPushXmlMethod) (xmlSecTrans formPtr transform,
xmlSecNodeS etPtr nodes, xmlSecNodeS etPtr nodes,
xmlSecTrans formCtxPtr transformCtx); xmlSecTrans formCtxPtr transformCtx);
/** /**
* xmlSecTransformPopXmlMethod: * xmlSecTransformPopXmlMethod:
* @transform: the pointer to transform object. * @transform: the pointer to transform object.
* @nodes: the pointer to store popinter to result node s. * @nodes: the pointer to store popinter to result node s.
* @transformCtx: the pointer to transform context object. * @transformCtx: the pointer to transform context object.
* *
* The transform specific method to pop data from previous transform in the chain, * The transform specific method to pop data from previous transform in the chain,
* process the data and return result in @nodes. * process the data and return result in @nodes.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecTransformPopXmlMethod) (xmlSecTrans formPtr transform, typedef int (*xmlSecTransformPopXmlMethod) (xmlSecTrans formPtr transform,
xmlSecNodeS etPtr* nodes, xmlSecNodeS etPtr* nodes,
xmlSecTrans formCtxPtr transformCtx); xmlSecTrans formCtxPtr transformCtx);
/** /**
* xmlSecTransformExecuteMethod: * xmlSecTransformExecuteMethod:
* @transform: the pointer to transform object. * @transform: the pointer to transform object.
* @last: the flag: if set to 1 then it's the last dat a chunk. * @last: the flag: if set to 1 then it's the last dat a chunk.
* @transformCtx: the pointer to transform context object. * @transformCtx: the pointer to transform context object.
* *
* Transform specific method to process a chunk of data. * Transform specific method to process a chunk of data.
* *
* Returns 0 on success or a negative value otherwise. * Returns: 0 on success or a negative value otherwise.
*/ */
typedef int (*xmlSecTransformExecuteMethod) (xmlSecTrans formPtr transform, typedef int (*xmlSecTransformExecuteMethod) (xmlSecTrans formPtr transform,
int last, int last,
xmlSecTrans formCtxPtr transformCtx); xmlSecTrans formCtxPtr transformCtx);
/** /**
* xmlSecTransformKlass: * xmlSecTransformKlass:
* @klassSize: the transform klass structure size. * @klassSize: the transform klass structure size.
* @objSize: the transform object size. * @objSize: the transform object size.
* @name: the transform's name. * @name: the transform's name.
 End of changes. 13 change blocks. 
13 lines changed or deleted 13 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.13" #define XMLSEC_VERSION "1.2.14"
/** /**
* 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 13 #define XMLSEC_VERSION_SUBMINOR 14
/** /**
* 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:13:2" #define XMLSEC_VERSION_INFO "3:14: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


 xmlsec.h   xmlsec.h 
skipping to change at line 98 skipping to change at line 98
* *
***********************************************************************/ ***********************************************************************/
/** /**
* xmlSecCheckVersionExact: * xmlSecCheckVersionExact:
* *
* Macro. Returns 1 if the loaded xmlsec library version exactly matches * Macro. Returns 1 if the loaded xmlsec library version exactly matches
* the one used to compile the caller, 0 if it does not or a negative * the one used to compile the caller, 0 if it does not or a negative
* value if an error occurs. * value if an error occurs.
*/ */
#define xmlSecCheckVersionExact() \ #define xmlSecCheckVersionExact() \
xmlSecCheckVersionExt(XMLSEC_VERSION_MAJOR, XMLSEC_VERSION_MINOR, XMLSE C_VERSION_SUBMINOR, xmlSecCheckVersionExact) xmlSecCheckVersionExt(XMLSEC_VERSION_MAJOR, XMLSEC_VERSION_MINOR, XMLSE C_VERSION_SUBMINOR, xmlSecCheckVersionExactMatch)
/** /**
* xmlSecCheckVersion: * xmlSecCheckVersion:
* *
* Macro. Returns 1 if the loaded xmlsec library version ABI compatible wit h * Macro. Returns 1 if the loaded xmlsec library version ABI compatible wit h
* the one used to compile the caller, 0 if it does not or a negative * the one used to compile the caller, 0 if it does not or a negative
* value if an error occurs. * value if an error occurs.
*/ */
#define xmlSecCheckVersion() \ #define xmlSecCheckVersion() \
xmlSecCheckVersionExt(XMLSEC_VERSION_MAJOR, XMLSEC_VERSION_MINOR, XMLSE C_VERSION_SUBMINOR, xmlSecCheckVersionABICompatible) xmlSecCheckVersionExt(XMLSEC_VERSION_MAJOR, XMLSEC_VERSION_MINOR, XMLSE C_VERSION_SUBMINOR, xmlSecCheckVersionABICompatible)
/** /**
* xmlSecCheckVersionMode: * xmlSecCheckVersionMode:
* @xmlSecCheckVersionExact: the version should match exactly. * @xmlSecCheckVersionExactMatch: the version should match exactly.
* @xmlSecCheckVersionABICompatible: the version should be ABI compatible . * @xmlSecCheckVersionABICompatible: the version should be ABI compatible .
* *
* The xmlsec library version mode. * The xmlsec library version mode.
*/ */
typedef enum { typedef enum {
xmlSecCheckVersionExact = 0, xmlSecCheckVersionExactMatch = 0,
xmlSecCheckVersionABICompatible xmlSecCheckVersionABICompatible
} xmlSecCheckVersionMode; } xmlSecCheckVersionMode;
XMLSEC_EXPORT int xmlSecCheckVersionExt (int major, XMLSEC_EXPORT int xmlSecCheckVersionExt (int major,
int minor, int minor,
int subminor, int subminor,
xmlSecCheckVersionMode mode ); xmlSecCheckVersionMode mode );
/** /**
* ATTRIBUTE_UNUSED: * ATTRIBUTE_UNUSED:
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 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/