diff --git a/security/nss/lib/jar/jarevil.c b/security/nss/lib/jar/jarevil.c index cced82b7da87..7b2dbfebe2d8 100644 --- a/security/nss/lib/jar/jarevil.c +++ b/security/nss/lib/jar/jarevil.c @@ -342,7 +342,7 @@ PR_STATIC_CALLBACK(void) jar_moz_perm_fn (void *data) PORT_SetError (perm_data->error); - status = CERT_AddTempCertToPerm (perm_data->cert, perm_data->nickname, perm_data->trust); + status = __CERT_AddTempCertToPerm (perm_data->cert, perm_data->nickname, perm_data->trust); perm_data->status = status; perm_data->error = PORT_GetError(); diff --git a/security/nss/lib/jar/jarver.c b/security/nss/lib/jar/jarver.c index be974a1dd599..c2384284cbf2 100644 --- a/security/nss/lib/jar/jarver.c +++ b/security/nss/lib/jar/jarver.c @@ -1407,8 +1407,11 @@ char *JAR_cert_html if (cert == NULL || *result < 0) return NULL; - *result = 0; + *result = -1; + return NULL; + +#ifdef notdef html = CERT_HTMLCertInfo (cert, /* show images */ PR_TRUE, /*show issuer*/PR_TRUE); @@ -1416,6 +1419,7 @@ char *JAR_cert_html *result = -1; return html; +#endif } /*