Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 02:57:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix IRIX bustage caused by ^M in source

Browse Source
This commit is contained in:
ddrinan%netscape.com 2001-08-28 16:58:13 +00:00
parent e033294f45
commit d6fb9f77ff
8 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
security/manager/pki/resources/content/serverCrlNextupdate.js
View File

@ -36,22 +36,22 @@ function onLoad()
dialogParams = pkiParams.QueryInterface(nsIDialogParamBlock);
var isupport = pkiParams.getISupportAtIndex(1);
var cert = isupport.QueryInterface(nsIX509Cert);
var connectURL = dialogParams.GetString(1);
var gBundleBrand = srGetStrBundle("chrome://global/locale/brand.properties");
var brandName = gBundleBrand.GetStringFromName("brandShortName");
var connectURL = dialogParams.GetString(1);
var gBundleBrand = srGetStrBundle("chrome://global/locale/brand.properties");
var brandName = gBundleBrand.GetStringFromName("brandShortName");
bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
var message1 = bundle.formatStringFromName("crlNextUpdateMsg1",
[ brandName, connectURL ],
2);
var message2 = bundle.formatStringFromName("crlNextUpdateMsg2",
[ cert.issuerOrganization ],
1);
setText("message1", message1);
setText("message2", message2);
//Set the focus so key press events work.
bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
var message1 = bundle.formatStringFromName("crlNextUpdateMsg1",
[ brandName, connectURL ],
2);
var message2 = bundle.formatStringFromName("crlNextUpdateMsg2",
[ cert.issuerOrganization ],
1);
setText("message1", message1);
setText("message2", message2);
// Set the focus
document.getElementById('ok-button').focus();
}

6
security/manager/pki/resources/content/serverCrlNextupdate.xul
View File

@ -43,11 +43,11 @@
<vbox style="margin: 5px;" flex="100%">
<html id="message1" flex="100%"/>
<html id="message1" flex="100%"/>
<separator/>
<html id="message2" flex="100%"/>
<html id="message2" flex="100%"/>
<separator/>
<text value="&serverCrlNextupdate.message;" flex="100%"/>
<text value="&serverCrlNextupdate.message;" flex="100%"/>
<separator/>
<hbox>
<button id="ok-button" class="dialog" label="&ok.label;" primary="true"

2
security/manager/pki/resources/locale/en-US/pippki.dtd
View File

@ -97,7 +97,7 @@
<!ENTITY escrowWarn.benefit1 "The benefit is that if you lose access to your encryption private key, you can request a copy from this certificate authority.">
<!ENTITY escrowWarn.message2 "However, your encryption private key will be stored by the certificate authority, and could be used to read your encrypted email or documents without your permission.">
<!ENTITY serverCrlNextupdate.message "Please ask your system administrator for assistance">
<!ENTITY serverCrlNextupdate.message "Please ask your system administrator for assistance">
<!-- Strings for the CreateCertInfo dialog -->
<!ENTITY createCertInfo.title "Generating A Private Key">

8
security/manager/pki/resources/locale/en-US/pippki.properties
View File

@ -138,7 +138,7 @@ device.loaddlg.height=200
certmgr.verified=Verified
certmgr.verifiedNoOCSP=Verified (No OCSP)
# CRL next update.
crlNextUpdateMsg1=%S cannot establish an encrypted connection with "%S".
crlNextUpdateMsg2=The certificate revocation list (CRL) from "%S" needs to be updated.
# CRL next update.
crlNextUpdateMsg1=%S cannot establish an encrypted connection with "%S".
crlNextUpdateMsg2=The certificate revocation list (CRL) from "%S" needs to be updated.

12
security/manager/pki/src/nsNSSDialogs.cpp
View File

