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

bug 1241650 - remove nsIX509CertDB.findCertNicknames r=mgoodwin

Browse Source 
MozReview-Commit-ID: JtU7H5qGvge

--HG--
extra : rebase_source : fae856a160e5cc987702794f805030b2d1cc3533
This commit is contained in:
David Keeler 2016-01-21 15:14:31 -08:00
parent 0b5d5b3e24
commit 51a37ae665
3 changed files with 0 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
security/manager/ssl/nsIX509CertDB.idl
View File

@ -79,21 +79,6 @@ interface nsIX509CertDB : nsISupports {
*/
nsIX509Cert findCertByDBKey(in string aDBkey);
/**
* Obtain a list of certificate nicknames from the database.
* What the name is depends on type:
* user, ca, or server cert - the nickname
* email cert - the email address
*
* @param aType Type of certificate to obtain
* See certificate type constants in nsIX509Cert.
* @param count The number of nicknames in the returned array
* @param certNameList The returned array of certificate nicknames.
*/
void findCertNicknames(in unsigned long aType,
out unsigned long count,
[array, size_is(count)] out wstring certNameList);
/**
* Find user's own email encryption certificate by nickname.
*

96
security/manager/ssl/nsNSSCertificateDB.cpp
View File

@ -196,36 +196,6 @@ nsNSSCertificateDB::FindCertByDBKey(const char* aDBkey,nsIX509Cert** _cert)
return NS_OK;
}
NS_IMETHODIMP
nsNSSCertificateDB::FindCertNicknames(uint32_t aType,
uint32_t* _count,
char16_t*** _certNames)
{
nsNSSShutDownPreventionLock locker;
if (isAlreadyShutDown()) {
return NS_ERROR_NOT_AVAILABLE;
}
nsresult rv = NS_ERROR_FAILURE;
/*
* obtain the cert list from NSS
*/
ScopedCERTCertList certList(PK11_ListCerts(PK11CertListUnique, nullptr));
if (!certList)
goto cleanup;
/*
* get list of cert names from list of certs
* XXX also cull the list (NSS only distinguishes based on user/non-user
*/
getCertNames(certList.get(), aType, _count, _certNames, locker);
rv = NS_OK;
/*
* finish up
*/
cleanup:
return rv;
}
SECStatus
collect_certs(void *arg, SECItem **certs, int numcerts)
{
@ -1116,72 +1086,6 @@ nsNSSCertificateDB::ExportPKCS12File(nsISupports* aToken,
return blob.ExportToFile(aFile, certs, count);
}
/*
* NSS Helper Routines (private to nsNSSCertificateDB)
*/
#define DELIM '\001'
/*
* GetSortedNameList
*
* Converts a CERTCertList to a list of certificate names
*/
void
nsNSSCertificateDB::getCertNames(CERTCertList *certList,
uint32_t type,
uint32_t *_count,
char16_t ***_certNames,
const nsNSSShutDownPreventionLock &/*proofOfLock*/)
{
CERTCertListNode *node;
uint32_t numcerts = 0, i=0;
char16_t **tmpArray = nullptr;
MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("List of certs %d:\n", type));
for (node = CERT_LIST_HEAD(certList);
!CERT_LIST_END(node, certList);
node = CERT_LIST_NEXT(node)) {
if (getCertType(node->cert) == type) {
numcerts++;
}
}
MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("num certs: %d\n", numcerts));
int nc = (numcerts == 0) ? 1 : numcerts;
tmpArray = (char16_t **)moz_xmalloc(sizeof(char16_t *) * nc);
if (numcerts == 0) goto finish;
for (node = CERT_LIST_HEAD(certList);
!CERT_LIST_END(node, certList);
node = CERT_LIST_NEXT(node)) {
if (getCertType(node->cert) == type) {
RefPtr<nsNSSCertificate> pipCert(new nsNSSCertificate(node->cert));
nsAutoCString dbkey;
pipCert->GetDbKey(dbkey);
nsAutoString keystr = NS_ConvertASCIItoUTF16(dbkey);
char *namestr = nullptr;
if (type == nsIX509Cert::EMAIL_CERT) {
namestr = node->cert->emailAddr;
} else {
namestr = node->cert->nickname;
if (namestr) {
char *sc = strchr(namestr, ':');
if (sc) *sc = DELIM;
}
}
nsAutoString certname = NS_ConvertASCIItoUTF16(namestr ? namestr : "");
nsAutoString certstr;
certstr.Append(char16_t(DELIM));
certstr += certname;
certstr.Append(char16_t(DELIM));
certstr += keystr;
tmpArray[i++] = ToNewUnicode(certstr);
}
}
finish:
*_count = numcerts;
*_certNames = tmpArray;
}
NS_IMETHODIMP
nsNSSCertificateDB::FindEmailEncryptionCert(const nsAString& aNickname,
nsIX509Cert** _retval)

6
security/manager/ssl/nsNSSCertificateDB.h
View File

@ -47,12 +47,6 @@ private:
const char *stringID, nsIX509Cert *certToShow,
const nsNSSShutDownPreventionLock &proofOfLock);
void getCertNames(CERTCertList *certList,
uint32_t type,
uint32_t *_count,
char16_t ***_certNameList,
const nsNSSShutDownPreventionLock &proofOfLock);
CERTDERCerts *getCertsFromPackage(PLArenaPool *arena, uint8_t *data,
uint32_t length,
const nsNSSShutDownPreventionLock &proofOfLock);