35.0: sync netwerk and security with en-US rev226051:c8866291dba2
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Wed, 19 Nov 2014 22:26:45 +0900
changeset 1604 95f6958a875fa8a87996e72df1f4ccdf4a835c26
parent 1603 1a8565f2616739ddb438f1a004b826c88c6965d8
child 1605 f3081fb0bdd8590cdceb17fb4bf3dfcbc3137c10
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs35
35.0: sync netwerk and security with en-US rev226051:c8866291dba2
netwerk/necko.properties
security/manager/chrome/pipnss/nsserrors.properties
--- a/netwerk/necko.properties
+++ b/netwerk/necko.properties
@@ -33,8 +33,10 @@ DirColSize		= サイズ
 DirColMTime		= 最終更新日時
 DirFileLabel		= ファイル: 
 
 # (^^; 表現イマイチだがすでに使われていないので無視
 PhishingAuth		= "%1$S" を訪れようとしています。このサイトはあなたが違うサイトを訪れていると思わせようとしている可能性があります。十分に注意してください。
 PhishingAuthAccept	= 理解し十分に注意を払います
 SuperfluousAuth		= サイト "%1$S" にユーザ名 "%2$S" でログインしようとしていますが、Web サイトは認証を必要としていません。このサイトはあなたをだまそうとしている可能性があります。\n\nサイト "%1$S" に接続しますか?
 AutomaticAuth		= サイト "%1$S" にユーザ名 "%2$S" でログインしようとしています。
+
+TrackingUriBlocked	= 追跡からの保護機能が有効なため、"%1$S" のリソースがブロックされました。
--- a/security/manager/chrome/pipnss/nsserrors.properties
+++ b/security/manager/chrome/pipnss/nsserrors.properties
@@ -118,16 +118,28 @@ SSL_ERROR_DECOMPRESSION_FAILURE=SSL rece
 SSL_ERROR_RENEGOTIATION_NOT_ALLOWED=Renegotiation is not allowed on this SSL socket.
 SSL_ERROR_UNSAFE_NEGOTIATION=Peer attempted old style (potentially vulnerable) handshake.
 SSL_ERROR_RX_UNEXPECTED_UNCOMPRESSED_RECORD=SSL received an unexpected uncompressed record.
 SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY=SSL received a weak ephemeral Diffie-Hellman key in Server Key Exchange handshake message.
 SSL_ERROR_NEXT_PROTOCOL_DATA_INVALID=SSL received invalid NPN extension data.
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SSL2=SSL feature not supported for SSL 2.0 connections.
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SERVERS=SSL feature not supported for servers.
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_CLIENTS=SSL feature not supported for clients.
+SSL_ERROR_INVALID_VERSION_RANGE=SSL version range is not valid.
+SSL_ERROR_CIPHER_DISALLOWED_FOR_VERSION=SSL peer selected a cipher suite disallowed for the selected protocol version.
+SSL_ERROR_RX_MALFORMED_HELLO_VERIFY_REQUEST=SSL received a malformed Hello Verify Request handshake message.
+SSL_ERROR_RX_UNEXPECTED_HELLO_VERIFY_REQUEST=SSL received an unexpected Hello Verify Request handshake message.
+SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_VERSION=SSL feature not supported for the protocol version.
+SSL_ERROR_RX_UNEXPECTED_CERT_STATUS=SSL received an unexpected Certificate Status handshake message.
+SSL_ERROR_UNSUPPORTED_HASH_ALGORITHM=Unsupported hash algorithm used by TLS peer.
+SSL_ERROR_DIGEST_FAILURE=Digest function failed.
+SSL_ERROR_INCORRECT_SIGNATURE_ALGORITHM=Incorrect signature algorithm specified in a digitally-signed element.
+SSL_ERROR_NEXT_PROTOCOL_NO_CALLBACK=The next protocol negotiation extension was enabled, but the callback was cleared prior to being needed.
+SSL_ERROR_NEXT_PROTOCOL_NO_PROTOCOL=The server supports no protocols that the client advertises in the ALPN extension.
+SSL_ERROR_INAPPROPRIATE_FALLBACK_ALERT=The server rejected the handshake because the client downgraded to a lower TLS version than the server supports.
 SEC_ERROR_IO=An I/O error occurred during security authorization.
 SEC_ERROR_LIBRARY_FAILURE=security library failure.
 SEC_ERROR_BAD_DATA=security library: received bad data.
 SEC_ERROR_OUTPUT_LEN=security library: output length error.
 SEC_ERROR_INPUT_LEN=security library has experienced an input length error.
 SEC_ERROR_INVALID_ARGS=security library: invalid arguments.
 SEC_ERROR_INVALID_ALGORITHM=security library: invalid algorithm.
 SEC_ERROR_INVALID_AVA=security library: invalid AVA.