Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Create a new function, CERT_DupCertList(), and call it instead of calling

Browse Source 
CERT_CertChainFromCert in ssl_DupSocket().  This is MUCH faster.  This is
the first approximation of the right fix.  The next step is to consider
doing ref counting instead of actual duplication.  Fixes bug 51425 .
This commit is contained in:
nelsonb%netscape.com 2000-09-09 06:08:46 +00:00
parent 9a22fb5ff1
commit d856a6e4f8
3 changed files with 56 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
security/nss/lib/certdb/cert.h
View File

@ -34,7 +34,7 @@
/*
* cert.h - public data structures and prototypes for the certificate library
*
* $Id: cert.h,v 1.2 2000/06/13 21:56:19 chrisk%netscape.com Exp $
* $Id: cert.h,v 1.3 2000/09/09 06:08:43 nelsonb%netscape.com Exp $
*/
#ifndef _CERT_H_
@ -905,6 +905,9 @@ CERT_CertChainFromCert(CERTCertificate *cert, SECCertUsage usage,
extern CERTCertificateList *
CERT_CertListFromCert(CERTCertificate *cert);
extern CERTCertificateList *
CERT_DupCertList(CERTCertificateList * oldList);
extern void CERT_DestroyCertificateList(CERTCertificateList *list);
/* is cert a newer than cert b? */

51
security/nss/lib/certhigh/certhigh.c
View File

@ -980,10 +980,10 @@ CERT_CertChainFromCert(CERTCertificate *cert, SECCertUsage usage,
node->cert = NULL;
if (rv < 0) goto loser;
}
if ( includeRoot ) {
chain->len = len;
} else {
if ( !includeRoot && len > 1) {
chain->len = len - 1;
} else {
chain->len = len;
}
chain->arena = arena;
@ -1013,6 +1013,9 @@ loser:
return NULL;
}
/* Builds a CERTCertificateList holding just one DER-encoded cert, namely
** the one for the cert passed as an argument.
*/
CERTCertificateList *
CERT_CertListFromCert(CERTCertificate *cert)
{
@ -1045,6 +1048,48 @@ loser:
return NULL;
}
CERTCertificateList *
CERT_DupCertList(CERTCertificateList * oldList)
{
CERTCertificateList *newList = NULL;
PRArenaPool *arena = NULL;
SECItem *newItem;
SECItem *oldItem;
int len = oldList->len;
int rv;
/* arena for SecCertificateList */
arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
if (arena == NULL)
goto no_memory;
/* now build the CERTCertificateList */
newList = PORT_ArenaNew(arena, CERTCertificateList);
if (newList == NULL)
goto no_memory;
newList->arena = arena;
newItem = (SECItem*)PORT_ArenaAlloc(arena, len * sizeof(SECItem));
if (newItem == NULL)
goto no_memory;
newList->certs = newItem;
newList->len = len;
for (oldItem = oldList->certs; len > 0; --len, ++newItem, ++oldItem) {
rv = SECITEM_CopyItem(arena, newItem, oldItem);
if (rv < 0)
goto loser;
}
return newList;
no_memory:
PORT_SetError(SEC_ERROR_NO_MEMORY);
loser:
if (arena != NULL) {
PORT_FreeArena(arena, PR_FALSE);
}
return NULL;
}
void
CERT_DestroyCertificateList(CERTCertificateList *list)
{

9
security/nss/lib/ssl/sslsock.c
View File

@ -34,7 +34,7 @@
* may use your version of this file under either the MPL or the
* GPL.
*
* $Id: sslsock.c,v 1.2 2000/05/24 03:35:23 nelsonb%netscape.com Exp $
* $Id: sslsock.c,v 1.3 2000/09/09 06:08:46 nelsonb%netscape.com Exp $
*/
#include "seccomon.h"
#include "cert.h"
@ -285,11 +285,10 @@ ssl_DupSocket(sslSocket *os)
int i;
for (i=kt_null; i < kt_kea_size; i++) {
if (os->serverCert[i]) {
if (os->serverCert[i] && os->serverCertChain[i]) {
ss->serverCert[i] = CERT_DupCertificate(os->serverCert[i]);
ss->serverCertChain[i] = CERT_CertChainFromCert
(ss->serverCert[i], certUsageSSLServer,
PR_TRUE);
ss->serverCertChain[i] = CERT_DupCertList(
os->serverCertChain[i]);
} else {
ss->serverCert[i] = NULL;
ss->serverCertChain[i] = NULL;