crypto.h   crypto.h 
skipping to change at line 37 skipping to change at line 37
#ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING
#include <xmlsec/app.h> #include <xmlsec/app.h>
#else /* XMLSEC_CRYPTO_DYNAMIC_LOADING */ #else /* XMLSEC_CRYPTO_DYNAMIC_LOADING */
#ifdef XMLSEC_CRYPTO_OPENSSL #ifdef XMLSEC_CRYPTO_OPENSSL
#include <xmlsec/openssl/app.h> #include <xmlsec/openssl/app.h>
#include <xmlsec/openssl/crypto.h> #include <xmlsec/openssl/crypto.h>
#include <xmlsec/openssl/x509.h> #include <xmlsec/openssl/x509.h>
#include <xmlsec/openssl/symbols.h> #include <xmlsec/openssl/symbols.h>
#else /* XMLSEC_CRYPTO_OPENSSL */ #else /* XMLSEC_CRYPTO_OPENSSL */
#ifdef XMLSEC_CRYPTO_GNUTLS
#include <xmlsec/gnutls/app.h>
#include <xmlsec/gnutls/crypto.h>
#include <xmlsec/gnutls/symbols.h>
#else /* XMLSEC_CRYPTO_GNUTLS */
#ifdef XMLSEC_CRYPTO_MSCRYPTO #ifdef XMLSEC_CRYPTO_MSCRYPTO
#include <xmlsec/mscrypto/app.h> #include <xmlsec/mscrypto/app.h>
#include <xmlsec/mscrypto/crypto.h> #include <xmlsec/mscrypto/crypto.h>
#include <xmlsec/mscrypto/x509.h> #include <xmlsec/mscrypto/x509.h>
#include <xmlsec/mscrypto/symbols.h> #include <xmlsec/mscrypto/symbols.h>
#else /* XMLSEC_CRYPTO_MSCRYPTO */ #else /* XMLSEC_CRYPTO_MSCRYPTO */
#ifdef XMLSEC_CRYPTO_NSS #ifdef XMLSEC_CRYPTO_NSS
#include <xmlsec/nss/app.h> #include <xmlsec/nss/app.h>
#include <xmlsec/nss/crypto.h> #include <xmlsec/nss/crypto.h>
#include <xmlsec/nss/x509.h> #include <xmlsec/nss/x509.h>
#include <xmlsec/nss/symbols.h> #include <xmlsec/nss/symbols.h>
#else /* XMLSEC_CRYPTO_NSS */ #else /* XMLSEC_CRYPTO_NSS */
#ifdef XMLSEC_CRYPTO_GNUTLS
#include <xmlsec/gnutls/app.h>
#include <xmlsec/gnutls/crypto.h>
#include <xmlsec/gnutls/symbols.h>
#else /* XMLSEC_CRYPTO_GNUTLS */
#ifdef XMLSEC_CRYPTO_GCRYPT
#include <xmlsec/gcrypt/app.h>
#include <xmlsec/gcrypt/crypto.h>
#include <xmlsec/gcrypt/symbols.h>
#else /* XMLSEC_CRYPTO_GCRYPT */
#error No crypto library defined #error No crypto library defined
#endif /* XMLSEC_CRYPTO_GCRYPT */
#endif /* XMLSEC_CRYPTO_GNUTLS */ #endif /* XMLSEC_CRYPTO_GNUTLS */
#endif /* XMLSEC_CRYPTO_MSCRYPTO */
#endif /* XMLSEC_CRYPTO_NSS */ #endif /* XMLSEC_CRYPTO_NSS */
#endif /* XMLSEC_CRYPTO_MSCRYPTO */
#endif /* XMLSEC_CRYPTO_OPENSSL */ #endif /* XMLSEC_CRYPTO_OPENSSL */
#endif /* XMLSEC_CRYPTO_DYNAMIC_LOADING */ #endif /* XMLSEC_CRYPTO_DYNAMIC_LOADING */
#endif /* IN_XMLSEC_CRYPTO */ #endif /* IN_XMLSEC_CRYPTO */
#endif /* IN_XMLSEC */ #endif /* IN_XMLSEC */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
 End of changes. 5 change blocks. 
6 lines changed or deleted 12 lines changed or added


 list.h   list.h 
