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 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,
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 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.11" #define XMLSEC_VERSION "1.2.12"
/** /**
* 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 11 #define XMLSEC_VERSION_SUBMINOR 12
/** /**
* 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:11:2" #define XMLSEC_VERSION_INFO "3:12: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


 xmlenc.h   xmlenc.h 
skipping to change at line 45 skipping to change at line 45
* @xmlEncCtxModeEncryptedKey: the <enc:EncryptedKey/> element processing. * @xmlEncCtxModeEncryptedKey: the <enc:EncryptedKey/> element processing.
* *
* The #xmlSecEncCtx mode. * The #xmlSecEncCtx mode.
*/ */
typedef enum { typedef enum {
xmlEncCtxModeEncryptedData = 0, xmlEncCtxModeEncryptedData = 0,
xmlEncCtxModeEncryptedKey xmlEncCtxModeEncryptedKey
} xmlEncCtxMode; } xmlEncCtxMode;
/** /**
* XMLSEC_ENC_RETURN_REPLACED_NODE:
*
* If this flag is set, then the replaced node will be returned in the repl
acedNodeList
*/
#define XMLSEC_ENC_RETURN_REPLACED_NODE 0x00000001
/**
* xmlSecEncCtx: * xmlSecEncCtx:
* @userData: the pointer to user data (xmlsec and xmlsec- crypto libraries * @userData: the pointer to user data (xmlsec and xmlsec- crypto libraries
* never touches this). * never touches this).
* @flags: the XML Encryption processing flags. * @flags: the XML Encryption processing flags.
* @flags2: the XML Encryption processing flags. * @flags2: the XML Encryption processing flags.
* @mode: the mode. * @mode: the mode.
* @keyInfoReadCtx: the reading key context. * @keyInfoReadCtx: the reading key context.
* @keyInfoWriteCtx: the writing key context (not used for signat ure verification). * @keyInfoWriteCtx: the writing key context (not used for signat ure verification).
* @transformCtx: the transforms processing context. * @transformCtx: the transforms processing context.
* @defEncMethodId: the default encryption method (used if * @defEncMethodId: the default encryption method (used if
* <enc:EncryptionMethod/> node is not present) . * <enc:EncryptionMethod/> node is not present) .
* @encKey: the signature key; application may set #encK ey * @encKey: the signature key; application may set #encK ey
* before calling encryption/decryption functio ns. * before calling encryption/decryption functio ns.
* @operation: the operation: encrypt or decrypt. * @operation: the operation: encrypt or decrypt.
* @result: the pointer to signature (not valid for sign ature verificaction). * @result: the pointer to signature (not valid for sign ature verificaction).
* @resultBase64Encoded: the flag: if set then result in #result is b ase64 encoded. * @resultBase64Encoded: the flag: if set then result in #result is b ase64 encoded.
* @resultReplaced: the flag: if set then resulted <enc:Encrypte dData/> * @resultReplaced: the flag: if set then resulted <enc:Encrypte dData/>
* or <enc:EncryptedKey/> node is added to the document. * or <enc:EncryptedKey/> node is added to the document.
* @encMethod: the pointer to encryption transform. * @encMethod: the pointer to encryption transform.
* @replacedNodeList: the first node of the list of replaced nodes dependin g on the nodeReplacementMode
* @id: the ID attribute of <enc:EncryptedDa ta/> * @id: the ID attribute of <enc:EncryptedDa ta/>
* or <enc:EncryptedKey/> node. * or <enc:EncryptedKey/> node.
* @type: the Type attribute of <enc:EncryptedData/> * @type: the Type attribute of <enc:EncryptedData/>
* or <enc:EncryptedKey/> node. * or <enc:EncryptedKey/> node.
* @mimeType: the MimeType attribute of <enc:EncryptedData /> * @mimeType: the MimeType attribute of <enc:EncryptedData />
* or <enc:EncryptedKey/> node. * or <enc:EncryptedKey/> node.
* @encoding: the Encoding attributeof <enc:EncryptedData/ > * @encoding: the Encoding attributeof <enc:EncryptedData/ >
* or <enc:EncryptedKey/> node. * or <enc:EncryptedKey/> node.
* @recipient: the Recipient attribute of <enc:EncryptedKey /> node.. * @recipient: the Recipient attribute of <enc:EncryptedKey /> node..
* @carriedKeyName: the CarriedKeyName attribute of <enc:Encrypt edKey/> node. * @carriedKeyName: the CarriedKeyName attribute of <enc:Encrypt edKey/> node.
* @encDataNode: the pointer to <enc:EncryptedData/> * @encDataNode: the pointer to <enc:EncryptedData/>
* or <enc:EncryptedKey/> node. * or <enc:EncryptedKey/> node.
* @encMethodNode: the pointer to <enc:EncryptionMethod/> node. * @encMethodNode: the pointer to <enc:EncryptionMethod/> node.
* @keyInfoNode: the pointer to <enc:KeyInfo/> node. * @keyInfoNode: the pointer to <enc:KeyInfo/> node.
* @cipherValueNode: the pointer to <enc:CipherValue/> node. * @cipherValueNode: the pointer to <enc:CipherValue/> node.
* @reserved0: reserved for the future.
* @reserved1: reserved for the future. * @reserved1: reserved for the future.
* *
* XML Encrypiton context. * XML Encrypiton context.
*/ */
struct _xmlSecEncCtx { struct _xmlSecEncCtx {
/* these data user can set before performing the operation */ /* these data user can set before performing the operation */
void* userData; void* userData;
unsigned int flags; unsigned int flags;
unsigned int flags2; unsigned int flags2;
xmlEncCtxMode mode; xmlEncCtxMode mode;
skipping to change at line 117 skipping to change at line 124
xmlChar* encoding; xmlChar* encoding;
xmlChar* recipient; xmlChar* recipient;
xmlChar* carriedKeyName; xmlChar* carriedKeyName;
/* these are internal data, nobody should change that except us */ /* these are internal data, nobody should change that except us */
xmlNodePtr encDataNode; xmlNodePtr encDataNode;
xmlNodePtr encMethodNode; xmlNodePtr encMethodNode;
xmlNodePtr keyInfoNode; xmlNodePtr keyInfoNode;
xmlNodePtr cipherValueNode; xmlNodePtr cipherValueNode;
/* reserved for future */ xmlNodePtr replacedNodeList; /* the pointer to the repl
void* reserved0; aced node */
void* reserved1; void* reserved1; /* reserved for future */
}; };
XMLSEC_EXPORT xmlSecEncCtxPtr xmlSecEncCtxCreate (xmlSecKeysM ngrPtr keysMngr); XMLSEC_EXPORT xmlSecEncCtxPtr xmlSecEncCtxCreate (xmlSecKeysM ngrPtr keysMngr);
XMLSEC_EXPORT void xmlSecEncCtxDestroy (xmlSecEncCt xPtr encCtx); XMLSEC_EXPORT void xmlSecEncCtxDestroy (xmlSecEncCt xPtr encCtx);
XMLSEC_EXPORT int xmlSecEncCtxInitialize (xmlSecEncCt xPtr encCtx, XMLSEC_EXPORT int xmlSecEncCtxInitialize (xmlSecEncCt xPtr encCtx,
xmlSecKeysM ngrPtr keysMngr); xmlSecKeysM ngrPtr keysMngr);
XMLSEC_EXPORT void xmlSecEncCtxFinalize (xmlSecEncCt xPtr encCtx); XMLSEC_EXPORT void xmlSecEncCtxFinalize (xmlSecEncCt xPtr encCtx);
XMLSEC_EXPORT int xmlSecEncCtxCopyUserPref (xmlSecEncCt xPtr dst, XMLSEC_EXPORT int xmlSecEncCtxCopyUserPref (xmlSecEncCt xPtr dst,
xmlSecEncCt xPtr src); xmlSecEncCt xPtr src);
XMLSEC_EXPORT void xmlSecEncCtxReset (xmlSecEncCt xPtr encCtx); XMLSEC_EXPORT void xmlSecEncCtxReset (xmlSecEncCt xPtr encCtx);
 End of changes. 4 change blocks. 
