diff --git a/mozilla/security/nss/cmd/smimetools/cmsutil.c b/mozilla/security/nss/cmd/smimetools/cmsutil.c index eafdc60060c..6f5a5df1531 100644 --- a/mozilla/security/nss/cmd/smimetools/cmsutil.c +++ b/mozilla/security/nss/cmd/smimetools/cmsutil.c @@ -34,7 +34,7 @@ /* * cmsutil -- A command to work with CMS data * - * $Id: cmsutil.c,v 1.8 2000-10-05 01:39:35 mcgreer%netscape.com Exp $ + * $Id: cmsutil.c,v 1.9 2000-10-05 02:41:09 mcgreer%netscape.com Exp $ */ #include "nspr.h" @@ -47,7 +47,6 @@ #include "secoid.h" #include "cms.h" #include "smime.h" -#include "cmslocal.h" #if defined(XP_UNIX) #include @@ -525,7 +524,9 @@ enveloped_data(struct envelopeOptionsStr envelopeOptions) } /* XXX find the recipient's certs by email address or nickname */ if ((recipientcerts = - (CERTCertificate **)NSS_CMSArray_Alloc(tmppoolp, cnt+1)) == NULL) { + (CERTCertificate **)PORT_ArenaZAlloc(tmppoolp, + (cnt+1)*sizeof(CERTCertificate*))) + == NULL) { fprintf(stderr, "ERROR: out of memory.\n"); goto loser; } @@ -773,7 +774,9 @@ signed_data_certsonly(struct certsonlyOptionsStr certsonlyOptions) goto loser; } if ((certs = - (CERTCertificate **)NSS_CMSArray_Alloc(tmppoolp, cnt+1)) == NULL) { + (CERTCertificate **)PORT_ArenaZAlloc(tmppoolp, + (cnt+1)*sizeof(CERTCertificate*))) + == NULL) { fprintf(stderr, "ERROR: out of memory.\n"); goto loser; }