Bug 397296, Firefox builds need to use the current NSS CVS tag r=mconnor, blocking-firefox3=benjamin
authorkaie@kuix.de
Thu, 11 Oct 2007 12:03:05 -0700
changeset 6838 50eb6bd3f5357adefc66c27646314ac893448b44
parent 6837 35b8524bf77a0a991db0cd1ff5b6c1df508d55bb
child 6839 6299f979f4b606734361d5a5c875d371ae923e72
push idunknown
push userunknown
push dateunknown
reviewersmconnor
bugs397296
milestone1.9a9pre
Bug 397296, Firefox builds need to use the current NSS CVS tag r=mconnor, blocking-firefox3=benjamin
client.mk
security/manager/ssl/src/nsNSSIOLayer.cpp
--- a/client.mk
+++ b/client.mk
@@ -402,18 +402,18 @@ MODULES_all :=                          
   $(NULL)
 
 #######################################################################
 # Checkout Tags
 #
 # For branches, uncomment the MOZ_CO_TAG line with the proper tag,
 # and commit this file on that tag.
 #MOZ_CO_TAG          = <tag>
-NSPR_CO_TAG          = NSPR_HEAD_20070820
-NSS_CO_TAG           = NSS_3_12_ALPHA1B
+NSPR_CO_TAG          = NSPR_HEAD_20071009
+NSS_CO_TAG           = NSS_3_12_ALPHA_2
 LDAPCSDK_CO_TAG      = LDAPCSDK_6_0_3_CLIENT_BRANCH
 LOCALES_CO_TAG       =
 
 #######################################################################
 # Defines
 #
 CVS = cvs
 comma := ,
--- a/security/manager/ssl/src/nsNSSIOLayer.cpp
+++ b/security/manager/ssl/src/nsNSSIOLayer.cpp
@@ -1481,17 +1481,17 @@ nsSSLIOLayerNewSocket(PRInt32 family,
  * Note: copied in its entirety from Nova code
  */
 SECStatus nsConvertCANamesToStrings(PRArenaPool* arena, char** caNameStrings,
                                       CERTDistNames* caNames)
 {
     SECItem* dername;
     SECStatus rv;
     int headerlen;
-    uint32 contentlen;
+    PRUint32 contentlen;
     SECItem newitem;
     int n;
     char* namestring;
 
     for (n = 0; n < caNames->nnames; n++) {
         newitem.data = NULL;
         dername = &caNames->names[n];