4 lines changed or deleted 12 lines changed or added


 xmltree.h   xmltree.h 
skipping to change at line 59 skipping to change at line 59
xmlNodePtr child); xmlNodePtr child);
XMLSEC_EXPORT xmlNodePtr xmlSecAddNextSibling (xmlNodePtr node, XMLSEC_EXPORT xmlNodePtr xmlSecAddNextSibling (xmlNodePtr node,
const xmlChar *name , const xmlChar *name ,
const xmlChar *ns); const xmlChar *ns);
XMLSEC_EXPORT xmlNodePtr xmlSecAddPrevSibling (xmlNodePtr node, XMLSEC_EXPORT xmlNodePtr xmlSecAddPrevSibling (xmlNodePtr node,
const xmlChar *name , const xmlChar *name ,
const xmlChar *ns); const xmlChar *ns);
XMLSEC_EXPORT int xmlSecReplaceNode (xmlNodePtr node, XMLSEC_EXPORT int xmlSecReplaceNode (xmlNodePtr node,
xmlNodePtr newNode) ; xmlNodePtr newNode) ;
XMLSEC_EXPORT int xmlSecReplaceNodeAndReturn
(xmlNodePtr node,
xmlNodePtr newNode,
xmlNodePtr* replace
d);
XMLSEC_EXPORT int xmlSecReplaceContent (xmlNodePtr node, XMLSEC_EXPORT int xmlSecReplaceContent (xmlNodePtr node,
xmlNodePtr newNode) ; xmlNodePtr newNode) ;
XMLSEC_EXPORT int xmlSecReplaceContentAndReturn
(xmlNodePtr node,
xmlNodePtr newNode,
xmlNodePtr* replace
d);
XMLSEC_EXPORT int xmlSecReplaceNodeBuffer (xmlNodePtr node, XMLSEC_EXPORT int xmlSecReplaceNodeBuffer (xmlNodePtr node,
const xmlSecByte *b uffer, const xmlSecByte *b uffer,
xmlSecSize size); xmlSecSize size);
XMLSEC_EXPORT int xmlSecReplaceNodeBufferAndReturn
(xmlNodePtr node,
const xmlSecByte *b
uffer,
xmlSecSize size,
xmlNodePtr* replace
d);
XMLSEC_EXPORT int xmlSecNodeEncodeAndSetContent
(xmlNodePtr node,
const xmlChar *buff
er);
XMLSEC_EXPORT void xmlSecAddIDs (xmlDocPtr doc, XMLSEC_EXPORT void xmlSecAddIDs (xmlDocPtr doc,
xmlNodePtr cur, xmlNodePtr cur,
const xmlChar** ids ); const xmlChar** ids );
XMLSEC_EXPORT int xmlSecGenerateAndAddID (xmlNodePtr node, XMLSEC_EXPORT int xmlSecGenerateAndAddID (xmlNodePtr node,
const xmlChar* attr Name, const xmlChar* attr Name,
const xmlChar* pref ix, const xmlChar* pref ix,
xmlSecSize len); xmlSecSize len);
XMLSEC_EXPORT xmlChar* xmlSecGenerateID (const xmlChar* pref ix, XMLSEC_EXPORT xmlChar* xmlSecGenerateID (const xmlChar* pref ix,
xmlSecSize len); xmlSecSize len);
 End of changes. 3 change blocks. 
1 lines changed or deleted 21 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/