skipping to change at line 69 skipping to change at line 69
XMLSEC_EXPORT xmlSecSize xmlSecPtrListGetSize (xmlSecPtrL istPtr list); XMLSEC_EXPORT xmlSecSize xmlSecPtrListGetSize (xmlSecPtrL istPtr list);
XMLSEC_EXPORT xmlSecPtr xmlSecPtrListGetItem (xmlSecPtrL istPtr list, XMLSEC_EXPORT xmlSecPtr xmlSecPtrListGetItem (xmlSecPtrL istPtr list,
xmlSecSize pos); xmlSecSize pos);
XMLSEC_EXPORT int xmlSecPtrListAdd (xmlSecPtrL istPtr list, XMLSEC_EXPORT int xmlSecPtrListAdd (xmlSecPtrL istPtr list,
xmlSecPtr item); xmlSecPtr item);
XMLSEC_EXPORT int xmlSecPtrListSet (xmlSecPtrL istPtr list, XMLSEC_EXPORT int xmlSecPtrListSet (xmlSecPtrL istPtr list,
xmlSecPtr item, xmlSecPtr item,
xmlSecSize pos); xmlSecSize pos);
XMLSEC_EXPORT int xmlSecPtrListRemove (xmlSecPtrL istPtr list, XMLSEC_EXPORT int xmlSecPtrListRemove (xmlSecPtrL istPtr list,
xmlSecSize pos); xmlSecSize pos);
XMLSEC_EXPORT xmlSecPtr xmlSecPtrListRemoveAndReturn (xmlSecPtrL
istPtr list,
xmlSecSize
pos);
XMLSEC_EXPORT void xmlSecPtrListDebugDump (xmlSecPtrL istPtr list, XMLSEC_EXPORT void xmlSecPtrListDebugDump (xmlSecPtrL istPtr list,
FILE* outp ut); FILE* outp ut);
XMLSEC_EXPORT void xmlSecPtrListDebugXmlDump (xmlSecPtrL istPtr list, XMLSEC_EXPORT void xmlSecPtrListDebugXmlDump (xmlSecPtrL istPtr list,
FILE* outp ut); FILE* outp ut);
/** /**
* xmlSecPtrListGetName: * xmlSecPtrListGetName:
* @list: the ponter to list. * @list: the ponter to list.
* *
* Macro. Returns lists's name. * Macro. Returns lists's name.
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 lines changed or added


 symbols.h   symbols.h 
/** /**
* XMLSec library * XMLSec library
* *
* This is free software; see Copyright file in the source * This is free software; see Copyright file in the source
* distribution for preciese wording. * distribution for preciese wording.
* *
* Copyright (C) 2002-2003 Aleksey Sanin <aleksey@aleksey.com> * Copyright (C) 2002-2003 Aleksey Sanin <aleksey@aleksey.com>
*/ */
#ifndef __XMLSEC_GNUTLS_SYMBOLS_H__ #ifndef __XMLSEC_GCRYPT_SYMBOLS_H__
#define __XMLSEC_GNUTLS_SYMBOLS_H__ #define __XMLSEC_GCRYPT_SYMBOLS_H__
#if !defined(IN_XMLSEC) && defined(XMLSEC_CRYPTO_DYNAMIC_LOADING) #if !defined(IN_XMLSEC) && defined(XMLSEC_CRYPTO_DYNAMIC_LOADING)
#error To disable dynamic loading of xmlsec-crypto libraries undefine XMLSE C_CRYPTO_DYNAMIC_LOADING #error To disable dynamic loading of xmlsec-crypto libraries undefine XMLSE C_CRYPTO_DYNAMIC_LOADING
#endif /* !defined(IN_XMLSEC) && defined(XMLSEC_CRYPTO_DYNAMIC_LOADING) */ #endif /* !defined(IN_XMLSEC) && defined(XMLSEC_CRYPTO_DYNAMIC_LOADING) */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#ifdef XMLSEC_CRYPTO_GNUTLS #ifdef XMLSEC_CRYPTO_GCRYPT
/******************************************************************** /********************************************************************
* *
* Crypto Init/shutdown * Crypto Init/shutdown
* *
********************************************************************/ ********************************************************************/
#define xmlSecCryptoInit xmlSecGnuTLSInit #define xmlSecCryptoInit xmlSecGCryptInit
#define xmlSecCryptoShutdown xmlSecGnuTLSShutdown #define xmlSecCryptoShutdown xmlSecGCryptShutdown
#define xmlSecCryptoKeysMngrInit xmlSecGnuTLSKeysMngrInit #define xmlSecCryptoKeysMngrInit xmlSecGCryptKeysMngrInit
/******************************************************************** /********************************************************************
* *
* Key data ids * Key data ids
* *
********************************************************************/ ********************************************************************/
#define xmlSecKeyDataAesId xmlSecGnuTLSKeyDataAesId #define xmlSecKeyDataAesId xmlSecGCryptKeyDataAesId
#define xmlSecKeyDataDesId xmlSecGnuTLSKeyDataDesId #define xmlSecKeyDataDesId xmlSecGCryptKeyDataDesId
#define xmlSecKeyDataDsaId xmlSecGnuTLSKeyDataDsaId #define xmlSecKeyDataDsaId xmlSecGCryptKeyDataDsaId
#define xmlSecKeyDataHmacId xmlSecGnuTLSKeyDataHmacId #define xmlSecKeyDataHmacId xmlSecGCryptKeyDataHmacId
#define xmlSecKeyDataRsaId xmlSecGnuTLSKeyDataRsaId #define xmlSecKeyDataRsaId xmlSecGCryptKeyDataRsaId
#define xmlSecKeyDataX509Id xmlSecGnuTLSKeyDataX509Id #define xmlSecKeyDataX509Id xmlSecGCryptKeyDataX509Id
#define xmlSecKeyDataRawX509CertId xmlSecGnuTLSKeyDataRawX509C #define xmlSecKeyDataRawX509CertId xmlSecGCryptKeyDataRawX509C
ertId ertId
/******************************************************************** /********************************************************************
* *
* Key data store ids * Key data store ids
* *
********************************************************************/ ********************************************************************/
#define xmlSecX509StoreId xmlSecGnuTLSX509StoreId #define xmlSecX509StoreId xmlSecGCryptX509StoreId
/******************************************************************** /********************************************************************
* *
* Crypto transforms ids * Crypto transforms ids
* *
********************************************************************/ ********************************************************************/
#define xmlSecTransformAes128CbcId xmlSecGnuTLSTransformAes128 #define xmlSecTransformAes128CbcId xmlSecGCryptTransformAes128
CbcId CbcId
#define xmlSecTransformAes192CbcId xmlSecGnuTLSTransformAes192 #define xmlSecTransformAes192CbcId xmlSecGCryptTransformAes192
CbcId CbcId
#define xmlSecTransformAes256CbcId xmlSecGnuTLSTransformAes256 #define xmlSecTransformAes256CbcId xmlSecGCryptTransformAes256
CbcId CbcId
#define xmlSecTransformKWAes128Id xmlSecGnuTLSTransformKWAes1 #define xmlSecTransformKWAes128Id xmlSecGCryptTransformKWAes1
28Id 28Id
#define xmlSecTransformKWAes192Id xmlSecGnuTLSTransformKWAes1 #define xmlSecTransformKWAes192Id xmlSecGCryptTransformKWAes1
92Id 92Id
#define xmlSecTransformKWAes256Id xmlSecGnuTLSTransformKWAes2 #define xmlSecTransformKWAes256Id xmlSecGCryptTransformKWAes2
56Id 56Id
#define xmlSecTransformDes3CbcId xmlSecGnuTLSTransformDes3Cb #define xmlSecTransformDes3CbcId xmlSecGCryptTransformDes3Cb
cId cId
#define xmlSecTransformKWDes3Id xmlSecGnuTLSTransformKWDes3 #define xmlSecTransformKWDes3Id xmlSecGCryptTransformKWDes3
Id Id
#define xmlSecTransformDsaSha1Id xmlSecGnuTLSTransformDsaSha #define xmlSecTransformDsaSha1Id xmlSecGCryptTransformDsaSha
1Id 1Id
#define xmlSecTransformHmacMd5Id xmlSecGnuTLSTransformHmacMd #define xmlSecTransformHmacMd5Id xmlSecGCryptTransformHmacMd
5Id 5Id
#define xmlSecTransformHmacRipemd160Id xmlSecGnuTLSTransformHmacRi #define xmlSecTransformHmacRipemd160Id xmlSecGCryptTransformHmacRi
pemd160Id pemd160Id
#define xmlSecTransformHmacSha1Id xmlSecGnuTLSTransformHmacSh #define xmlSecTransformHmacSha1Id xmlSecGCryptTransformHmacSh
a1Id a1Id
#define xmlSecTransformRipemd160Id xmlSecGnuTLSTransformRipemd #define xmlSecTransformRipemd160Id xmlSecGCryptTransformRipemd
160Id 160Id
#define xmlSecTransformRsaSha1Id xmlSecGnuTLSTransformRsaSha #define xmlSecTransformRsaSha1Id xmlSecGCryptTransformRsaSha
1Id 1Id
#define xmlSecTransformRsaPkcs1Id xmlSecGnuTLSTransformRsaPkc #define xmlSecTransformRsaPkcs1Id xmlSecGCryptTransformRsaPkc
s1Id s1Id
#define xmlSecTransformRsaOaepId xmlSecGnuTLSTransformRsaOae #define xmlSecTransformRsaOaepId xmlSecGCryptTransformRsaOae
pId pId
#define xmlSecTransformSha1Id xmlSecGnuTLSTransformSha1Id #define xmlSecTransformSha1Id xmlSecGCryptTransformSha1Id
/******************************************************************** /********************************************************************
* *
* High level routines form xmlsec command line utility * High level routines form xmlsec command line utility
* *
********************************************************************/ ********************************************************************/
#define xmlSecCryptoAppInit xmlSecGnuTLSAppInit #define xmlSecCryptoAppInit xmlSecGCryptAppInit
#define xmlSecCryptoAppShutdown xmlSecGnuTLSAppShutdown #define xmlSecCryptoAppShutdown xmlSecGCryptAppShutdown
#define xmlSecCryptoAppDefaultKeysMngrInit xmlSecGnuTLSAppDefaultKeysM #define xmlSecCryptoAppDefaultKeysMngrInit xmlSecGCryptAppDefaultKeysM
ngrInit ngrInit
#define xmlSecCryptoAppDefaultKeysMngrAdoptKey xmlSecGnuTLSAppDefaultKeysM #define xmlSecCryptoAppDefaultKeysMngrAdoptKey xmlSecGCryptAppDefaultKeysM
ngrAdoptKey ngrAdoptKey
#define xmlSecCryptoAppDefaultKeysMngrLoad xmlSecGnuTLSAppDefaultKeysM #define xmlSecCryptoAppDefaultKeysMngrLoad xmlSecGCryptAppDefaultKeysM
ngrLoad ngrLoad
#define xmlSecCryptoAppDefaultKeysMngrSave xmlSecGnuTLSAppDefaultKeysM #define xmlSecCryptoAppDefaultKeysMngrSave xmlSecGCryptAppDefaultKeysM
ngrSave ngrSave
#define xmlSecCryptoAppKeysMngrCertLoad xmlSecGnuTLSAppKeysMngrCert #define xmlSecCryptoAppKeysMngrCertLoad xmlSecGCryptAppKeysMngrCert
Load Load
#define xmlSecCryptoAppKeysMngrCertLoadMemory xmlSecGnuTLSAppKeysMngrCert #define xmlSecCryptoAppKeysMngrCertLoadMemory xmlSecGCryptAppKeysMngrCert
LoadMemory LoadMemory
#define xmlSecCryptoAppKeyLoad xmlSecGnuTLSAppKeyLoad #define xmlSecCryptoAppKeyLoad xmlSecGCryptAppKeyLoad
#define xmlSecCryptoAppPkcs12Load xmlSecGnuTLSAppPkcs12Load #define xmlSecCryptoAppPkcs12Load xmlSecGCryptAppPkcs12Load
#define xmlSecCryptoAppKeyCertLoad xmlSecGnuTLSAppKeyCertLoad #define xmlSecCryptoAppKeyCertLoad xmlSecGCryptAppKeyCertLoad
#define xmlSecCryptoAppKeyLoadMemory xmlSecGnuTLSAppKeyLoadMemor #define xmlSecCryptoAppKeyLoadMemory xmlSecGCryptAppKeyLoadMemor
y y
#define xmlSecCryptoAppPkcs12LoadMemory xmlSecGnuTLSAppPkcs12LoadMe #define xmlSecCryptoAppPkcs12LoadMemory xmlSecGCryptAppPkcs12LoadMe
mory mory
#define xmlSecCryptoAppKeyCertLoadMemory xmlSecGnuTLSAppKeyCertLoadM #define xmlSecCryptoAppKeyCertLoadMemory xmlSecGCryptAppKeyCertLoadM
emory emory
#define xmlSecCryptoAppGetDefaultPwdCallback xmlSecGnuTLSAppGetDefaultPw #define xmlSecCryptoAppGetDefaultPwdCallback xmlSecGCryptAppGetDefaultPw
dCallback dCallback
#endif /* XMLSEC_CRYPTO_GNUTLS */ #endif /* XMLSEC_CRYPTO_GCRYPT */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __XMLSEC_GNUTLS_CRYPTO_H__ */ #endif /* __XMLSEC_GCRYPT_CRYPTO_H__ */
#define __XMLSEC_GNUTLS_CRYPTO_H__ #define __XMLSEC_GCRYPT_CRYPTO_H__
 End of changes. 11 change blocks. 
