app.h   app.h 
skipping to change at line 69 skipping to change at line 69
#define xmlSecKeyDataDesId xmlSecKeyDataDesGetKlass() #define xmlSecKeyDataDesId xmlSecKeyDataDesGetKlass()
XMLSEC_EXPORT xmlSecKeyDataId xmlSecKeyDataDesGetKlass (void); XMLSEC_EXPORT xmlSecKeyDataId xmlSecKeyDataDesGetKlass (void);
/** /**
* xmlSecKeyDataDsaId: * xmlSecKeyDataDsaId:
* *
* The DSA key klass. * The DSA key klass.
*/ */
#define xmlSecKeyDataDsaId xmlSecKeyDataDsaGetKlass() #define xmlSecKeyDataDsaId xmlSecKeyDataDsaGetKlass()
XMLSEC_EXPORT xmlSecKeyDataId xmlSecKeyDataDsaGetKlass (void); XMLSEC_EXPORT xmlSecKeyDataId xmlSecKeyDataDsaGetKlass (void);
/** /**
* xmlSecKeyDataGost2001Id:
*
* The GOST2001 key klass.
*/
#define xmlSecKeyDataGost2001Id xmlSecKeyDataGost200
1GetKlass()
XMLSEC_EXPORT xmlSecKeyDataId xmlSecKeyDataGost2001GetKlas
s (void);
/**
* xmlSecKeyDataHmacId: * xmlSecKeyDataHmacId:
* *
* The DHMAC key klass. * The DHMAC key klass.
*/ */
#define xmlSecKeyDataHmacId xmlSecKeyDataHmacGetKlass() #define xmlSecKeyDataHmacId xmlSecKeyDataHmacGetKlass()
XMLSEC_EXPORT xmlSecKeyDataId xmlSecKeyDataHmacGetKlass (void); XMLSEC_EXPORT xmlSecKeyDataId xmlSecKeyDataHmacGetKlass (void);
/** /**
* xmlSecKeyDataRsaId: * xmlSecKeyDataRsaId:
* *
* The RSA key klass. * The RSA key klass.
skipping to change at line 180 skipping to change at line 187
XMLSEC_EXPORT xmlSecTransformId xmlSecTransformKWDes 3GetKlass (void); XMLSEC_EXPORT xmlSecTransformId xmlSecTransformKWDes 3GetKlass (void);
/** /**
* xmlSecTransformDsaSha1Id: * xmlSecTransformDsaSha1Id:
* *
* The DSA-SHA1 signature transform klass. * The DSA-SHA1 signature transform klass.
*/ */
#define xmlSecTransformDsaSha1Id xmlSecTransformDsaSha1GetKla ss() #define xmlSecTransformDsaSha1Id xmlSecTransformDsaSha1GetKla ss()
XMLSEC_EXPORT xmlSecTransformId xmlSecTransformDsaSh a1GetKlass (void); XMLSEC_EXPORT xmlSecTransformId xmlSecTransformDsaSh a1GetKlass (void);
/** /**
* xmlSecTransformGost2001GostR3411_94Id:
*
* The GOST2001-GOSTR3411_94 signature transform klass.
*/
#define xmlSecTransformGost2001GostR3411_94Id xmlSecTransformGost2
001GostR3411_94GetKlass()
XMLSEC_EXPORT xmlSecTransformId xmlSecTransformGost2
001GostR3411_94GetKlass (void);
/**
* xmlSecTransformHmacMd5Id: * xmlSecTransformHmacMd5Id:
* *
* The HMAC with MD5 signature transform klass. * The HMAC with MD5 signature transform klass.
*/ */
#define xmlSecTransformHmacMd5Id xmlSecTransformHmacMd5GetKla ss() #define xmlSecTransformHmacMd5Id xmlSecTransformHmacMd5GetKla ss()
XMLSEC_EXPORT xmlSecTransformId xmlSecTransformHmacM d5GetKlass (void); XMLSEC_EXPORT xmlSecTransformId xmlSecTransformHmacM d5GetKlass (void);
/** /**
* xmlSecTransformHmacRipemd160Id: * xmlSecTransformHmacRipemd160Id:
* *
* The HMAC with RipeMD160 signature transform klass. * The HMAC with RipeMD160 signature transform klass.
skipping to change at line 307 skipping to change at line 322
#define xmlSecTransformRsaPkcs1Id xmlSecTransformRsaPkcs1GetKl ass() #define xmlSecTransformRsaPkcs1Id xmlSecTransformRsaPkcs1GetKl ass()
XMLSEC_EXPORT xmlSecTransformId xmlSecTransformRsaPk cs1GetKlass (void); XMLSEC_EXPORT xmlSecTransformId xmlSecTransformRsaPk cs1GetKlass (void);
/** /**
* xmlSecTransformRsaOaepId: * xmlSecTransformRsaOaepId:
* *
* The RSA PKCS1 key transport transform klass. * The RSA PKCS1 key transport transform klass.
*/ */
#define xmlSecTransformRsaOaepId xmlSecTransformRsaOaepGetKla ss() #define xmlSecTransformRsaOaepId xmlSecTransformRsaOaepGetKla ss()
XMLSEC_EXPORT xmlSecTransformId xmlSecTransformRsaOa epGetKlass (void); XMLSEC_EXPORT xmlSecTransformId xmlSecTransformRsaOa epGetKlass (void);
/** /**
* xmlSecTransformGostR3411_94Id:
*
* The GOSTR3411_94 digest transform klass.
*/
#define xmlSecTransformGostR3411_94Id xmlSecTransformGostR
3411_94GetKlass()
XMLSEC_EXPORT xmlSecTransformId xmlSecTransformGostR
3411_94GetKlass (void);
/**
* xmlSecTransformSha1Id: * xmlSecTransformSha1Id:
* *
* The SHA1 digest transform klass. * The SHA1 digest transform klass.
*/ */
#define xmlSecTransformSha1Id xmlSecTransformSha1GetKlass( ) #define xmlSecTransformSha1Id xmlSecTransformSha1GetKlass( )
XMLSEC_EXPORT xmlSecTransformId xmlSecTransformSha1G etKlass (void); XMLSEC_EXPORT xmlSecTransformId xmlSecTransformSha1G etKlass (void);
/** /**
* xmlSecTransformSha224Id: * xmlSecTransformSha224Id:
* *
* The SHA224 digest transform klass. * The SHA224 digest transform klass.
 End of changes. 3 change blocks. 
0 lines changed or deleted 28 lines changed or added


 private.h   private.h 
skipping to change at line 404 skipping to change at line 404
xmlSecCryptoInitMethod cryptoInit; xmlSecCryptoInitMethod cryptoInit;
xmlSecCryptoShutdownMethod cryptoShutdown; xmlSecCryptoShutdownMethod cryptoShutdown;
xmlSecCryptoKeysMngrInitMethod cryptoKeysMngrInit; xmlSecCryptoKeysMngrInitMethod cryptoKeysMngrInit;
/** /**
* Key data ids * Key data ids
*/ */
xmlSecCryptoKeyDataGetKlassMethod keyDataAesGetKlass; xmlSecCryptoKeyDataGetKlassMethod keyDataAesGetKlass;
xmlSecCryptoKeyDataGetKlassMethod keyDataDesGetKlass; xmlSecCryptoKeyDataGetKlassMethod keyDataDesGetKlass;
xmlSecCryptoKeyDataGetKlassMethod keyDataDsaGetKlass; xmlSecCryptoKeyDataGetKlassMethod keyDataDsaGetKlass;
xmlSecCryptoKeyDataGetKlassMethod keyDataGost2001GetKlass;
xmlSecCryptoKeyDataGetKlassMethod keyDataHmacGetKlass; xmlSecCryptoKeyDataGetKlassMethod keyDataHmacGetKlass;
xmlSecCryptoKeyDataGetKlassMethod keyDataRsaGetKlass; xmlSecCryptoKeyDataGetKlassMethod keyDataRsaGetKlass;
xmlSecCryptoKeyDataGetKlassMethod keyDataX509GetKlass; xmlSecCryptoKeyDataGetKlassMethod keyDataX509GetKlass;
xmlSecCryptoKeyDataGetKlassMethod keyDataRawX509CertGetKlass; xmlSecCryptoKeyDataGetKlassMethod keyDataRawX509CertGetKlass;
/** /**
* Key data store ids * Key data store ids
*/ */
xmlSecCryptoKeyDataStoreGetKlassMethod x509StoreGetKlass; xmlSecCryptoKeyDataStoreGetKlassMethod x509StoreGetKlass;
skipping to change at line 426 skipping to change at line 427
*/ */
xmlSecCryptoTransformGetKlassMethod transformAes128CbcG etKlass; xmlSecCryptoTransformGetKlassMethod transformAes128CbcG etKlass;
xmlSecCryptoTransformGetKlassMethod transformAes192CbcG etKlass; xmlSecCryptoTransformGetKlassMethod transformAes192CbcG etKlass;
xmlSecCryptoTransformGetKlassMethod transformAes256CbcG etKlass; xmlSecCryptoTransformGetKlassMethod transformAes256CbcG etKlass;
xmlSecCryptoTransformGetKlassMethod transformKWAes128Ge tKlass; xmlSecCryptoTransformGetKlassMethod transformKWAes128Ge tKlass;
xmlSecCryptoTransformGetKlassMethod transformKWAes192Ge tKlass; xmlSecCryptoTransformGetKlassMethod transformKWAes192Ge tKlass;
xmlSecCryptoTransformGetKlassMethod transformKWAes256Ge tKlass; xmlSecCryptoTransformGetKlassMethod transformKWAes256Ge tKlass;
xmlSecCryptoTransformGetKlassMethod transformDes3CbcGet Klass; xmlSecCryptoTransformGetKlassMethod transformDes3CbcGet Klass;
xmlSecCryptoTransformGetKlassMethod transformKWDes3GetK lass; xmlSecCryptoTransformGetKlassMethod transformKWDes3GetK lass;
xmlSecCryptoTransformGetKlassMethod transformDsaSha1Get Klass; xmlSecCryptoTransformGetKlassMethod transformDsaSha1Get Klass;
xmlSecCryptoTransformGetKlassMethod transformGost2001Go stR3411_94GetKlass;
xmlSecCryptoTransformGetKlassMethod transformHmacMd5Get Klass; xmlSecCryptoTransformGetKlassMethod transformHmacMd5Get Klass;
xmlSecCryptoTransformGetKlassMethod transformHmacRipemd 160GetKlass; xmlSecCryptoTransformGetKlassMethod transformHmacRipemd 160GetKlass;
xmlSecCryptoTransformGetKlassMethod transformHmacSha1Ge tKlass; xmlSecCryptoTransformGetKlassMethod transformHmacSha1Ge tKlass;
xmlSecCryptoTransformGetKlassMethod transformHmacSha224 GetKlass; xmlSecCryptoTransformGetKlassMethod transformHmacSha224 GetKlass;
xmlSecCryptoTransformGetKlassMethod transformHmacSha256 GetKlass; xmlSecCryptoTransformGetKlassMethod transformHmacSha256 GetKlass;
xmlSecCryptoTransformGetKlassMethod transformHmacSha384 GetKlass; xmlSecCryptoTransformGetKlassMethod transformHmacSha384 GetKlass;
xmlSecCryptoTransformGetKlassMethod transformHmacSha512 GetKlass; xmlSecCryptoTransformGetKlassMethod transformHmacSha512 GetKlass;
xmlSecCryptoTransformGetKlassMethod transformMd5GetKlas s; xmlSecCryptoTransformGetKlassMethod transformMd5GetKlas s;
xmlSecCryptoTransformGetKlassMethod transformRipemd160G etKlass; xmlSecCryptoTransformGetKlassMethod transformRipemd160G etKlass;
xmlSecCryptoTransformGetKlassMethod transformRsaMd5GetK lass; xmlSecCryptoTransformGetKlassMethod transformRsaMd5GetK lass;
xmlSecCryptoTransformGetKlassMethod transformRsaRipemd1 60GetKlass; xmlSecCryptoTransformGetKlassMethod transformRsaRipemd1 60GetKlass;
xmlSecCryptoTransformGetKlassMethod transformRsaSha1Get Klass; xmlSecCryptoTransformGetKlassMethod transformRsaSha1Get Klass;
xmlSecCryptoTransformGetKlassMethod transformRsaSha224G etKlass; xmlSecCryptoTransformGetKlassMethod transformRsaSha224G etKlass;
xmlSecCryptoTransformGetKlassMethod transformRsaSha256G etKlass; xmlSecCryptoTransformGetKlassMethod transformRsaSha256G etKlass;
xmlSecCryptoTransformGetKlassMethod transformRsaSha384G etKlass; xmlSecCryptoTransformGetKlassMethod transformRsaSha384G etKlass;
xmlSecCryptoTransformGetKlassMethod transformRsaSha512G etKlass; xmlSecCryptoTransformGetKlassMethod transformRsaSha512G etKlass;
xmlSecCryptoTransformGetKlassMethod transformRsaPkcs1Ge tKlass; xmlSecCryptoTransformGetKlassMethod transformRsaPkcs1Ge tKlass;
xmlSecCryptoTransformGetKlassMethod transformRsaOaepGet Klass; xmlSecCryptoTransformGetKlassMethod transformRsaOaepGet Klass;
xmlSecCryptoTransformGetKlassMethod transformGostR3411_ 94GetKlass;
xmlSecCryptoTransformGetKlassMethod transformSha1GetKla ss; xmlSecCryptoTransformGetKlassMethod transformSha1GetKla ss;
xmlSecCryptoTransformGetKlassMethod transformSha224GetK lass; xmlSecCryptoTransformGetKlassMethod transformSha224GetK lass;
xmlSecCryptoTransformGetKlassMethod transformSha256GetK lass; xmlSecCryptoTransformGetKlassMethod transformSha256GetK lass;
xmlSecCryptoTransformGetKlassMethod transformSha384GetK lass; xmlSecCryptoTransformGetKlassMethod transformSha384GetK lass;
xmlSecCryptoTransformGetKlassMethod transformSha512GetK lass; xmlSecCryptoTransformGetKlassMethod transformSha512GetK lass;
/** /**
* High level routines form xmlsec command line utility * High level routines form xmlsec command line utility
*/ */
xmlSecCryptoAppInitMethod cryptoAppInit; xmlSecCryptoAppInitMethod cryptoAppInit;
 End of changes. 3 change blocks. 
