santuario-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scan...@apache.org
Subject svn commit: r1002894 - /santuario/trunk/c/src/enc/NSS/NSSCryptoKeyRSA.cpp
Date Wed, 29 Sep 2010 23:38:19 GMT
Author: scantor
Date: Wed Sep 29 23:38:18 2010
New Revision: 1002894

URL: http://svn.apache.org/viewvc?rev=1002894&view=rev
Log:
Fix Windows types in NSS code.

Modified:
    santuario/trunk/c/src/enc/NSS/NSSCryptoKeyRSA.cpp

Modified: santuario/trunk/c/src/enc/NSS/NSSCryptoKeyRSA.cpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/enc/NSS/NSSCryptoKeyRSA.cpp?rev=1002894&r1=1002893&r2=1002894&view=diff
==============================================================================
--- santuario/trunk/c/src/enc/NSS/NSSCryptoKeyRSA.cpp (original)
+++ santuario/trunk/c/src/enc/NSS/NSSCryptoKeyRSA.cpp Wed Sep 29 23:38:18 2010
@@ -355,7 +355,7 @@ unsigned int NSSCryptoKeyRSA::signSHA1PK
 			"NSS:RSA - Error creating digest info");
 	}
 
-	res = SEC_ASN1EncodeItem(arena, &data, di, NSS_Get_sgn_DigestInfoTemplate(NULL, FALSE));
+	res = SEC_ASN1EncodeItem(arena, &data, di, NSS_Get_sgn_DigestInfoTemplate(NULL, 0));
 
 	if (!res) {
 		SGN_DestroyDigestInfo(di);
@@ -477,7 +477,7 @@ unsigned int NSSCryptoKeyRSA::privateDec
 
   }
 
-	DWORD decryptSize = inLength;
+	unsigned int decryptSize = inLength;
 
   SECStatus s;
   unsigned char *ptr = NULL;
@@ -500,8 +500,8 @@ unsigned int NSSCryptoKeyRSA::privateDec
 
 		}
 
-    //do the padding (http://www.w3.org/TR/xmlenc-core/#rsa-1_5)
-    ptr = (unsigned char*) memchr(plainBuf, 0x02, decryptSize);
+        //do the padding (http://www.w3.org/TR/xmlenc-core/#rsa-1_5)
+        ptr = (unsigned char*) memchr(plainBuf, 0x02, decryptSize);
 		if( ptr )
 		{
 			unsigned int bytesToRemove = ((ptr-plainBuf)+1);



Mime
View raw message