75 lines changed or deleted 75 lines changed or added


 transforms.h   transforms.h 
skipping to change at line 485 skipping to change at line 485
* Macro. Returns 1 if the @transform is valid or 0 otherwise. * Macro. Returns 1 if the @transform is valid or 0 otherwise.
*/ */
#define xmlSecTransformIsValid(transform) \ #define xmlSecTransformIsValid(transform) \
((( transform ) != NULL) && \ ((( transform ) != NULL) && \
(( transform )->id != NULL) && \ (( transform )->id != NULL) && \
(( transform )->id->klassSize >= sizeof(xmlSecTransformKlass)) && \ (( transform )->id->klassSize >= sizeof(xmlSecTransformKlass)) && \
(( transform )->id->objSize >= sizeof(xmlSecTransform)) && \ (( transform )->id->objSize >= sizeof(xmlSecTransform)) && \
(( transform )->id->name != NULL)) (( transform )->id->name != NULL))
/** /**
* xmlSecTransformCheckType:
* @transform: the pointer to transform.
* @t: the transform type.
*
* Macro. Returns 1 if the @transform is valid and has specified type @t
* or 0 otherwise.
*/
#define xmlSecTransformCheckType(transform, t) \
(xmlSecTransformIsValid(( transform )) && \
((( transform )->id->type) == ( t )))
/**
* xmlSecTransformCheckId: * xmlSecTransformCheckId:
* @transform: the pointer to transform. * @transform: the pointer to transform.
* @i: the transform id. * @i: the transform id.
* *
* Macro. Returns 1 if the @transform is valid and has specified id @i * Macro. Returns 1 if the @transform is valid and has specified id @i
* or 0 otherwise. * or 0 otherwise.
*/ */
#define xmlSecTransformCheckId(transform, i) \ #define xmlSecTransformCheckId(transform, i) \
(xmlSecTransformIsValid(( transform )) && \ (xmlSecTransformIsValid(( transform )) && \
((((const xmlSecTransformId) (( transform )->id))) == ( i ))) ((((const xmlSecTransformId) (( transform )->id))) == ( i )))
skipping to change at line 963 skipping to change at line 951
* The XPointer transform klass. * The XPointer transform klass.
*/ */
#define xmlSecTransformXPointerId \ #define xmlSecTransformXPointerId \
xmlSecTransformXPointerGetKlass() xmlSecTransformXPointerGetKlass()
XMLSEC_EXPORT xmlSecTransformId xmlSecTransformXPointerGetKlass (vo id); XMLSEC_EXPORT xmlSecTransformId xmlSecTransformXPointerGetKlass (vo id);
XMLSEC_EXPORT int xmlSecTransformXPointerSetExpr (xm lSecTransformPtr transform, XMLSEC_EXPORT int xmlSecTransformXPointerSetExpr (xm lSecTransformPtr transform,
co nst xmlChar* expr, co nst xmlChar* expr,
xm lSecNodeSetType nodeSetType, xm lSecNodeSetType nodeSetType,
xm lNodePtr hereNode); xm lNodePtr hereNode);
#ifndef XMLSEC_NO_XSLT #ifndef XMLSEC_NO_XSLT
#include <libxslt/security.h>
/** /**
* xmlSecTransformXsltId: * xmlSecTransformXsltId:
* *
* The XSLT transform klass. * The XSLT transform klass.
*/ */
#define xmlSecTransformXsltId \ #define xmlSecTransformXsltId \
xmlSecTransformXsltGetKlass() xmlSecTransformXsltGetKlass()
XMLSEC_EXPORT xmlSecTransformId xmlSecTransformXsltGetKlass (vo id); XMLSEC_EXPORT xmlSecTransformId xmlSecTransformXsltGetKlass (vo id);
XMLSEC_EXPORT void xmlSecTransformXsltSetDefaultSecurityPrefs( xsltSecurityPrefsPtr sec);
#endif /* XMLSEC_NO_XSLT */ #endif /* XMLSEC_NO_XSLT */
/** /**
* xmlSecTransformRemoveXmlTagsC14NId: * xmlSecTransformRemoveXmlTagsC14NId:
* *
* The "remove all xml tags" transform klass (used before base64 transforms ). * The "remove all xml tags" transform klass (used before base64 transforms ).
*/ */
#define xmlSecTransformRemoveXmlTagsC14NId \ #define xmlSecTransformRemoveXmlTagsC14NId \
xmlSecTransformRemoveXmlTagsC14NGetKlass() xmlSecTransformRemoveXmlTagsC14NGetKlass()
XMLSEC_EXPORT xmlSecTransformId xmlSecTransformRemoveXmlTagsC14NGetKlass(vo id); XMLSEC_EXPORT xmlSecTransformId xmlSecTransformRemoveXmlTagsC14NGetKlass(vo id);
 End of changes. 3 change blocks. 
