2.0.0

reswitched · Mar 29, 2017 · b7a4d2c · b7a4d2c
1 parent 05cc17c
commit b7a4d2c
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 138 deletions.
diff --git a/NSPR/NSPR_modified.txt b/NSPR/NSPR_modified.txt
diff --git a/NSPR/lib/ds/plarena.h b/NSPR/lib/ds/plarena.h
@@ -221,7 +221,7 @@ PR_IMPORT(void) __asan_unpoison_memory_region(void const volatile *addr, size_t
         if ((pool)->current == (a)) (pool)->current = &(pool)->first; \
         *(pnext) = (a)->next; \
         PL_CLEAR_ARENA(a); \
-        free(a); \
+        PR_Free(a); \
         (a) = 0; \
     PR_END_MACRO
 

diff --git a/NSPR/lib/libc/src/strdup.c b/NSPR/lib/libc/src/strdup.c
@@ -18,7 +18,7 @@ PL_strdup(const char *s)
 
     n = strlen(s) + 1;
 
-    rv = (char *)malloc(n);
+    rv = (char *)PR_MALLOC(n);
     if( (char *)0 == rv ) return rv;
 
     (void)memcpy(rv, s, n);
@@ -29,7 +29,7 @@ PL_strdup(const char *s)
 PR_IMPLEMENT(void)
 PL_strfree(char *s)
 {
-    free(s);
+    PR_Free(s);
 }
 
 PR_IMPLEMENT(char *)
@@ -43,7 +43,7 @@ PL_strndup(const char *s, PRUint32 max)
 
     l = PL_strnlen(s, max);
 
-    rv = (char *)malloc(l+1);
+    rv = (char *)PR_MALLOC(l+1);
     if( (char *)0 == rv ) return rv;
 
     (void)memcpy(rv, s, l);

diff --git a/NSS/NSS_modified.txt b/NSS/NSS_modified.txt
diff --git a/NSS/lib/libpkix/pkix_pl_nss/pki/pkix_pl_date.c b/NSS/lib/libpkix/pkix_pl_nss/pki/pkix_pl_date.c
@@ -433,7 +433,11 @@ PKIX_PL_Date_Create_CurrentOffBySeconds(
         PKIX_ENTER(DATE, "PKIX_PL_Date_Create_CurrentOffBySeconds");
         PKIX_NULLCHECK_ONE(pDate);
 
+#ifdef NN_NINTENDO_SDK
+        time = PR_Now() + ((PRTime)secondsOffset * 1000000);
+#else
         time = PR_Now() + PR_SecondsToInterval(secondsOffset);
+#endif    /*  NN_NINTENDO_SDK  */
         /* create a PKIX_PL_Date object */
         PKIX_CHECK(PKIX_PL_Object_Alloc
                     (PKIX_DATE_TYPE,

diff --git a/NSS/lib/libpkix/pkix_pl_nss/pki/pkix_pl_generalname.c b/NSS/lib/libpkix/pkix_pl_nss/pki/pkix_pl_generalname.c
@@ -222,6 +222,15 @@ pkix_pl_GeneralName_Create(
 
         nameType = nssAltName->type;
 
+        /* initialize fields */
+        genName->type = nameType;
+        genName->nssGeneralNameList = NULL;
+        genName->directoryName = NULL;
+        genName->OthName = NULL;
+        genName->other = NULL;
+        genName->oid = NULL;
+
+
         /*
          * We use CERT_CreateGeneralNameList to create just one CERTGeneralName
          * item for memory allocation reason. If we want to just create one
@@ -246,13 +255,6 @@ pkix_pl_GeneralName_Create(
 
         genName->nssGeneralNameList = nssGenNameList;
 
-        /* initialize fields */
-        genName->type = nameType;
-        genName->directoryName = NULL;
-        genName->OthName = NULL;
-        genName->other = NULL;
-        genName->oid = NULL;
-
         switch (nameType){
         case certOtherName: