--- a/xmlsecurityengine/xmlsec/inc/xmlsec_transforms.h Wed Feb 03 11:49:58 2010 +0000
+++ b/xmlsecurityengine/xmlsec/inc/xmlsec_transforms.h Sat Feb 20 00:38:59 2010 +0200
@@ -504,7 +504,7 @@
*/
#define xmlSecTransformCheckId(transform, i) \
(xmlSecTransformIsValid(( transform )) && \
- ((((const xmlSecTransformId) (( transform )->id))) == ( i )))
+ (((( xmlSecTransformId) (( transform )->id))) == ( i )))
/**
* xmlSecTransformCheckSize:
--- a/xmlsecurityengine/xmlsec/src/xmlsec_xkms.c Wed Feb 03 11:49:58 2010 +0000
+++ b/xmlsecurityengine/xmlsec/src/xmlsec_xkms.c Sat Feb 20 00:38:59 2010 +0200
@@ -159,7 +159,7 @@
{ NULL, NULL, 0 } /* MUST be last in the list */
};
-static const xmlSecQName2BitMaskInfo gXmlSecXkmsKeyBindingReasonInfo[] =
+/*static const xmlSecQName2BitMaskInfo gXmlSecXkmsKeyBindingReasonInfo[] =
{
{ xmlSecXkmsNs, xmlSecKeyBindingReasonIssuerTrust,
XMLSEC_XKMS_KEY_BINDING_REASON_MASK_ISSUER_TRAST },
@@ -169,8 +169,9 @@
XMLSEC_XKMS_KEY_BINDING_REASON_MASK_VALIDITY_INTERVAL },
{ xmlSecXkmsNs, xmlSecKeyBindingReasonSignature,
XMLSEC_XKMS_KEY_BINDING_REASON_MASK_SIGNATURE },
- { NULL, NULL, 0 } /* MUST be last in the list */
+ { NULL, NULL, 0 } MUST be last in the list
};
+*/
static const xmlSecQName2BitMaskInfo gXmlSecXkmsResponseMechanismInfo[] =
{
--- a/xmlsecurityengine/xmlseccertman/inc/xmlsecmsymbiancertstore.h Wed Feb 03 11:49:58 2010 +0000
+++ b/xmlsecurityengine/xmlseccertman/inc/xmlsecmsymbiancertstore.h Sat Feb 20 00:38:59 2010 +0200
@@ -54,7 +54,7 @@
*
* @since S60 v3.2
*/
- void CreateUnifiedCertStoreL();
+ IMPORT_C void CreateUnifiedCertStoreL();
/**
* Find a cert in the Unified Cert Store
--- a/xmlsecurityengine/xmlseccertman/inc/xmlsecmsymbiankeystore.h Wed Feb 03 11:49:58 2010 +0000
+++ b/xmlsecurityengine/xmlseccertman/inc/xmlsecmsymbiankeystore.h Sat Feb 20 00:38:59 2010 +0200
@@ -53,7 +53,7 @@
*
* @since S60 v3.2
*/
- void CreateUnifiedKeyStoreL();
+ IMPORT_C void CreateUnifiedKeyStoreL();
/**
* Find a key in the Unified Key Store
--- a/xmlsecurityengine/xmlseccrypto/src/xmlsecc_app.cpp Wed Feb 03 11:49:58 2010 +0000
+++ b/xmlsecurityengine/xmlseccrypto/src/xmlsecc_app.cpp Sat Feb 20 00:38:59 2010 +0200
@@ -88,9 +88,9 @@
void* pwdCallback,
void* pwdCallbackCtx) {
xmlSecKeyPtr key = NULL;
- EVP_PKEY* pKey = NULL;
+
BIO* bio;
- xmlSecKeyDataPtr data;
+
xmlSecAssert2(filename, NULL);
xmlSecAssert2(format != xmlSecKeyDataFormatUnknown, NULL);
@@ -146,7 +146,7 @@
void* pwdCallback, void* pwdCallbackCtx) {
xmlSecKeyPtr key = NULL;
- EVP_PKEY* pKey = NULL;
+
BIO* bio;
bio = BIO_new_buffer((const char*)data,dataSize,keyname);
--- a/xmlsecurityengine/xmlseccrypto/src/xmlsecc_ciphers.cpp Wed Feb 03 11:49:58 2010 +0000
+++ b/xmlsecurityengine/xmlseccrypto/src/xmlsecc_ciphers.cpp Sat Feb 20 00:38:59 2010 +0200
@@ -259,7 +259,7 @@
xmlSecTransformCtxPtr transformCtx) {
xmlSecSize inSize, outSize;
int blockLen, outLen = 0;
- xmlSecByte* inBuf;
+ //xmlSecByte* inBuf;
xmlSecByte* outBuf;
int ret;
@@ -290,7 +290,7 @@
"size=%d", blockLen);
return(-1);
}
- inBuf = xmlSecBufferGetData(in);
+ //inBuf = xmlSecBufferGetData(in);
} else {
if(inSize != (xmlSecSize)blockLen) {
--- a/xmlsecurityengine/xmlseccrypto/src/xmlsecc_cryptowrapper.cpp Wed Feb 03 11:49:58 2010 +0000
+++ b/xmlsecurityengine/xmlseccrypto/src/xmlsecc_cryptowrapper.cpp Sat Feb 20 00:38:59 2010 +0200
@@ -149,7 +149,7 @@
if (ivlen > c->blocksize)
ivlen = c->blocksize;
- TInt len = ivlen;
+
TRAP( error, c->iv = HBufC8::NewL(ivlen) );
if ( error ) //!= KErrNone
{
--- a/xmlsecurityengine/xmlseccrypto/src/xmlsecc_evp.cpp Wed Feb 03 11:49:58 2010 +0000
+++ b/xmlsecurityengine/xmlseccrypto/src/xmlsecc_evp.cpp Sat Feb 20 00:38:59 2010 +0200
@@ -100,7 +100,7 @@
return(ctx->pKey);
- return NULL;
+ //return NULL;
}
static int
@@ -327,7 +327,7 @@
EXPORT_C
EVP_PKEY*
xmlSecSymbianCryptoEvpKeyDup(EVP_PKEY* pKey) {
- int ret;
+
EVP_PKEY* pKeyNew;
xmlSecAssert2(pKey, NULL);
@@ -1312,7 +1312,7 @@
*/
RSA*
xmlSecSymbianCryptoKeyDataRsaGetRsa(xmlSecKeyDataPtr data) {
- EVP_PKEY* pKey;
+
xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecSymbianCryptoKeyDataRsaId), NULL);
/*
@@ -1528,7 +1528,7 @@
xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) {
xmlNodePtr cur;
RSA* rsa;
- int ret;
+
xmlSecAssert2(id == xmlSecSymbianCryptoKeyDataRsaId, -1);
xmlSecAssert2(key, -1);
@@ -1625,7 +1625,7 @@
xmlSecSymbianCryptoKeyDataRsaGenerate(xmlSecKeyDataPtr data,
xmlSecSize sizeBits,
xmlSecKeyDataType type ATTRIBUTE_UNUSED) {
- RSA* rsa;
+
int ret;
EVP_PKEY *pKey;
--- a/xmlsecurityengine/xmlseccrypto/src/xmlsecc_md.cpp Wed Feb 03 11:49:58 2010 +0000
+++ b/xmlsecurityengine/xmlseccrypto/src/xmlsecc_md.cpp Sat Feb 20 00:38:59 2010 +0200
@@ -51,7 +51,7 @@
md_open (sc_md_hd_t *h, int algo, int secure, int hmac)
{
TInt err = KErrNone;
- int bufsize = secure ? 512 : 1024;
+ //int bufsize = secure ? 512 : 1024;
sc_md_hd_t hd;
hd = (sc_md_hd_t)malloc (sizeof (struct sc_md_handle));
if (! hd)
--- a/xmlsecurityengine/xmlseccrypto/src/xmlsecc_signatures.cpp Wed Feb 03 11:49:58 2010 +0000
+++ b/xmlsecurityengine/xmlseccrypto/src/xmlsecc_signatures.cpp Sat Feb 20 00:38:59 2010 +0200
@@ -136,7 +136,7 @@
return(0);
}
- return(0);
+ // return(0);
}
static int
--- a/xmlsecurityengine/xmlseccrypto/src/xmlsecc_x509.cpp Wed Feb 03 11:49:58 2010 +0000
+++ b/xmlsecurityengine/xmlseccrypto/src/xmlsecc_x509.cpp Sat Feb 20 00:38:59 2010 +0200
@@ -89,7 +89,7 @@
static X509_CRL* xmlSecSymbianCryptoX509CrlBase64DerRead (xmlChar* buf);
static xmlChar* xmlSecSymbianCryptoX509CrlBase64DerWrite (X509_CRL* crl,
int base64LineWrap);
-static xmlChar* xmlSecSymbianCryptoX509NameWrite (X509_NAME* nm);
+//static xmlChar* xmlSecSymbianCryptoX509NameWrite (X509_NAME* nm);
#ifdef XMLSEC_FUTURE_SUPPORT
static xmlChar* xmlSecSymbianCryptoASN1IntegerWrite (ASN1_INTEGER *asni);
#endif //XMLSEC_FUTURE_SUPPORT
@@ -378,7 +378,7 @@
int
xmlSecSymbianCryptoKeyDataX509AdoptCert(xmlSecKeyDataPtr data, X509* cert) {
xmlSecSymbianCryptoX509DataCtxPtr ctx;
- int ret;
+
xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecSymbianCryptoKeyDataX509Id), -1);
xmlSecAssert2(cert, -1);
@@ -469,7 +469,7 @@
int
xmlSecSymbianCryptoKeyDataX509AdoptCrl(xmlSecKeyDataPtr data, X509_CRL* crl) {
xmlSecSymbianCryptoX509DataCtxPtr ctx;
- int ret;
+
xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecSymbianCryptoKeyDataX509Id), -1);
xmlSecAssert2(crl, -1);
@@ -1681,7 +1681,7 @@
// do not use list first
//if((ctx->keyCert == NULL) && (ctx->certsList != NULL) && (xmlSecKeyGetValue(key) == NULL)) {
if((ctx->keyCert) && (!xmlSecKeyGetValue(key)) ) {
- X509* cert;
+
ret = xmlSecSymbianCryptoX509StoreKeyCertVerify(x509Store, ctx->keyCert);
if(ret == 0) {
@@ -1799,6 +1799,7 @@
* If you system has a native struct tm --> GMT time_t conversion function
* (like timegm) use it instead.
*/
+ /*
static time_t
my_timegm(struct tm *t) {
time_t tl, tb;
@@ -1828,6 +1829,7 @@
}
#define timegm(tm) my_timegm(tm)
+*/
#endif /* WIN32 */
#endif /* HAVE_TIMEGM */
@@ -2016,8 +2018,8 @@
static xmlChar*
xmlSecSymbianCryptoX509CertBase64DerWrite(X509* cert, int base64LineWrap) {
xmlChar *res = NULL;
- xmlSecByte *p = NULL;
- long size;
+
+
xmlSecAssert2(cert, NULL);
@@ -2067,8 +2069,8 @@
static xmlChar*
xmlSecSymbianCryptoX509CrlBase64DerWrite(X509_CRL* crl, int base64LineWrap) {
xmlChar *res = NULL;
- xmlSecByte *p = NULL;
- long size;
+
+
xmlSecAssert2(crl, NULL);
#ifdef XMLSEC_FUTURE_SUPPORT
@@ -2112,7 +2114,7 @@
#endif
return(res);
}
-
+/*
static xmlChar*
xmlSecSymbianCryptoX509NameWrite(X509_NAME* nm) {
xmlChar *res = NULL;
@@ -2161,7 +2163,7 @@
#endif
return(res);
}
-
+*/
#ifdef XMLSEC_FUTURE_SUPPORT
static xmlChar*
xmlSecSymbianCryptoASN1IntegerWrite(ASN1_INTEGER *asni) {
@@ -2216,7 +2218,7 @@
static xmlChar*
xmlSecSymbianCryptoX509SKIWrite(X509* cert) {
xmlChar *res = NULL;
- int index;
+
#ifdef XMLSEC_FUTURE_SUPPORT
X509_EXTENSION *ext;
ASN1_OCTET_STRING *keyId;
@@ -2271,7 +2273,7 @@
static void
xmlSecSymbianCryptoX509CertDebugDump(X509* cert, FILE* output) {
- char buf[1024];
+
#ifdef XMLSEC_FUTURE_SUPPORT
BIGNUM *bn = NULL;
@@ -2297,7 +2299,7 @@
static void
xmlSecSymbianCryptoX509CertDebugXmlDump(X509* cert, FILE* output) {
- char buf[1024];
+
#ifdef XMLSEC_FUTURE_SUPPORT
BIGNUM *bn = NULL;
--- a/xmlsecurityengine/xmlseccrypto/src/xmlsecc_x509vfy.cpp Wed Feb 03 11:49:58 2010 +0000
+++ b/xmlsecurityengine/xmlseccrypto/src/xmlsecc_x509vfy.cpp Sat Feb 20 00:38:59 2010 +0200
@@ -86,14 +86,14 @@
NULL, /* void* reserved1; */
};
-static int xmlSecSymbianCryptoX509VerifyCrl (X509_STORE* xst,
- X509_CRL *crl );
+/*static int xmlSecSymbianCryptoX509VerifyCrl (X509_STORE* xst,
+ X509_CRL *crl );*/
static X509* xmlSecSymbianCryptoX509FindCert (STACK_OF(X509) *certs,
xmlChar *subjectName,
xmlChar *issuerName,
xmlChar *issuerSerial,
xmlChar *ski);
-static X509* xmlSecSymbianCryptoX509FindNextChainCert (STACK_OF(X509) *chain,
+/*static X509* xmlSecSymbianCryptoX509FindNextChainCert (STACK_OF(X509) *chain,
X509 *cert);
static int xmlSecSymbianCryptoX509VerifyCertAgainstCrls (STACK_OF(X509_CRL) *crls,
X509* cert);
@@ -109,7 +109,7 @@
X509_NAME *b);
static int xmlSecSymbianCryptoX509_NAME_cmp (const X509_NAME *a,
const X509_NAME *b);
-/*
+
static int xmlSecSymbianCryptoX509_NAME_ENTRY_cmp (const X509_NAME_ENTRY **a,
const X509_NAME_ENTRY **b);
*/
@@ -178,12 +178,12 @@
int
xmlSecSymbianCryptoX509StoreKeyCertVerify(xmlSecKeyDataStorePtr store, X509* cert) {
xmlSecSymbianCryptoX509StoreCtxPtr ctx;
- X509* res = NULL;
- X509 *err_cert = NULL;
- char buf[256];
- int err = 0, depth;
- int i;
- int ret;
+
+
+
+ int err = 0;
+
+
xmlSecAssert2(xmlSecKeyDataStoreCheckId(store, xmlSecSymbianCryptoX509StoreId), NULL);
xmlSecAssert2(cert, NULL);
@@ -259,13 +259,13 @@
xmlSecSymbianCryptoX509StoreVerify(xmlSecKeyDataStorePtr store, XMLSEC_STACK_OF_X509* certs,
XMLSEC_STACK_OF_X509_CRL* crls, xmlSecKeyInfoCtx* keyInfoCtx) {
xmlSecSymbianCryptoX509StoreCtxPtr ctx;
- STACK_OF(X509)* certs2 = NULL;
+
X509* res = NULL;
X509* cert = NULL;
- X509 *err_cert = NULL;
- char buf[256];
- int err = 0, depth;
- int i;
+
+
+ int err = 0;
+
int ret;
xmlSecAssert2(xmlSecKeyDataStoreCheckId(store, xmlSecSymbianCryptoX509StoreId), NULL);
@@ -636,7 +636,7 @@
static int
xmlSecSymbianCryptoX509StoreInitialize(xmlSecKeyDataStorePtr store) {
- const xmlChar* path;
+
xmlSecSymbianCryptoX509StoreCtxPtr ctx;
xmlSecAssert2(xmlSecKeyDataStoreCheckId(store, xmlSecSymbianCryptoX509StoreId), -1);
@@ -751,7 +751,7 @@
* Low-level x509 functions
*
*****************************************************************************/
-static int
+/*static int
xmlSecSymbianCryptoX509VerifyCrl(X509_STORE* xst, X509_CRL *crl ) {
EVP_PKEY *pkey;
@@ -794,6 +794,7 @@
#endif //XMLSEC_FUTURE_SUPPORT
return((ret == 1) ? 1 : 0);
}
+*/
/**
* xmlSecSymbianCryptoX509FindCert:
@@ -802,8 +803,8 @@
xmlSecSymbianCryptoX509FindCert(STACK_OF(X509) *certs, xmlChar *subjectName,
xmlChar *issuerName, xmlChar *issuerSerial,
xmlChar *ski) {
- X509 *cert = NULL;
- int i;
+
+
xmlSecAssert2(certs, NULL);
#ifdef XMLSEC_FUTURE_SUPPORT
@@ -940,14 +941,15 @@
/**
* xmlSecSymbianCryptoX509FindNextChainCert:
*/
+ /*
static X509*
xmlSecSymbianCryptoX509FindNextChainCert(STACK_OF(X509) *chain, X509 *cert) {
- unsigned long certSubjHash;
- int i;
+
+
xmlSecAssert2(chain, NULL);
xmlSecAssert2(cert, NULL);
-/*
+
certSubjHash = X509_subject_name_hash(cert);
for(i = 0; i < sk_X509_num(chain); ++i) {
if((sk_X509_value(chain, i) != cert) &&
@@ -956,17 +958,18 @@
return(sk_X509_value(chain, i));
}
}
-*/
+
return(NULL);
}
-
+*/
/**
* xmlSecSymbianCryptoX509VerifyCertAgainstCrls:
*/
+ /*
static int
xmlSecSymbianCryptoX509VerifyCertAgainstCrls(STACK_OF(X509_CRL) *crls, X509* cert) {
- X509_NAME *issuer;
- X509_CRL *crl = NULL;
+
+
#ifdef XMLSEC_FUTURE_SUPPORT
X509_REVOKED *revoked;
int i, n;
@@ -975,10 +978,10 @@
xmlSecAssert2(crls, -1);
xmlSecAssert2(cert, -1);
- /*
+
* Try to retrieve a CRL corresponding to the issuer of
* the current certificate
- */
+
n = sk_X509_CRL_num(crls);
for(i = 0; i < n; i++) {
crl = sk_X509_CRL_value(crls, i);
@@ -988,22 +991,22 @@
}
}
if((i >= n) || (!crl)){
- /* no crls for this issuer */
+ // no crls for this issuer
return(1);
}
- /*
- * Check date of CRL to make sure it's not expired
- */
+
+ // Check date of CRL to make sure it's not expired
+
ret = X509_cmp_current_time(X509_CRL_get_nextUpdate(crl));
if (ret == 0) {
- /* crl expired */
+ //crl expired
return(1);
}
- /*
- * Check if the current certificate is revoked by this CRL
- */
+
+ // Check if the current certificate is revoked by this CRL
+
n = sk_num(X509_CRL_get_REVOKED(crl));
for (i = 0; i < n; i++) {
revoked = (X509_REVOKED *)sk_value(X509_CRL_get_REVOKED(crl), i);
@@ -1019,16 +1022,18 @@
#endif //XMLSEC_FUTURE_SUPPORT
return(1);
}
+*/
/**
* xmlSecSymbianCryptoX509NameRead:
- */
+ */
+ /*
static X509_NAME *
xmlSecSymbianCryptoX509NameRead(xmlSecByte *str, int len) {
- xmlSecByte name[256];
- xmlSecByte value[256];
- int nameLen, valueLen;
+
+
+
X509_NAME *nm = NULL;
xmlSecAssert2(str, NULL);
@@ -1045,7 +1050,7 @@
}
while(len > 0) {
- /* skip spaces after comma or semicolon */
+ //skip spaces after comma or semicolon
while((len > 0) && isspace(*str)) {
++str; --len;
}
@@ -1077,7 +1082,7 @@
return(NULL);
}
- /* skip quote */
+ //skip quote
if((len <= 0) || ((*str) != '\"')) {
xmlSecError(XMLSEC_ERRORS_HERE,
NULL,
@@ -1090,7 +1095,7 @@
}
++str; --len;
- /* skip spaces before comma or semicolon */
+ //skip spaces before comma or semicolon
while((len > 0) && isspace(*str)) {
++str; --len;
}
@@ -1109,7 +1114,7 @@
}
type = MBSTRING_ASC;
} else if((*str) == '#') {
- /* Not implemented currently */
+ //Not implemented currently
xmlSecError(XMLSEC_ERRORS_HERE,
NULL,
NULL,
@@ -1144,11 +1149,12 @@
return(nm);
}
-
+*/
/**
* xmlSecSymbianCryptoX509NameStringRead:
*/
+ /*
static int
xmlSecSymbianCryptoX509NameStringRead(xmlSecByte **str, int *strLen,
xmlSecByte *res, int resLen,
@@ -1204,11 +1210,13 @@
(*str) = p;
return((ingoreTrailingSpaces) ? nonSpace - res + 1 : q - res);
}
+*/
+/*
static
int xmlSecSymbianCryptoX509_NAME_cmp(const X509_NAME *a, const X509_NAME *b) {
- int i,ret;
-/*
+
+
const X509_NAME_ENTRY *na,*nb;
xmlSecAssert2(a != NULL, -1);
@@ -1227,9 +1235,10 @@
return(ret);
}
}
-*/
+
return(0);
}
+*/
/**
@@ -1238,6 +1247,7 @@
* we have to sort X509_NAME entries to get correct results.
* This is ugly but SymbianCrypto does not support it
*/
+ /*
static int
xmlSecSymbianCryptoX509NamesCompare(X509_NAME *a, X509_NAME *b) {
X509_NAME *a1 = NULL;
@@ -1266,22 +1276,22 @@
return(1);
}
- /* sort both */
+ //sort both
sk_X509_NAME_ENTRY_set_cmp_func(a1->entries, xmlSecSymbianCryptoX509_NAME_ENTRY_cmp);
sk_X509_NAME_ENTRY_sort(a1->entries);
sk_X509_NAME_ENTRY_set_cmp_func(b1->entries, xmlSecSymbianCryptoX509_NAME_ENTRY_cmp);
sk_X509_NAME_ENTRY_sort(b1->entries);
- /* actually compare */
+ //actually compare
ret = xmlSecSymbianCryptoX509_NAME_cmp(a1, b1);
- /* cleanup */
+ //cleanup
X509_NAME_free(a1);
X509_NAME_free(b1);
#endif //XMLSEC_FUTURE_SUPPORT
return(ret);
}
-
+ */
/**
* xmlSecSymbianCryptoX509_NAME_ENTRY_cmp: