You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by sc...@apache.org on 2010/09/30 01:31:54 UTC
svn commit: r1002892 - /santuario/trunk/c/src/enc/NSS/NSSCryptoProvider.cpp
Author: scantor
Date: Wed Sep 29 23:31:53 2010
New Revision: 1002892
URL: http://svn.apache.org/viewvc?rev=1002892&view=rev
Log:
Fix Windows types in NSS code.
Modified:
santuario/trunk/c/src/enc/NSS/NSSCryptoProvider.cpp
Modified: santuario/trunk/c/src/enc/NSS/NSSCryptoProvider.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/NSS/NSSCryptoProvider.cpp?rev=1002892&r1=1002891&r2=1002892&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/NSS/NSSCryptoProvider.cpp (original)
+++ santuario/trunk/c/src/enc/NSS/NSSCryptoProvider.cpp Wed Sep 29 23:31:53 2010
@@ -330,11 +330,11 @@ XSECCryptoBase64 * NSSCryptoProvider::ba
SECItem * NSSCryptoProvider::b642SI(const char * b64, unsigned int b64Len) {
- SECItem * rv;
+ SECItem * rv;
- BYTE * os;
- XSECnew(os, BYTE[b64Len]);
- ArrayJanitor<BYTE> j_os(os);
+ unsigned char * os;
+ XSECnew(os, unsigned char[b64Len]);
+ ArrayJanitor<unsigned char> j_os(os);
// Decode
XSCryptCryptoBase64 b;
@@ -343,10 +343,9 @@ SECItem * NSSCryptoProvider::b642SI(cons
unsigned int retLen = b.decode((unsigned char *) b64, b64Len, os, b64Len);
retLen += b.decodeFinish(&os[retLen], b64Len - retLen);
- rv = SECITEM_AllocItem(NULL, NULL, retLen);
- rv->len = retLen;
-
- memcpy(rv->data, os, retLen);
+ rv = SECITEM_AllocItem(NULL, NULL, retLen);
+ rv->len = retLen;
+ memcpy(rv->data, os, retLen);
return rv;