@ -419,18 +419,18 @@ nsNSSDialogs::CertExpired(nsITransportSecurityInfo *socketInfo,
}
NS_IMETHODIMP
nsNSSDialogs::CrlNextupdate(nsITransportSecurityInfo *socketInfo,
const PRUnichar * targetURL, nsIX509Cert *cert)
nsNSSDialogs::CrlNextupdate(nsITransportSecurityInfo *socketInfo,
const PRUnichar * targetURL, nsIX509Cert *cert)
{
nsresult rv;
nsCOMPtr<nsIPKIParamBlock> block = do_CreateInstance(kPKIParamBlockCID);
nsCOMPtr<nsIDialogParamBlock> dialogBlock = do_QueryInterface(block);
rv = dialogBlock->SetString(1, targetURL);
if (NS_FAILED(rv))
return rv;
rv = dialogBlock->SetString(1, targetURL);
if (NS_FAILED(rv))
return rv;
rv = block->SetISupportAtIndex(1, cert);
if (NS_FAILED(rv))
return rv;

4
security/manager/ssl/public/nsIBadCertListener.idl
View File

@ -54,8 +54,8 @@ interface nsIBadCertListener : nsISupports {
boolean certExpired(in nsITransportSecurityInfo socketInfo,
in nsIX509Cert cert);
void crlNextupdate(in nsITransportSecurityInfo socketInfo,
in wstring targetURL, in nsIX509Cert cert);
void crlNextupdate(in nsITransportSecurityInfo socketInfo,
in wstring targetURL, in nsIX509Cert cert);
};

10
security/manager/ssl/resources/locale/en-US/pipnss.properties
View File

@ -157,9 +157,9 @@ CertInfoValid=Valid
CertInfoFrom=from
CertInfoTo=to
CertInfoPurposes=Purposes
P12DefaultNickname=Imported Certificate
CrlImportSuccess=The browser successfully imported the certificate revocation list (CRL).
CrlImportFailure1=The browser cannot import the certificate revocation list (CRL).
CrlImportFailure2=A more recent version of this CRL is available.
CrlImportFailure3=Please ask your system administrator for assistance.
P12DefaultNickname=Imported Certificate
CrlImportSuccess=The browser successfully imported the certificate revocation list (CRL).
CrlImportFailure1=The browser cannot import the certificate revocation list (CRL).
CrlImportFailure2=A more recent version of this CRL is available.
CrlImportFailure3=Please ask your system administrator for assistance.

22
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.49 2001/08/28 16:43:04 ddrinan%netscape.com Exp $
* $Id: nsNSSCertificate.cpp,v 1.50 2001/08/28 16:45:55 ddrinan%netscape.com Exp $
*/
#include "prmem.h"
@ -3427,7 +3427,7 @@ nsNSSCertificateDB::getCertType(CERTCertificate *cert)
NS_IMETHODIMP
nsNSSCertificateDB::ImportCrl (char *aData, PRUint32 aLength, nsIURI * aURI, PRUint32 aType)
{
{
nsresult rv;
PRArenaPool *arena = NULL;
CERTCertificate *caCert;
@ -3437,15 +3437,15 @@ nsNSSCertificateDB::ImportCrl (char *aData, PRUint32 aLength, nsIURI * aURI, PRU
SECStatus sec_rv;
CERTSignedCrl *crl;
nsXPIDLCString url;
nsString message;
nsString temp;
nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService("@mozilla.org/embedcomp/window-watcher;1"));
nsCOMPtr<nsIPrompt> prompter;
if (wwatch)
wwatch->GetNewPrompter(0, getter_AddRefs(prompter));
nsCOMPtr<nsINSSComponent> nssComponent(do_GetService(kNSSComponentCID, &rv));
if (NS_FAILED(rv)) return rv;
nsString message;
nsString temp;
nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService("@mozilla.org/embedcomp/window-watcher;1"));
nsCOMPtr<nsIPrompt> prompter;
if (wwatch)
wwatch->GetNewPrompter(0, getter_AddRefs(prompter));
nsCOMPtr<nsINSSComponent> nssComponent(do_GetService(kNSSComponentCID, &rv));
if (NS_FAILED(rv)) return rv;
aURI->GetSpec(getter_Copies(url));
arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
if (!arena) {