15.0: sync security with en-US rev98270:ce812b5b6ab1
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Wed, 27 Jun 2012 16:48:55 +0900
changeset 715 7b54aecb6246ffa81ab72a26b653d9c181a1dc7b
parent 714 8f3733188295ad283482a0c00118a284fa2135ae
child 716 98104350c2bb09d297ba31c5a9eb22f1aa911e1c
push id288
push useraxel@mozilla.com
push dateMon, 16 Jul 2012 20:06:14 +0000
bugs15
15.0: sync security with en-US rev98270:ce812b5b6ab1
security/manager/chrome/pipnss/nsserrors.properties
--- a/security/manager/chrome/pipnss/nsserrors.properties
+++ b/security/manager/chrome/pipnss/nsserrors.properties
@@ -1,20 +1,23 @@
 # (^^; εΎŒε›žγ—
 SSL_ERROR_EXPORT_ONLY_SERVER=Unable to communicate securely.  Peer does not support high-grade encryption.
 SSL_ERROR_US_ONLY_SERVER=Unable to communicate securely.  Peer requires high-grade encryption which is not supported.
 SSL_ERROR_NO_CYPHER_OVERLAP=Cannot communicate securely with peer: no common encryption algorithm(s).
 SSL_ERROR_NO_CERTIFICATE=Unable to find the certificate or key necessary for authentication.
 SSL_ERROR_BAD_CERTIFICATE=Unable to communicate securely with peer: peers's certificate was rejected.
+SSL_ERROR_UNUSED_5=Unrecognized SSL error code.
 SSL_ERROR_BAD_CLIENT=The server has encountered bad data from the client.
 SSL_ERROR_BAD_SERVER=The client has encountered bad data from the server.
 SSL_ERROR_UNSUPPORTED_CERTIFICATE_TYPE=Unsupported certificate type.
 SSL_ERROR_UNSUPPORTED_VERSION=Peer using unsupported version of security protocol.
+SSL_ERROR_UNUSED_10=Unrecognized SSL error code.
 SSL_ERROR_WRONG_CERTIFICATE=Client authentication failed: private key in key database does not match public key in certificate database.
 SSL_ERROR_BAD_CERT_DOMAIN=Unable to communicate securely with peer: requested domain name does not match the server's certificate.
+SSL_ERROR_POST_WARNING=Unrecognized SSL error code.
 SSL_ERROR_SSL2_DISABLED=Peer only supports SSL version 2, which is locally disabled.
 SSL_ERROR_BAD_MAC_READ=SSL received a record with an incorrect Message Authentication Code.
 SSL_ERROR_BAD_MAC_ALERT=SSL peer reports incorrect Message Authentication Code.
 SSL_ERROR_BAD_CERT_ALERT=SSL peer cannot verify your certificate.
 SSL_ERROR_REVOKED_CERT_ALERT=SSL peer rejected your certificate as revoked.
 SSL_ERROR_EXPIRED_CERT_ALERT=SSL peer rejected your certificate as expired.
 SSL_ERROR_SSL_DISABLED=Cannot connect: SSL is disabled.
 SSL_ERROR_FORTEZZA_PQG=Cannot connect: SSL peer is in another FORTEZZA domain.
@@ -100,23 +103,27 @@ SSL_ERROR_INTERNAL_ERROR_ALERT=Peer repo
 SSL_ERROR_USER_CANCELED_ALERT=Peer user canceled handshake.
 SSL_ERROR_NO_RENEGOTIATION_ALERT=Peer does not permit renegotiation of SSL security parameters.
 SSL_ERROR_SERVER_CACHE_NOT_CONFIGURED=SSL server cache not configured and not disabled for this socket.
 SSL_ERROR_UNSUPPORTED_EXTENSION_ALERT=SSL peer does not support requested TLS hello extension.
 SSL_ERROR_CERTIFICATE_UNOBTAINABLE_ALERT=SSL peer could not obtain your certificate from the supplied URL.
 SSL_ERROR_UNRECOGNIZED_NAME_ALERT=SSL peer has no certificate for the requested DNS name.
 SSL_ERROR_BAD_CERT_STATUS_RESPONSE_ALERT=SSL peer was unable to get an OCSP response for its certificate.
 SSL_ERROR_BAD_CERT_HASH_VALUE_ALERT=SSL peer reported bad certificate hash value.
-SSL_ERROR_RX_UNEXPECTED_NEW_SESSION_TICKET=SSL received an unexpected New Session Ticket handshake message.                             
-SSL_ERROR_RX_MALFORMED_NEW_SESSION_TICKET=SSL received a malformed New Session Ticket handshake message.                                
-SSL_ERROR_DECOMPRESSION_FAILURE=SSL received a compressed record that could not be decompressed.                                        
-SSL_ERROR_RENEGOTIATION_NOT_ALLOWED=Renegotiation is not allowed on this SSL socket.                                                    
+SSL_ERROR_RX_UNEXPECTED_NEW_SESSION_TICKET=SSL received an unexpected New Session Ticket handshake message.
+SSL_ERROR_RX_MALFORMED_NEW_SESSION_TICKET=SSL received a malformed New Session Ticket handshake message.
+SSL_ERROR_DECOMPRESSION_FAILURE=SSL received a compressed record that could not be decompressed.
+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.
 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.
@@ -273,14 +280,19 @@ SEC_ERROR_OCSP_BAD_SIGNATURE=OCSP respon
 SEC_ERROR_OUT_OF_SEARCH_LIMITS=Cert validation search is out of search limits
 SEC_ERROR_INVALID_POLICY_MAPPING=Policy mapping contains anypolicy
 SEC_ERROR_POLICY_VALIDATION_FAILED=Cert chain fails policy validation
 SEC_ERROR_UNKNOWN_AIA_LOCATION_TYPE=Unknown location type in cert AIA extension
 SEC_ERROR_BAD_HTTP_RESPONSE=Server returned bad HTTP response
 SEC_ERROR_BAD_LDAP_RESPONSE=Server returned bad LDAP response
 SEC_ERROR_FAILED_TO_ENCODE_DATA=Failed to encode data with ASN1 encoder
 SEC_ERROR_BAD_INFO_ACCESS_LOCATION=Bad information access location in cert extension
-SEC_ERROR_LIBPKIX_INTERNAL=Libpkix internal error occured during cert validation.
+SEC_ERROR_LIBPKIX_INTERNAL=Libpkix internal error occurred during cert validation.
 SEC_ERROR_PKCS11_GENERAL_ERROR=A PKCS #11 module returned CKR_GENERAL_ERROR, indicating that an unrecoverable error has occurred.
 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.