Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug# 114448, r=kaie, sr=hewitt removing the url type menu in crls

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@110237 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rangansen%netscape.com
2001-12-11 05:59:49 +00:00
parent ba0c0cbbea
commit a913ae1bbc
7 changed files with 13 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/security/manager/ssl/public/nsIX509CertDB.idl
View File

@@ -75,12 +75,9 @@ interface nsICrlEntry : nsISupports {
readonly attribute wstring nextUpdateLocale;
readonly attribute wstring nameInDb;
readonly attribute wstring lastFetchURL;
readonly attribute wstring advertisedURL;
const unsigned long TYPE_AUTOUPDATE_TIME_BASED = 1;
const unsigned long TYPE_AUTOUPDATE_FREQ_BASED = 2;
const unsigned long AUTOUPDATE_USE_LASTFETCH_URL = 1;
const unsigned long AUTOUPDATE_USE_ADVERTISED_URL = 2;
wstring ComputeNextAutoUpdateTime(in unsigned long autoUpdateType,
in double noOfDays);

24
mozilla/security/manager/ssl/src/nsNSSCertificate.cpp
View File

@@ -32,7 +32,7 @@
* may use your version of this file under either the MPL or the
* GPL.
*
* $Id: nsNSSCertificate.cpp,v 1.55 2001-12-06 22:36:43 rangansen%netscape.com Exp $
* $Id: nsNSSCertificate.cpp,v 1.56 2001-12-11 05:59:49 rangansen%netscape.com Exp $
*/
#include "prmem.h"
@@ -3775,24 +3775,20 @@ done:
PRUnichar *updateURL;
nsCAutoString updateURLStr;
PRInt32 timingTypePref;
PRInt32 urlTypePref;
double dayCnt;
char *dayCntStr;
nsCAutoString updateTypePrefStr(CRL_AUTOUPDATE_TIMIINGTYPE_PREF);
nsCAutoString updateTimePrefStr(CRL_AUTOUPDATE_TIME_PREF);
nsCAutoString updateUrlPrefStr(CRL_AUTOUPDATE_URL_PREF);
nsCAutoString updateUrlTypePrefStr(CRL_AUTOUPDATE_URLTYPE_PREF);
nsCAutoString updateDayCntPrefStr(CRL_AUTOUPDATE_DAYCNT_PREF);
nsCAutoString updateFreqCntPrefStr(CRL_AUTOUPDATE_FREQCNT_PREF);
updateTypePrefStr.AppendWithConversion(crlKey);
updateTimePrefStr.AppendWithConversion(crlKey);
updateUrlPrefStr.AppendWithConversion(crlKey);
updateUrlTypePrefStr.AppendWithConversion(crlKey);
updateDayCntPrefStr.AppendWithConversion(crlKey);
updateFreqCntPrefStr.AppendWithConversion(crlKey);
pref->GetIntPref(updateTypePrefStr.get(),&timingTypePref);
pref->GetIntPref(updateUrlTypePrefStr.get(),&urlTypePref);
//Compute and update the next download instant
if(timingTypePref == nsCrlEntry::TYPE_AUTOUPDATE_TIME_BASED){
@@ -3821,11 +3817,7 @@ done:
}
//Update the url to download from, next time
if(urlTypePref == nsCrlEntry::AUTOUPDATE_USE_LASTFETCH_URL){
crlEntry->GetLastFetchURL(&updateURL);
}else{
crlEntry->GetAdvertisedURL(&updateURL);
}
crlEntry->GetLastFetchURL(&updateURL);
updateURLStr.AssignWithConversion(updateURL);
nsMemory::Free(updateURL);
pref->SetCharPref(updateUrlPrefStr.get(),updateURLStr.get());
@@ -3871,7 +3863,7 @@ nsCrlEntry::nsCrlEntry()
nsCrlEntry::nsCrlEntry(const PRUnichar * aOrg, const PRUnichar * aOrgUnit,
const PRUnichar * aLastUpdateLocale, const PRUnichar * aNextUpdateLocale,
PRTime aLastUpdate, PRTime aNextUpdate, const PRUnichar *aNameInDb,
const PRUnichar *aLastFetchURL, const PRUnichar *aAdvertisedURL)
const PRUnichar *aLastFetchURL)
{
NS_INIT_ISUPPORTS();
mOrg.Assign(aOrg);
@@ -3882,8 +3874,6 @@ nsCrlEntry::nsCrlEntry(const PRUnichar * aOrg, const PRUnichar * aOrgUnit,
mNextUpdate = aNextUpdate;
mNameInDb.Assign(aNameInDb);
mLastFetchURL.Assign(aLastFetchURL);
mAdvertisedURL.Assign(aAdvertisedURL);
}
@@ -4005,14 +3995,6 @@ NS_IMETHODIMP nsCrlEntry::GetLastFetchURL(PRUnichar** aLastFetchURL)
return NS_OK;
}
NS_IMETHODIMP nsCrlEntry::GetAdvertisedURL(PRUnichar** aAdvertisedURL)
{
NS_ENSURE_ARG(aAdvertisedURL);
*aAdvertisedURL = ToNewUnicode(mAdvertisedURL);
return NS_OK;
}
NS_IMETHODIMP nsCrlEntry::ComputeNextAutoUpdateTime(PRUint32 autoUpdateType, double dayCnt, PRUnichar **nextAutoUpdate)
{

6
mozilla/security/manager/ssl/src/nsNSSCertificate.h
View File

@@ -86,13 +86,12 @@ private:
#define CRL_AUTOUPDATE_TIMIINGTYPE_PREF "security.crl.autoupdate.timingType"
#define CRL_AUTOUPDATE_TIME_PREF "security.crl.autoupdate.nextInstant"
#define CRL_AUTOUPDATE_URL_PREF "security.crl.autoupdate.url"
#define CRL_AUTOUPDATE_URLTYPE_PREF "security.crl.autoupdate.urlType"
#define CRL_AUTOUPDATE_DAYCNT_PREF "security.crl.autoupdate.dayCnt"
#define CRL_AUTOUPDATE_FREQCNT_PREF "security.crl.autoupdate.freqCnt"
#define CRL_AUTOUPDATE_ERRCNT_PREF "security.crl.autoupdate.errCount"
#define CRL_AUTOUPDATE_ERRDETAIL_PREF "security.crl.autoupdate.errDetail"
#define CRL_AUTOUPDATE_ENABLED_PREF "security.crl.autoupdate.enable."
#define CRL_AUTOUPDATE_DEFAULT_DELAY 120000UL
#define CRL_AUTOUPDATE_DEFAULT_DELAY 30000UL
class nsCrlEntry : public nsICrlEntry
{
@@ -102,7 +101,7 @@ public:
nsCrlEntry();
nsCrlEntry(CERTSignedCrl *);
nsCrlEntry(const PRUnichar*, const PRUnichar*, const PRUnichar*, const PRUnichar*, PRTime, PRTime, const PRUnichar*, const PRUnichar*, const PRUnichar*);
nsCrlEntry(const PRUnichar*, const PRUnichar*, const PRUnichar*, const PRUnichar*, PRTime, PRTime, const PRUnichar*, const PRUnichar*);
virtual ~nsCrlEntry();
/* additional members */
private:
@@ -114,7 +113,6 @@ private:
PRTime mNextUpdate;
nsString mNameInDb;
nsString mLastFetchURL;
nsString mAdvertisedURL;
nsString mNextAutoUpdateDate;
};