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

Bug 1251009 - Remove unused nsICertificateDialogs.notifyCACertExists() method. r=keeler, r=mfinkle

Browse Source 
MozReview-Commit-ID: 5CFAsy5e1Cl

--HG--
extra : rebase_source : eed2fc5d3511c140dfe6046079347e9a881e2803
This commit is contained in:
Cykesiopka 2016-03-16 12:48:59 -07:00
parent a2634713e0
commit 1a9cf03eb1
5 changed files with 9 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mobile/android/components/NSSDialogService.js
View File

@ -92,11 +92,6 @@ NSSDialogs.prototype = {
}
},
notifyCACertExists: function(aCtx) {
let p = this.getPrompt(this.getString("caCertExists.title"), this.getString("caCertExists.message"));
this.showPrompt(p);
},
setPKCS12FilePassword: function(aCtx, aPassword) {
// this dialog is never shown in Fennec; in Desktop it is shown while backing up a personal
// certificate to a file via Preferences->Advanced->Encryption->View Certificates->Your Certificates

2
mobile/android/locales/en-US/chrome/pippki.properties
View File

@ -12,8 +12,6 @@ downloadCert.viewCert.label=View
downloadCert.trustSSL=Trust to identify websites.
downloadCert.trustEmail=Trust to identify email users.
downloadCert.trustObjSign=Trust to identify software developers.
caCertExists.title=Certificate Exists
caCertExists.message=The Certificate already exists.
pkcs12.getpassword.title=Password Entry Dialog
pkcs12.getpassword.message=Please enter the password that was used to encrypt this certificate backup.
clientAuthAsk.title=User Identification Request

4
security/manager/locales/en-US/chrome/pippki/pippki.properties
View File

@ -144,7 +144,3 @@ addExceptionCheckingShort=Checking Information
addExceptionCheckingLong2=Attempting to identify this site…
addExceptionNoCertShort=No Information Available
addExceptionNoCertLong2=Unable to obtain identification status for this site.
#Certificate Exists in database
caCertExistsTitle=Certificate Exists
caCertExistsMessage=The Certificate already exists.

35
security/manager/pki/nsNSSDialogs.cpp
View File

@ -158,36 +158,13 @@ nsNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx,
return rv;
}
NS_IMETHODIMP
nsNSSDialogs::NotifyCACertExists(nsIInterfaceRequestor *ctx)
{
nsresult rv;
nsCOMPtr<nsIPromptService> promptSvc(do_GetService(NS_PROMPTSERVICE_CONTRACTID));
if (!promptSvc)
return NS_ERROR_FAILURE;
// Get the parent window for the dialog
nsCOMPtr<mozIDOMWindowProxy> parent = do_GetInterface(ctx);
nsAutoString title;
rv = mPIPStringBundle->GetStringFromName(MOZ_UTF16("caCertExistsTitle"),
getter_Copies(title));
NS_ENSURE_SUCCESS(rv, rv);
nsAutoString msg;
rv = mPIPStringBundle->GetStringFromName(MOZ_UTF16("caCertExistsMessage"),
getter_Copies(msg));
NS_ENSURE_SUCCESS(rv, rv);
rv = promptSvc->Alert(parent, title.get(), msg.get());
return rv;
}
NS_IMETHODIMP
nsNSSDialogs::ChooseCertificate(nsIInterfaceRequestor *ctx, const char16_t *cn, const char16_t *organization, const char16_t *issuer, const char16_t **certNickList, const char16_t **certDetailsList, uint32_t count, int32_t *selectedIndex, bool *canceled)
nsNSSDialogs::ChooseCertificate(nsIInterfaceRequestor* ctx, const char16_t* cn,
const char16_t* organization,
const char16_t* issuer,
const char16_t** certNickList,
const char16_t** certDetailsList, uint32_t count,
int32_t* selectedIndex, bool* canceled)
{
nsresult rv;
uint32_t i;

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

@ -25,18 +25,9 @@ interface nsICertificateDialogs : nsISupports
*
* @return true if the user allows to import the certificate.
*/
boolean confirmDownloadCACert(in nsIInterfaceRequestor ctx,
in nsIX509Cert cert,
out unsigned long trust);
/**
* UI shown when a web site has delivered a CA certificate to
* be imported, but the certificate is already contained in the
* user's storage.
*
* @param ctx A user interface context.
*/
void notifyCACertExists(in nsIInterfaceRequestor ctx);
boolean confirmDownloadCACert(in nsIInterfaceRequestor ctx,
in nsIX509Cert cert,
out unsigned long trust);
/**
* UI shown when a user's personal certificate is going to be