0 lines changed or deleted 3 lines changed or added


 strings.h   strings.h 
skipping to change at line 314 skipping to change at line 314
XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeDSAX[]; XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeDSAX[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeDSAY[]; XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeDSAY[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeDSASeed[]; XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeDSASeed[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeDSAPgenCounter[]; XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeDSAPgenCounter[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecNameDsaSha1[]; XMLSEC_EXPORT_VAR const xmlChar xmlSecNameDsaSha1[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefDsaSha1[]; XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefDsaSha1[];
/************************************************************************* /*************************************************************************
* *
* GOST2001 strings
*
************************************************************************/
XMLSEC_EXPORT_VAR const xmlChar xmlSecNameGOST2001KeyValue[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeGOST2001KeyValue[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefGOST2001KeyValue[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecNameGost2001GostR3411_94[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefGost2001GostR3411_94[];
/*************************************************************************
*
* EncryptedKey * EncryptedKey
* *
************************************************************************/ ************************************************************************/
XMLSEC_EXPORT_VAR const xmlChar xmlSecNameEncryptedKey[]; XMLSEC_EXPORT_VAR const xmlChar xmlSecNameEncryptedKey[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeEncryptedKey[]; XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeEncryptedKey[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefEncryptedKey[]; XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefEncryptedKey[];
/************************************************************************* /*************************************************************************
* *
* Enveloped transform strings * Enveloped transform strings
skipping to change at line 451 skipping to change at line 463
XMLSEC_EXPORT_VAR const xmlChar xmlSecNameRsaPkcs1[]; XMLSEC_EXPORT_VAR const xmlChar xmlSecNameRsaPkcs1[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefRsaPkcs1[]; XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefRsaPkcs1[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecNameRsaOaep[]; XMLSEC_EXPORT_VAR const xmlChar xmlSecNameRsaOaep[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefRsaOaep[]; XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefRsaOaep[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeRsaOAEPparams[]; XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeRsaOAEPparams[];
/************************************************************************* /*************************************************************************
* *
* GOSTR3411_94 strings
*
************************************************************************/
XMLSEC_EXPORT_VAR const xmlChar xmlSecNameGostR3411_94[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefGostR3411_94[];
/*************************************************************************
*
* SHA1 strings * SHA1 strings
* *
************************************************************************/ ************************************************************************/
XMLSEC_EXPORT_VAR const xmlChar xmlSecNameSha1[]; XMLSEC_EXPORT_VAR const xmlChar xmlSecNameSha1[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefSha1[]; XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefSha1[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecNameSha224[]; XMLSEC_EXPORT_VAR const xmlChar xmlSecNameSha224[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefSha224[]; XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefSha224[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecNameSha256[]; XMLSEC_EXPORT_VAR const xmlChar xmlSecNameSha256[];
 End of changes. 2 change blocks. 
0 lines changed or deleted 20 lines changed or added


 templates.h   templates.h 
skipping to change at line 120 skipping to change at line 120
const xmlCh ar *id, const xmlCh ar *id,
const xmlCh ar *type, const xmlCh ar *type,
const xmlCh ar *recipient); const xmlCh ar *recipient);
/*********************************************************************** /***********************************************************************
* *
* <dsig:X509Data> node * <dsig:X509Data> node
* *
**********************************************************************/ **********************************************************************/
XMLSEC_EXPORT xmlNodePtr xmlSecTmplX509DataAddIssuerSerial (xmlNodePtr x509DataNode); XMLSEC_EXPORT xmlNodePtr xmlSecTmplX509DataAddIssuerSerial (xmlNodePtr x509DataNode);
XMLSEC_EXPORT xmlNodePtr xmlSecTmplX509IssuerSerialAddIssuerName(xmlNodePtr
x509IssuerSerialNode, const xmlChar* issuerName);
XMLSEC_EXPORT xmlNodePtr xmlSecTmplX509IssuerSerialAddSerialNumber(xmlNodeP
tr x509IssuerSerialNode, const xmlChar* serial);
XMLSEC_EXPORT xmlNodePtr xmlSecTmplX509DataAddSubjectName (xmlNodePtr x509DataNode); XMLSEC_EXPORT xmlNodePtr xmlSecTmplX509DataAddSubjectName (xmlNodePtr x509DataNode);
XMLSEC_EXPORT xmlNodePtr xmlSecTmplX509DataAddSKI (xmlNodePtr x509DataNode); XMLSEC_EXPORT xmlNodePtr xmlSecTmplX509DataAddSKI (xmlNodePtr x509DataNode);
XMLSEC_EXPORT xmlNodePtr xmlSecTmplX509DataAddCertificate (xmlNodePtr x509DataNode); XMLSEC_EXPORT xmlNodePtr xmlSecTmplX509DataAddCertificate (xmlNodePtr x509DataNode);
XMLSEC_EXPORT xmlNodePtr xmlSecTmplX509DataAddCRL (xmlNodePtr x509DataNode); XMLSEC_EXPORT xmlNodePtr xmlSecTmplX509DataAddCRL (xmlNodePtr x509DataNode);
/*********************************************************************** /***********************************************************************
* *
* <dsig:Transform> node * <dsig:Transform> node
* *
**********************************************************************/ **********************************************************************/
 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.9" #define XMLSEC_VERSION "1.2.10"
/** /**
* 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 9 #define XMLSEC_VERSION_SUBMINOR 10
/** /**
* 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:9:2" #define XMLSEC_VERSION_INFO "3:10: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) 2002-2003 Aleksey Sanin <aleksey@aleksey.com> * Copyright (c) 2003 America Online, Inc. All rights reserved.
*/ */
#ifndef __XMLSEC_OPENSSL_X509_H__ #ifndef __XMLSEC_NSS_X509_H__
#define __XMLSEC_OPENSSL_X509_H__ #define __XMLSEC_NSS_X509_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#ifndef XMLSEC_NO_X509 #ifndef XMLSEC_NO_X509
#include <openssl/x509.h> #include <nspr.h>
#include <nss.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>
/** /**
* XMLSEC_STACK_OF_X509: * xmlSecNssKeyDataX509Id:
*
* Macro. To make docbook happy.
*/
#define XMLSEC_STACK_OF_X509 STACK_OF(X509)
/**
* XMLSEC_STACK_OF_X509_CRL:
*
* Macro. To make docbook happy.
*/
#define XMLSEC_STACK_OF_X509_CRL STACK_OF(X509_CRL)
/**
* xmlSecOpenSSLKeyDataX509Id:
* *
* The OpenSSL X509 data klass. * The NSS X509 data klass.
*/ */
#define xmlSecOpenSSLKeyDataX509Id \ #define xmlSecNssKeyDataX509Id \
xmlSecOpenSSLKeyDataX509GetKlass() xmlSecNssKeyDataX509GetKlass()
XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId xmlSecOpenSSLKeyDataX509GetKlass(voi XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId xmlSecNssKeyDataX509GetKlass(void);
d);
XMLSEC_CRYPTO_EXPORT X509* xmlSecOpenSSLKeyDataX509GetKeyCert(x XMLSEC_CRYPTO_EXPORT CERTCertificate* xmlSecNssKeyDataX509GetKeyCert(xmlSe
mlSecKeyDataPtr data); cKeyDataPtr data);
XMLSEC_CRYPTO_EXPORT int xmlSecOpenSSLKeyDataX509AdoptKeyCert XMLSEC_CRYPTO_EXPORT int xmlSecNssKeyDataX509AdoptKeyCert(xml
(xmlSecKeyDataPtr data, SecKeyDataPtr data,
X50 CER
9* cert); TCertificate* cert);
XMLSEC_CRYPTO_EXPORT int xmlSecOpenSSLKeyDataX509AdoptCert(xm XMLSEC_CRYPTO_EXPORT int xmlSecNssKeyDataX509AdoptCert(xmlSec
lSecKeyDataPtr data, KeyDataPtr data,
X50 CER
9* cert); TCertificate* cert);
XMLSEC_CRYPTO_EXPORT X509* xmlSecOpenSSLKeyDataX509GetCert (xml XMLSEC_CRYPTO_EXPORT CERTCertificate* xmlSecNssKeyDataX509GetCert (xml
SecKeyDataPtr data, SecKeyDataPtr data,
xml SecSize pos); xml SecSize pos);
XMLSEC_CRYPTO_EXPORT xmlSecSize xmlSecOpenSSLKeyDataX509GetC ertsSize(xmlSecKeyDataPtr data); XMLSEC_CRYPTO_EXPORT xmlSecSize xmlSecNssKeyDataX509GetCerts Size(xmlSecKeyDataPtr data);
XMLSEC_CRYPTO_EXPORT int xmlSecOpenSSLKeyDataX509AdoptCrl(xml XMLSEC_CRYPTO_EXPORT int xmlSecNssKeyDataX509AdoptCrl(xmlSecK
SecKeyDataPtr data, eyDataPtr data,
X50 CER
9_CRL* crl); TSignedCrl* crl);
XMLSEC_CRYPTO_EXPORT X509_CRL* xmlSecOpenSSLKeyDataX509GetCrl (xml XMLSEC_CRYPTO_EXPORT CERTSignedCrl* xmlSecNssKeyDataX509GetCrl (xml
SecKeyDataPtr data, SecKeyDataPtr data,
xml SecSize pos); xml SecSize pos);
XMLSEC_CRYPTO_EXPORT xmlSecSize xmlSecOpenSSLKeyDataX509GetC XMLSEC_CRYPTO_EXPORT xmlSecSize xmlSecNssKeyDataX509GetCrlsS
rlsSize(xmlSecKeyDataPtr data); ize(xmlSecKeyDataPtr data);
XMLSEC_CRYPTO_EXPORT xmlSecKeyDataPtr xmlSecNssX509CertGetKey (CER
XMLSEC_CRYPTO_EXPORT xmlSecKeyDataPtr xmlSecOpenSSLX509CertGetKey (X50 TCertificate* cert);
9* cert);
/** /**
* xmlSecOpenSSLKeyDataRawX509CertId: * xmlSecNssKeyDataRawX509CertId:
* *
* The OpenSSL raw X509 certificate klass. * The NSS raw X509 certificate klass.
*/ */
#define xmlSecOpenSSLKeyDataRawX509CertId \ #define xmlSecNssKeyDataRawX509CertId \
xmlSecOpenSSLKeyDataRawX509CertGetKlass() xmlSecNssKeyDataRawX509CertGetKlass()
XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId xmlSecOpenSSLKeyDataRawX509CertGetKl XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId xmlSecNssKeyDataRawX509CertGetKlass(
ass(void); void);
/** /**
* xmlSecOpenSSLX509StoreId: * xmlSecNssX509StoreId:
* *
* The OpenSSL X509 store klass. * The NSS X509 store klass.
*/ */
#define xmlSecOpenSSLX509StoreId \ #define xmlSecNssX509StoreId \
xmlSecOpenSSLX509StoreGetKlass() xmlSecNssX509StoreGetKlass()
XMLSEC_CRYPTO_EXPORT xmlSecKeyDataStoreId xmlSecOpenSSLX509StoreGetKlass(vo XMLSEC_CRYPTO_EXPORT xmlSecKeyDataStoreId xmlSecNssX509StoreGetKlass(void);
id); XMLSEC_CRYPTO_EXPORT CERTCertificate* xmlSecNssX509StoreFindCert
XMLSEC_CRYPTO_EXPORT X509* xmlSecOpenSSLX509StoreFindCert (xml (xmlSecKeyDataStorePtr store,
SecKeyDataStorePtr store,
xml xmlChar *subjectName,
Char *subjectName,
xml xmlChar *issuerName,
Char *issuerName,
xml xmlChar *issuerSerial,
Char *issuerSerial,
xml xmlChar *ski,
Char *ski,
xml xmlSecKeyInfoCtx* keyInfoCtx);
SecKeyInfoCtx* keyInfoCtx);
XMLSEC_CRYPTO_EXPORT X509* xmlSecOpenSSLX509StoreVerify (xml XMLSEC_CRYPTO_EXPORT CERTCertificate* xmlSecNssX509StoreVerify
SecKeyDataStorePtr store, (xmlSecKeyDataStorePtr store,
XML
SEC_STACK_OF_X509* certs, CERTCertList* certs,
XML
SEC_STACK_OF_X509_CRL* crls, xmlSecKeyInfoCtx* keyInfoCtx);
xml XMLSEC_CRYPTO_EXPORT int xmlSecNssX509StoreAdoptCert
SecKeyInfoCtx* keyInfoCtx); (xmlSecKeyDataStorePtr store,
XMLSEC_CRYPTO_EXPORT int xmlSecOpenSSLX509StoreAdoptCert (xml
SecKeyDataStorePtr store, CERTCertificate* cert,
X50
9* cert, xmlSecKeyDataType type);
xml
SecKeyDataType type);
XMLSEC_CRYPTO_EXPORT int xmlSecOpenSSLX509StoreAddCertsPath(x
mlSecKeyDataStorePtr store,
con
st char* path);
#endif /* XMLSEC_NO_X509 */ #endif /* XMLSEC_NO_X509 */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __XMLSEC_OPENSSL_X509_H__ */ #endif /* __XMLSEC_NSS_X509_H__ */
 End of changes. 18 change blocks. 
90 lines changed or deleted 71 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/