12 lines changed or deleted 3 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.15" #define XMLSEC_VERSION "1.2.17"
/** /**
* 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 15 #define XMLSEC_VERSION_SUBMINOR 17
/** /**
* 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:15:2" #define XMLSEC_VERSION_INFO "3:17: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


 x509.h   x509.h 
/** /**
* XMLSec library * XMLSec library
* *
* This is free software; see Copyright file in the source * This is free software; see Copyright file in the source
* distribution for preciese wording. * distribution for preciese wording.
* *
* Copyright (c) 2003 America Online, Inc. All rights reserved. * Copyright (C) 2010 Aleksey Sanin <aleksey@aleksey.com>
*/ */
#ifndef __XMLSEC_NSS_X509_H__ #ifndef __XMLSEC_GNUTLS_X509_H__
#define __XMLSEC_NSS_X509_H__ #define __XMLSEC_GNUTLS_X509_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#ifndef XMLSEC_NO_X509 #ifndef XMLSEC_NO_X509
#include <nspr.h> #include <gnutls/gnutls.h>
#include <nss.h> #include <gnutls/x509.h>
#include <cert.h>
#include <xmlsec/xmlsec.h> #include <xmlsec/xmlsec.h>
#include <xmlsec/keys.h> #include <xmlsec/keys.h>
#include <xmlsec/transforms.h> #include <xmlsec/transforms.h>
/**************************************************************************
*
* X509 Key Data
*
**************************************************************************
***/
/** /**
* xmlSecNssKeyDataX509Id: * xmlSecGnuTLSKeyDataX509Id:
* *
* The NSS X509 data klass. * The GnuTLS X509 data klass.
*/ */
#define xmlSecNssKeyDataX509Id \ #define xmlSecGnuTLSKeyDataX509Id \
xmlSecNssKeyDataX509GetKlass() xmlSecGnuTLSKeyDataX509GetKlass()
XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId xmlSecNssKeyDataX509GetKlass(void); XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId xmlSecGnuTLSKeyDataX509GetKlass
(void);
XMLSEC_CRYPTO_EXPORT CERTCertificate* xmlSecNssKeyDataX509GetKeyCert(xmlS XMLSEC_CRYPTO_EXPORT gnutls_x509_crt_t xmlSecGnuTLSKeyDataX509GetKeyCert
ecKeyDataPtr data); (xmlSecKeyDataPtr data);
XMLSEC_CRYPTO_EXPORT int xmlSecNssKeyDataX509AdoptKeyCert(xm XMLSEC_CRYPTO_EXPORT int xmlSecGnuTLSKeyDataX509AdoptKeyCert
lSecKeyDataPtr data, (xmlSecKeyDataPtr data,
CE
RTCertificate* cert); gnutls_x509_crt_t cert);
XMLSEC_CRYPTO_EXPORT int xmlSecNssKeyDataX509AdoptCert(xmlSe XMLSEC_CRYPTO_EXPORT int xmlSecGnuTLSKeyDataX509AdoptCert
cKeyDataPtr data, (xmlSecKeyDataPtr data,
CE
RTCertificate* cert); gnutls_x509_crt_t cert);
XMLSEC_CRYPTO_EXPORT CERTCertificate* xmlSecNssKeyDataX509GetCert (xm XMLSEC_CRYPTO_EXPORT gnutls_x509_crt_t xmlSecGnuTLSKeyDataX509GetCert
lSecKeyDataPtr data, (xmlSecKeyDataPtr data,
xm
lSecSize pos); xmlSecSize pos);
XMLSEC_CRYPTO_EXPORT xmlSecSize xmlSecNssKeyDataX509GetCertsSize(xm XMLSEC_CRYPTO_EXPORT xmlSecSize xmlSecGnuTLSKeyDataX509GetCertsSize
lSecKeyDataPtr data); (xmlSecKeyDataPtr data);
XMLSEC_CRYPTO_EXPORT int xmlSecNssKeyDataX509AdoptCrl(xmlSec XMLSEC_CRYPTO_EXPORT int xmlSecGnuTLSKeyDataX509AdoptCrl
KeyDataPtr data, (xmlSecKeyDataPtr data,
CE
RTSignedCrl* crl); gnutls_x509_crl_t crl);
XMLSEC_CRYPTO_EXPORT CERTSignedCrl* xmlSecNssKeyDataX509GetCrl (xm XMLSEC_CRYPTO_EXPORT gnutls_x509_crl_t xmlSecGnuTLSKeyDataX509GetCrl
lSecKeyDataPtr data, (xmlSecKeyDataPtr data,
xm
lSecSize pos); xmlSecSize pos);
XMLSEC_CRYPTO_EXPORT xmlSecSize xmlSecNssKeyDataX509GetCrlsSize(xml XMLSEC_CRYPTO_EXPORT xmlSecSize xmlSecGnuTLSKeyDataX509GetCrlsSize
SecKeyDataPtr data); (xmlSecKeyDataPtr data);
XMLSEC_CRYPTO_EXPORT xmlSecKeyDataPtr xmlSecNssX509CertGetKey (CE
RTCertificate* cert);
XMLSEC_CRYPTO_EXPORT xmlSecKeyDataPtr xmlSecGnuTLSX509CertGetKey
(gnutls_x509_crt_t cert);
/**************************************************************************
*
* X509 raw cert
*
**************************************************************************
***/
/** /**
* xmlSecNssKeyDataRawX509CertId: * xmlSecGnuTLSKeyDataRawX509CertId:
* *
* The NSS raw X509 certificate klass. * The GnuTLS raw X509 certificate klass.
*/ */
#define xmlSecNssKeyDataRawX509CertId \ #define xmlSecGnuTLSKeyDataRawX509CertId \
xmlSecNssKeyDataRawX509CertGetKlass() xmlSecGnuTLSKeyDataRawX509CertGetKlass()
XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId xmlSecNssKeyDataRawX509CertGetKlass XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId xmlSecGnuTLSKeyDataRawX509CertGetKl
(void); ass (void);
/**************************************************************************
*
* X509 certs store
*
**************************************************************************
***/
/** /**
* xmlSecNssX509StoreId: * xmlSecGnuTLSX509StoreId:
* *
* The NSS X509 store klass. * The GnuTLS X509 store klass.
*/ */
#define xmlSecNssX509StoreId \ #define xmlSecGnuTLSX509StoreId \
xmlSecNssX509StoreGetKlass() xmlSecGnuTLSX509StoreGetKlass()
XMLSEC_CRYPTO_EXPORT xmlSecKeyDataStoreId xmlSecNssX509StoreGetKlass(void); XMLSEC_CRYPTO_EXPORT xmlSecKeyDataStoreId xmlSecGnuTLSX509StoreGetKlass (vo
XMLSEC_CRYPTO_EXPORT CERTCertificate* xmlSecNssX509StoreFindCert id);
(xmlSecKeyDataStorePtr store, XMLSEC_CRYPTO_EXPORT gnutls_x509_crt_t xmlSecGnuTLSX509StoreFindCert (co
nst xmlSecKeyDataStorePtr store,
xmlChar *subjectName, co
nst xmlChar *subjectName,
xmlChar *issuerName, co
nst xmlChar *issuerName,
xmlChar *issuerSerial, co
nst xmlChar *issuerSerial,
xmlChar *ski, co
nst xmlChar *ski,
xmlSecKeyInfoCtx* keyInfoCtx); co
nst xmlSecKeyInfoCtx* keyInfoCtx);
XMLSEC_CRYPTO_EXPORT CERTCertificate* xmlSecNssX509StoreVerify XMLSEC_CRYPTO_EXPORT gnutls_x509_crt_t xmlSecGnuTLSX509StoreVerify (xm
(xmlSecKeyDataStorePtr store, lSecKeyDataStorePtr store,
xm
CERTCertList* certs, lSecPtrListPtr certs,
xm
xmlSecKeyInfoCtx* keyInfoCtx); lSecPtrListPtr crls,
XMLSEC_CRYPTO_EXPORT int xmlSecNssX509StoreAdoptCert co
(xmlSecKeyDataStorePtr store, nst xmlSecKeyInfoCtx* keyInfoCtx);
XMLSEC_CRYPTO_EXPORT int xmlSecGnuTLSX509StoreAdoptCert (xm
CERTCertificate* cert, lSecKeyDataStorePtr store,
gn
xmlSecKeyDataType type); utls_x509_crt_t cert,
xm
lSecKeyDataType type);
#endif /* XMLSEC_NO_X509 */ #endif /* XMLSEC_NO_X509 */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __XMLSEC_NSS_X509_H__ */ #endif /* __XMLSEC_GNUTLS_X509_H__ */
 End of changes. 19 change blocks. 
