exports.h | exports.h | |||
---|---|---|---|---|
skipping to change at line 22 | skipping to change at line 22 | |||
#define __XMLSEC_EXPORTS_H__ | #define __XMLSEC_EXPORTS_H__ | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
extern "C" { | extern "C" { | |||
#endif /* __cplusplus */ | #endif /* __cplusplus */ | |||
/* Now, the export orgy begins. The following we must do for the | /* Now, the export orgy begins. The following we must do for the | |||
Windows platform with MSVC compiler. */ | Windows platform with MSVC compiler. */ | |||
#if !defined XMLSEC_EXPORT | #if !defined XMLSEC_EXPORT | |||
# if defined _MSC_VER | # if defined(_WIN32) | |||
/* if we compile libxmlsec itself: */ | /* if we compile libxmlsec itself: */ | |||
# if defined(IN_XMLSEC) | # if defined(IN_XMLSEC) | |||
# if !defined(XMLSEC_STATIC) | # if !defined(XMLSEC_STATIC) | |||
# define XMLSEC_EXPORT __declspec(dllexport) | # define XMLSEC_EXPORT __declspec(dllexport) | |||
# else | # else | |||
# define XMLSEC_EXPORT extern | # define XMLSEC_EXPORT extern | |||
# endif | # endif | |||
/* if a client program includes this file: */ | /* if a client program includes this file: */ | |||
# else | # else | |||
#if 1 | ||||
/* gcc fail by initialisation of global variable with error | ||||
(as example in .../openssl/ciphers.c): | ||||
"initializer element is not constant" | ||||
To avoid this we shouldn't use __declspec(dllimport). | ||||
This will enable auto-import feature. */ | ||||
# define XMLSEC_EXPORT | ||||
#else | ||||
# if !defined(XMLSEC_STATIC) | # if !defined(XMLSEC_STATIC) | |||
# define XMLSEC_EXPORT __declspec(dllimport) | # define XMLSEC_EXPORT __declspec(dllimport) | |||
# else | # else | |||
# define XMLSEC_EXPORT | # define XMLSEC_EXPORT | |||
# endif | # endif | |||
#endif | ||||
# endif | # endif | |||
/* This holds on all other platforms/compilers, which are easier to | /* This holds on all other platforms/compilers, which are easier to | |||
handle in regard to this. */ | handle in regard to this. */ | |||
# else | # else | |||
# define XMLSEC_EXPORT | # define XMLSEC_EXPORT | |||
# endif | # endif | |||
#endif | #endif | |||
#if !defined XMLSEC_CRYPTO_EXPORT | #if !defined XMLSEC_CRYPTO_EXPORT | |||
# if defined _MSC_VER | # if defined(_WIN32) | |||
/* if we compile libxmlsec itself: */ | /* if we compile libxmlsec itself: */ | |||
# if defined(IN_XMLSEC_CRYPTO) | # if defined(IN_XMLSEC_CRYPTO) | |||
# if !defined(XMLSEC_STATIC) | # if !defined(XMLSEC_STATIC) | |||
# define XMLSEC_CRYPTO_EXPORT __declspec(dllexport) | # define XMLSEC_CRYPTO_EXPORT __declspec(dllexport) | |||
# else | # else | |||
# define XMLSEC_CRYPTO_EXPORT extern | # define XMLSEC_CRYPTO_EXPORT extern | |||
# endif | # endif | |||
/* if a client program includes this file: */ | /* if a client program includes this file: */ | |||
# else | # else | |||
# if !defined(XMLSEC_STATIC) | # if !defined(XMLSEC_STATIC) | |||
skipping to change at line 70 | skipping to change at line 79 | |||
# endif | # endif | |||
# endif | # endif | |||
/* This holds on all other platforms/compilers, which are easier to | /* This holds on all other platforms/compilers, which are easier to | |||
handle in regard to this. */ | handle in regard to this. */ | |||
# else | # else | |||
# define XMLSEC_CRYPTO_EXPORT | # define XMLSEC_CRYPTO_EXPORT | |||
# endif | # endif | |||
#endif | #endif | |||
#if !defined XMLSEC_EXPORT_VAR | #if !defined XMLSEC_EXPORT_VAR | |||
# if defined _MSC_VER | # if defined(_WIN32) | |||
/* if we compile libxmlsec itself: */ | /* if we compile libxmlsec itself: */ | |||
# if defined(IN_XMLSEC) | # if defined(IN_XMLSEC) | |||
# if !defined(XMLSEC_STATIC) | # if !defined(XMLSEC_STATIC) | |||
# define XMLSEC_EXPORT_VAR __declspec(dllexport) extern | # define XMLSEC_EXPORT_VAR __declspec(dllexport) extern | |||
# else | # else | |||
# define XMLSEC_EXPORT_VAR extern | # define XMLSEC_EXPORT_VAR extern | |||
# endif | # endif | |||
/* if we compile libxmlsec-crypto itself: */ | /* if we compile libxmlsec-crypto itself: */ | |||
# elif defined(IN_XMLSEC_CRYPTO) | # elif defined(IN_XMLSEC_CRYPTO) | |||
# define XMLSEC_EXPORT_VAR extern | # define XMLSEC_EXPORT_VAR extern | |||
End of changes. 5 change blocks. | ||||
3 lines changed or deleted | 12 lines changed or added | |||
templates.h | templates.h | |||
---|---|---|---|---|
skipping to change at line 32 | skipping to change at line 32 | |||
/*********************************************************************** | /*********************************************************************** | |||
* | * | |||
* <dsig:Signature> node | * <dsig:Signature> node | |||
* | * | |||
**********************************************************************/ | **********************************************************************/ | |||
XMLSEC_EXPORT xmlNodePtr xmlSecTmplSignatureCreate (xmlDocPtr d oc, | XMLSEC_EXPORT xmlNodePtr xmlSecTmplSignatureCreate (xmlDocPtr d oc, | |||
xmlSecTrans formId c14nMethodId, | xmlSecTrans formId c14nMethodId, | |||
xmlSecTrans formId signMethodId, | xmlSecTrans formId signMethodId, | |||
const xmlCh ar *id); | const xmlCh ar *id); | |||
XMLSEC_EXPORT xmlNodePtr xmlSecTmplSignatureCreateNsPref (xmlDocPtr d | ||||
oc, | ||||
xmlSecTrans | ||||
formId c14nMethodId, | ||||
xmlSecTrans | ||||
formId signMethodId, | ||||
const xmlCh | ||||
ar *id, | ||||
const xmlCh | ||||
ar *nsPrefix); | ||||
XMLSEC_EXPORT xmlNodePtr xmlSecTmplSignatureEnsureKeyInfo (xmlNodePtr signNode, | XMLSEC_EXPORT xmlNodePtr xmlSecTmplSignatureEnsureKeyInfo (xmlNodePtr signNode, | |||
const xmlCh ar *id); | const xmlCh ar *id); | |||
XMLSEC_EXPORT xmlNodePtr xmlSecTmplSignatureAddReference (xmlNodePtr signNode, | XMLSEC_EXPORT xmlNodePtr xmlSecTmplSignatureAddReference (xmlNodePtr signNode, | |||
xmlSecTrans formId digestMethodId, | xmlSecTrans formId digestMethodId, | |||
const xmlCh ar *id, | const xmlCh ar *id, | |||
const xmlCh ar *uri, | const xmlCh ar *uri, | |||
const xmlCh ar *type); | const xmlCh ar *type); | |||
XMLSEC_EXPORT xmlNodePtr xmlSecTmplSignatureAddObject (xmlNodePtr signNode, | XMLSEC_EXPORT xmlNodePtr xmlSecTmplSignatureAddObject (xmlNodePtr signNode, | |||
const xmlCh ar *id, | const xmlCh ar *id, | |||
const xmlCh ar *mimeType, | const xmlCh ar *mimeType, | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 10 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.10" | #define XMLSEC_VERSION "1.2.11" | |||
/** | /** | |||
* 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 10 | #define XMLSEC_VERSION_SUBMINOR 11 | |||
/** | /** | |||
* 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:10:2" | #define XMLSEC_VERSION_INFO "3:11: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 | |||