Attachment 651735 Details for Bug 782671 – Suggested changes to replace usage of nss private headers

[patch] Suggested changes to replace usage of nss private headers

mod_revocator-dont-include-nss-private-headers.patch (text/plain), 4.35 KB, created by Elio Maldonado Batiz on 2012-11-26 03:25:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2012-11-26 03:25:00 UTC

Size: 4.35 KB

patch

obsolete

>diff -up mod_revocator-1.0.3/pkcs11layer.h.noprivates mod_revocator-1.0.3/pkcs11layer.h
>--- mod_revocator-1.0.3/pkcs11layer.h.noprivates	2006-08-04 11:53:09.000000000 -0700
>+++ mod_revocator-1.0.3/pkcs11layer.h	2012-11-25 18:06:38.148463314 -0800
>@@ -51,19 +51,20 @@ extern "C"
> #include "nssckfw.h"
> 
> /*
>- * I'm including this for access to the arena functions.
>- * Looks like we should publish that API.
>+ * Including this for access to the arena functions.
>  */
>-#ifndef BASE_H
>-#include "base.h"
>-#endif /* BASE_H */
>+#ifndef NSSBASE_H
>+#include "nssbase.h"
>+#endif /*NSSBASE_H */
>+
>+#include "secport.h"
> 
> /*
>  * This is where the Netscape extensions live, at least for now.
>  */
>-#ifndef CKT_H
>-#include "ckt.h"
>-#endif /* CKT_H */
>+#ifndef _NSSCKT_H
>+#include "nssckt.h"
>+#endif /* _NSSCKT_H */
> 
> NSS_EXTERN_DATA const CK_VERSION   revocator_CryptokiVersion;
> NSS_EXTERN_DATA const NSSUTF8 *    revocator_ManufacturerID;
>diff -up mod_revocator-1.0.3/rfind.cpp.noprivates mod_revocator-1.0.3/rfind.cpp
>--- mod_revocator-1.0.3/rfind.cpp.noprivates	2006-10-16 11:16:35.000000000 -0700
>+++ mod_revocator-1.0.3/rfind.cpp	2012-11-25 18:08:11.016475765 -0800
>@@ -49,9 +49,9 @@ revocator_mdFindObjects_Final
>   struct revocatorFOStr *fo = (struct revocatorFOStr *)mdFindObjects->etc;
>   NSSArena *arena = fo->arena;
> 
>-  nss_ZFreeIf(fo->objs);
>-  nss_ZFreeIf(fo);
>-  nss_ZFreeIf(mdFindObjects);
>+  NSS_ZFreeIf(fo->objs);
>+  NSS_ZFreeIf(fo);
>+  NSS_ZFreeIf(mdFindObjects);
>   if ((NSSArena *)NULL != arena) {
>     NSSArena_Destroy(arena);
>   }
>@@ -109,13 +109,13 @@ revocator_FindObjectsInit
>     goto loser;
>   }
> 
>-  rv = nss_ZNEW(arena, NSSCKMDFindObjects);
>+  rv = NSS_ZNEW(arena, NSSCKMDFindObjects);
>   if( (NSSCKMDFindObjects *)NULL == rv ) {
>     *pError = CKR_HOST_MEMORY;
>     goto loser;
>   }
> 
>-  fo = nss_ZNEW(arena, struct revocatorFOStr);
>+  fo = NSS_ZNEW(arena, struct revocatorFOStr);
>   if( (struct revocatorFOStr *)NULL == fo ) {
>     *pError = CKR_HOST_MEMORY;
>     goto loser;
>@@ -130,7 +130,7 @@ revocator_FindObjectsInit
>   rv->null = (void *)NULL;
> 
>   PR_ASSERT(crlm);
>-  temp = nss_ZNEWARRAY((NSSArena *)NULL, CRLInstance*, 
>+  temp = NSS_ZNEWARRAY((NSSArena *)NULL, CRLInstance*, 
>                        crlm->getNumCrls());
>   if( (CRLInstance **)NULL == temp ) {
>     *pError = CKR_HOST_MEMORY;
>@@ -151,22 +151,22 @@ revocator_FindObjectsInit
>     }
>   }
> 
>-  fo->objs = nss_ZNEWARRAY(arena, CRLInstance *, fo->n);
>+  fo->objs = NSS_ZNEWARRAY(arena, CRLInstance *, fo->n);
>   if( (CRLInstance **)NULL == fo->objs ) {
>     *pError = CKR_HOST_MEMORY;
>     goto loser;
>   }
> 
>-  (void)nsslibc_memcpy(fo->objs, temp, sizeof(CRLInstance *) * fo->n);
>-  nss_ZFreeIf(temp);
>+  (void) PORT_Memcpy(fo->objs, temp, sizeof(CRLInstance *) * fo->n);
>+  NSS_ZFreeIf(temp);
>   temp = (CRLInstance **)NULL;
> 
>   return rv;
> 
>  loser:
>-  nss_ZFreeIf(temp);
>-  nss_ZFreeIf(fo);
>-  nss_ZFreeIf(rv);
>+  NSS_ZFreeIf(temp);
>+  NSS_ZFreeIf(fo);
>+  NSS_ZFreeIf(rv);
>   if ((NSSArena *)NULL != arena) {
>      NSSArena_Destroy(arena);
>   }
>diff -up mod_revocator-1.0.3/rinst.cpp.noprivates mod_revocator-1.0.3/rinst.cpp
>--- mod_revocator-1.0.3/rinst.cpp.noprivates	2006-08-04 11:53:09.000000000 -0700
>+++ mod_revocator-1.0.3/rinst.cpp	2012-11-25 18:06:38.151463315 -0800
>@@ -19,8 +19,7 @@
> #include "crlmanager.h"
> #include "revprivate.h"
> 
>-#include "ckfwtm.h"
>-#include "ckfw.h"
>+#include "nssckfw.h"
> #include "nssckfwt.h"
> #include "cert.h"
> 
>diff -up mod_revocator-1.0.3/robject.cpp.noprivates mod_revocator-1.0.3/robject.cpp
>--- mod_revocator-1.0.3/robject.cpp.noprivates	2006-10-16 11:16:35.000000000 -0700
>+++ mod_revocator-1.0.3/robject.cpp	2012-11-25 18:06:38.153463315 -0800
>@@ -561,7 +561,7 @@ revocator_attrmatch
>         return CK_FALSE;
>     }
> 
>-    prb = nsslibc_memequal(a->pValue, b->data, b->size, (PRStatus *)NULL);
>+    prb = (PORT_Memcmp(a->pValue, b->data, b->size) == 0);
> 
>     if( PR_TRUE == prb )
>     {
>diff -up mod_revocator-1.0.3/rsession.cpp.noprivates mod_revocator-1.0.3/rsession.cpp
>--- mod_revocator-1.0.3/rsession.cpp.noprivates	2006-08-04 11:53:09.000000000 -0700
>+++ mod_revocator-1.0.3/rsession.cpp	2012-11-25 18:06:38.154463315 -0800
>@@ -64,7 +64,7 @@ revocator_CreateSession
>     return (NSSCKMDSession *)NULL;
>   }
> 
>-  rv = nss_ZNEW(arena, NSSCKMDSession);
>+  rv = NSS_ZNEW(arena, NSSCKMDSession);
>   if( (NSSCKMDSession *)NULL == rv ) {
>     *pError = CKR_HOST_MEMORY;
>     return (NSSCKMDSession *)NULL;

Actions: View | Diff

Attachments on bug 782671: 651735 | 651736