75 lines changed or deleted 96 lines changed or added


 xmlsec.h   xmlsec.h 
skipping to change at line 151 skipping to change at line 151
#ifdef HAVE_ANSIDECL_H #ifdef HAVE_ANSIDECL_H
#include <ansidecl.h> #include <ansidecl.h>
#endif #endif
#ifndef ATTRIBUTE_UNUSED #ifndef ATTRIBUTE_UNUSED
#define ATTRIBUTE_UNUSED #define ATTRIBUTE_UNUSED
#endif #endif
#else #else
#define ATTRIBUTE_UNUSED #define ATTRIBUTE_UNUSED
#endif #endif
/***********************************************************************
*
* Helpers to convert from void* to function pointer, this silence
* gcc warning
*
* warning: ISO C forbids conversion of object pointer to function
* pointer type
*
* The workaround is to declare a union that does the conversion. This is
* guaranteed (ISO/IEC 9899:1990 "C89"/"C90") to match exactly.
*
***********************************************************************/
/**
* XMLSEC_PTR_TO_FUNC_IMPL:
* @func_type: the function type.
*
* Macro declares helper functions to convert between "void *" pointer and
* function pointer.
*/
#define XMLSEC_PTR_TO_FUNC_IMPL(func_type) \
union xmlSecPtrToFuncUnion_ ##func_type { \
void *ptr; \
func_type * func; \
} ; \
static func_type * xmlSecPtrToFunc_ ##func_type(void * ptr) { \
union xmlSecPtrToFuncUnion_ ##func_type x; \
x.ptr = ptr; \
return (x.func); \
} \
static void * xmlSecFuncToPtr_ ##func_type(func_type * func) { \
union xmlSecPtrToFuncUnion_ ##func_type x; \
x.func = func; \
return (x.ptr); \
}
/**
* XMLSEC_PTR_TO_FUNC:
* @func_type: the function type.
* @ptr: the "void*" pointer to be converted.
*
* Macro converts from "void*" pointer to "func_type" function pointer.
*/
#define XMLSEC_PTR_TO_FUNC(func_type, ptr) \
xmlSecPtrToFunc_ ##func_type((ptr))
/**
* XMLSEC_FUNC_TO_PTR:
* @func_type: the function type.
* @func: the "func_type" function pointer to be converted.
*
* Macro converts from "func_type" function pointer to "void*" pointer.
*/
#define XMLSEC_FUNC_TO_PTR(func_type, func) \
xmlSecFuncToPtr_ ##func_type((func))
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __XMLSEC_H__ */ #endif /* __XMLSEC_H__ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 56 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/