зеркало из https://github.com/mozilla/pjs.git
Bug 419523: Export Cert_NewTempCertificate. Remove unnecessary inclusions
of nssrenam.h. Remove functions that no longer need to be renamed from nssrenam.h. r=rrelyea. Modified Files: cmd/vfychain/vfychain.c lib/certdb/stanpcertdb.c lib/crmf/asn1cmn.c lib/crmf/cmmfrec.c lib/crmf/respcmn.c lib/nss/nss.def lib/nss/nssrenam.h lib/pkcs12/p12e.c lib/pkcs7/certread.c lib/pkcs7/p7decode.c lib/pkcs7/p7encode.c lib/smime/cmsutil.c lib/ssl/ssl3con.c lib/ssl/ssl3ecc.c lib/ssl/sslnonce.c lib/ssl/sslsnce.c
This commit is contained in:
wtc%google.com
Родитель
69901fcc30
Коммит
c22a94a02b
|
|
@ -50,7 +50,6 @@
|
|||
|
||||
#include "prerror.h"
|
||||
|
||||
#include "nssrenam.h"
|
||||
#include "pk11func.h"
|
||||
#include "seccomon.h"
|
||||
#include "secutil.h"
|
||||
|
|
|
|||
|
|
@ -361,8 +361,8 @@ CERT_AddTempCertToPerm(CERTCertificate *cert, char *nickname,
|
|||
}
|
||||
|
||||
CERTCertificate *
|
||||
__CERT_NewTempCertificate(CERTCertDBHandle *handle, SECItem *derCert,
|
||||
char *nickname, PRBool isperm, PRBool copyDER)
|
||||
CERT_NewTempCertificate(CERTCertDBHandle *handle, SECItem *derCert,
|
||||
char *nickname, PRBool isperm, PRBool copyDER)
|
||||
{
|
||||
NSSCertificate *c;
|
||||
CERTCertificate *cc;
|
||||
|
|
@ -480,12 +480,13 @@ loser:
|
|||
return NULL;
|
||||
}
|
||||
|
||||
/* This symbol is exported for backward compatibility. */
|
||||
CERTCertificate *
|
||||
CERT_NewTempCertificate(CERTCertDBHandle *handle, SECItem *derCert,
|
||||
char *nickname, PRBool isperm, PRBool copyDER)
|
||||
__CERT_NewTempCertificate(CERTCertDBHandle *handle, SECItem *derCert,
|
||||
char *nickname, PRBool isperm, PRBool copyDER)
|
||||
{
|
||||
return( __CERT_NewTempCertificate(handle, derCert, nickname,
|
||||
isperm, copyDER) );
|
||||
return CERT_NewTempCertificate(handle, derCert, nickname,
|
||||
isperm, copyDER);
|
||||
}
|
||||
|
||||
/* maybe all the wincx's should be some const for internal token login? */
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "nssrenam.h"
|
||||
#include "cmmf.h"
|
||||
#include "cmmfi.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@
|
|||
* CMMF
|
||||
*/
|
||||
|
||||
#include "nssrenam.h"
|
||||
#include "cmmf.h"
|
||||
#include "cmmfi.h"
|
||||
#include "secitem.h"
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "nssrenam.h"
|
||||
#include "cmmf.h"
|
||||
#include "cmmfi.h"
|
||||
#include "secitem.h"
|
||||
|
|
|
|||
|
|
@ -922,6 +922,7 @@ CERT_FindCRLEntryReasonExten;
|
|||
CERT_FindCRLNumberExten;
|
||||
CERT_FindNameConstraintsExten;
|
||||
CERT_GetValidDNSPatternsFromCert;
|
||||
CERT_NewTempCertificate;
|
||||
CERT_SetOCSPTimeout;
|
||||
CERT_PKIXVerifyCert;
|
||||
HASH_GetType;
|
||||
|
|
|
|||
|
|
@ -37,16 +37,11 @@
|
|||
#ifndef __nssrenam_h_
|
||||
#define __nssrenam_h_
|
||||
|
||||
#define CERT_NewTempCertificate __CERT_NewTempCertificate
|
||||
#define CERT_AddTempCertToPerm __CERT_AddTempCertToPerm
|
||||
#define PK11_CreateContextByRawKey __PK11_CreateContextByRawKey
|
||||
#define PK11_GetKeyData __PK11_GetKeyData
|
||||
#define CERT_ClosePermCertDB __CERT_ClosePermCertDB
|
||||
#define CERT_DecodeDERCertificate __CERT_DecodeDERCertificate
|
||||
#define CERT_TraversePermCertsForNickname __CERT_TraversePermCertsForNickname
|
||||
#define CERT_TraversePermCertsForSubject __CERT_TraversePermCertsForSubject
|
||||
#define PBE_CreateContext __PBE_CreateContext
|
||||
#define PBE_DestroyContext __PBE_DestroyContext
|
||||
#define PBE_GenerateBits __PBE_GenerateBits
|
||||
|
||||
#endif /* __nssrenam_h_ */
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "nssrenam.h"
|
||||
#include "p12t.h"
|
||||
#include "p12.h"
|
||||
#include "plarena.h"
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "nssrenam.h"
|
||||
#include "cert.h"
|
||||
#include "secpkcs7.h"
|
||||
#include "base64.h"
|
||||
|
|
|
|||
|
|
@ -38,11 +38,9 @@
|
|||
/*
|
||||
* PKCS7 decoding, verification.
|
||||
*
|
||||
* $Id: p7decode.c,v 1.24 2007-01-25 00:52:25 alexei.volkov.bugs%sun.com Exp $
|
||||
* $Id: p7decode.c,v 1.25 2008-03-10 00:01:26 wtc%google.com Exp $
|
||||
*/
|
||||
|
||||
#include "nssrenam.h"
|
||||
|
||||
#include "p7local.h"
|
||||
|
||||
#include "cert.h"
|
||||
|
|
|
|||
|
|
@ -38,11 +38,9 @@
|
|||
/*
|
||||
* PKCS7 encoding.
|
||||
*
|
||||
* $Id: p7encode.c,v 1.12 2006-02-08 06:14:19 rrelyea%redhat.com Exp $
|
||||
* $Id: p7encode.c,v 1.13 2008-03-10 00:01:26 wtc%google.com Exp $
|
||||
*/
|
||||
|
||||
#include "nssrenam.h"
|
||||
|
||||
#include "p7local.h"
|
||||
|
||||
#include "cert.h"
|
||||
|
|
|
|||
|
|
@ -38,11 +38,9 @@
|
|||
/*
|
||||
* CMS miscellaneous utility functions.
|
||||
*
|
||||
* $Id: cmsutil.c,v 1.14 2006-02-08 06:13:43 rrelyea%redhat.com Exp $
|
||||
* $Id: cmsutil.c,v 1.15 2008-03-10 00:01:27 wtc%google.com Exp $
|
||||
*/
|
||||
|
||||
#include "nssrenam.h"
|
||||
|
||||
#include "cmslocal.h"
|
||||
|
||||
#include "cert.h"
|
||||
|
|
|
|||
|
|
@ -39,9 +39,8 @@
|
|||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
/* $Id: ssl3con.c,v 1.110 2008-03-06 20:16:22 wtc%google.com Exp $ */
|
||||
/* $Id: ssl3con.c,v 1.111 2008-03-10 00:01:28 wtc%google.com Exp $ */
|
||||
|
||||
#include "nssrenam.h"
|
||||
#include "cert.h"
|
||||
#include "ssl.h"
|
||||
#include "cryptohi.h" /* for DSAU_ stuff */
|
||||
|
|
|
|||
|
|
@ -40,9 +40,8 @@
|
|||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
/* ECC code moved here from ssl3con.c */
|
||||
/* $Id: ssl3ecc.c,v 1.21 2008-03-06 20:16:22 wtc%google.com Exp $ */
|
||||
/* $Id: ssl3ecc.c,v 1.22 2008-03-10 00:01:28 wtc%google.com Exp $ */
|
||||
|
||||
#include "nssrenam.h"
|
||||
#include "nss.h"
|
||||
#include "cert.h"
|
||||
#include "ssl.h"
|
||||
|
|
|
|||
|
|
@ -36,9 +36,8 @@
|
|||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
/* $Id: sslnonce.c,v 1.24 2008-03-06 20:16:22 wtc%google.com Exp $ */
|
||||
/* $Id: sslnonce.c,v 1.25 2008-03-10 00:01:28 wtc%google.com Exp $ */
|
||||
|
||||
#include "nssrenam.h"
|
||||
#include "cert.h"
|
||||
#include "pk11pub.h"
|
||||
#include "secitem.h"
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
/* $Id: sslsnce.c,v 1.44 2008-03-06 20:16:22 wtc%google.com Exp $ */
|
||||
/* $Id: sslsnce.c,v 1.45 2008-03-10 00:01:28 wtc%google.com Exp $ */
|
||||
|
||||
/* Note: ssl_FreeSID() in sslnonce.c gets used for both client and server
|
||||
* cache sids!
|
||||
|
|
@ -73,7 +73,6 @@
|
|||
* PRBool ticketKeysValid;
|
||||
* } cacheMemCacheData;
|
||||
*/
|
||||
#include "nssrenam.h"
|
||||
#include "seccomon.h"
|
||||
|
||||
#if (defined(XP_UNIX) || defined(XP_WIN32) || defined (XP_OS2) || defined(XP_BEOS)) && !defined(_WIN32_WCE)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче