34.0: sync security with en-US rev218024:285ff4f57e70
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Thu, 09 Oct 2014 23:26:19 +0900
changeset 1554 623d8e4438fbb8253c9e4f992d2aec991efa25f3
parent 1553 7c75a6a4463e9ecfbb97725508da8977065a5ef0
child 1555 a6658f370853249bda60106947d3290e7b42c085
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs34
34.0: sync security with en-US rev218024:285ff4f57e70
security/manager/chrome/pipnss/nsserrors.properties
security/manager/chrome/pippki/pippki.dtd
security/manager/chrome/pippki/pippki.properties
--- a/security/manager/chrome/pipnss/nsserrors.properties
+++ b/security/manager/chrome/pipnss/nsserrors.properties
@@ -294,9 +294,12 @@ SEC_ERROR_PKCS11_GENERAL_ERROR=A PKCS #1
 SEC_ERROR_PKCS11_FUNCTION_FAILED=A PKCS #11 module returned CKR_FUNCTION_FAILED, indicating that the requested function could not be performed.  Trying the same operation again might succeed.
 SEC_ERROR_PKCS11_DEVICE_ERROR=A PKCS #11 module returned CKR_DEVICE_ERROR, indicating that a problem has occurred with the token or slot.
 SEC_ERROR_BAD_INFO_ACCESS_METHOD=Unknown information access method in certificate extension.
 SEC_ERROR_CRL_IMPORT_FAILED=Error attempting to import a CRL.
 SEC_ERROR_EXPIRED_PASSWORD=The password expired.
 SEC_ERROR_LOCKED_PASSWORD=The password is locked.
 SEC_ERROR_UNKNOWN_PKCS11_ERROR=Unknown PKCS #11 error.
 SEC_ERROR_BAD_CRL_DP_URL=Invalid or unsupported URL in CRL distribution point name.
-SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED=The certificate was signed using an signature algorithm that is disabled because it is not secure.
+SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED=The certificate was signed using a signature algorithm that is disabled because it is not secure.
+MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE=The server uses key pinning (HPKP) but no trusted certificate chain could be constructed that matches the pinset. Key pinning violations cannot be overridden.
+MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY=The server uses a certificate with a basic constraints extension identifying it as a certificate authority. For a properly-issued certificate, this should not be the case.
+MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE=The server presented a certificate with a key size that is too small to establish a secure connection.
--- a/security/manager/chrome/pippki/pippki.dtd
+++ b/security/manager/chrome/pippki/pippki.dtd
@@ -76,17 +76,12 @@
 <!ENTITY examineCert.label			"証明書を表示">
 <!ENTITY examineCert.accesskey			"V">
 
 <!-- Strings for the CreateCertInfo dialog  -->
 <!ENTITY createCertInfo.title			"秘密鍵を生成しています">
 <!ENTITY createCertInfo.msg1			"鍵を生成しています... これには数分かかることがあります...">
 <!ENTITY createCertInfo.msg2			"しばらくお待ちください...">
 
-<!-- Form Signing confirmation prompt -->
-<!ENTITY formSigning.title			"テキストの署名要求">
-<!ENTITY formSigning.cert			"署名に使用する証明書">
-<!ENTITY formSigning.confirmPassword		"選択した証明書を使用して、このテキストメッセージに署名してもよろしければ、マスターパスワードを入力してください:">
-
 <!-- Strings for protectedAuth dialog -->
 <!ENTITY protectedAuth.title			"保護されたトークン認証">
 <!ENTITY protectedAuth.msg			"トークンの認証を行ってください。認証方法は使用するトークンの種類によって異なります。"><!-- (^^; -->
 <!ENTITY protectedAuth.tokenName.label		"トークン:">
--- a/security/manager/chrome/pippki/pippki.properties
+++ b/security/manager/chrome/pippki/pippki.properties
@@ -128,19 +128,16 @@ resetPasswordConfirmationTitle	= マスターパスワードのリセット
 resetPasswordConfirmationMessage= パスワードはリセットされました。
 
 #Import certificate(s) file dialog
 importEmailCertPrompt		= メール証明書を含むファイルを選択してください
 importCACertsPrompt		= 認証局証明書を含むファイルを選択してください
 importServerCertPrompt		= サーバ証明書を含むファイルを選択してください
 file_browse_Certificate_spec	= 証明書ファイル
 
-# Form Signing confirmation prompt
-formSigningIntro		= サイト '%S' が次のテキストメッセージに署名するよう求めています:
-
 # Cert export
 SaveCertAs			= 証明書をファイルに保存
 CertFormatBase64		= X.509 証明書 (PEM)
 CertFormatBase64Chain		= 証明書パスを含む X.509 証明書 (PEM)
 CertFormatDER			= X.509 証明書 (DER)
 CertFormatPKCS7			= X.509 証明書 (PKCS#7)
 CertFormatPKCS7Chain		= 証明書パスを含む X.509 証明書 (PKCS#7)
 writeFileFailure		= ファイルエラー