diff --git a/mozilla/security/psm/lib/client/cmtcmn.h b/mozilla/security/psm/lib/client/cmtcmn.h
index dfde78b420e..b2eed64dd6b 100644
--- a/mozilla/security/psm/lib/client/cmtcmn.h
+++ b/mozilla/security/psm/lib/client/cmtcmn.h
@@ -120,7 +120,7 @@ typedef CMTStatus (*CMT_VERIFY_UNIX)(CMTSocket sock);
 /*
  * Use this function to send data across the socket
  */
-typedef size_t (*CMT_SEND)(CMTSocket sock, void* buffer, size_t length);
+typedef CMInt32 (*CMT_SEND)(CMTSocket sock, void* buffer, size_t length);
 
 /*
  * Use this function to select a socket. If poll is non-zero, then 
@@ -134,7 +134,7 @@ typedef CMTSocket (*CMT_SELECT)(CMTSocket *sock, int numSocks, int poll);
  * Use this function to receive data from a socket.  Function should
  * return number of bytes actually read. Return -1 in case of error.
  */
-typedef size_t (*CMT_RECEIVE)(CMTSocket sock, void *buffer, size_t bufSize);
+typedef CMInt32 (*CMT_RECEIVE)(CMTSocket sock, void *buffer, size_t bufSize);
 
 /*
  * Use this function to shutdown writing to the socket.
diff --git a/mozilla/security/psm/lib/client/cmtpkcs7.c b/mozilla/security/psm/lib/client/cmtpkcs7.c
index ff906aed394..9423dd3bb18 100644
--- a/mozilla/security/psm/lib/client/cmtpkcs7.c
+++ b/mozilla/security/psm/lib/client/cmtpkcs7.c
@@ -585,7 +585,7 @@ loser:
 CMTStatus CMT_PKCS7EncoderFinish(PCMT_CONTROL control, CMUint32 connectionID)
 {
     CMTP7Private *priv;
-    unsigned long nbytes;
+    CMInt32 nbytes;
     char buf[128];
     CMTSocket sock, ctrlsock, sockArr[2], selSock;