Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(95)

Side by Side Diff: net/third_party/nss/ssl/SSLerrs.h

Issue 595823003: Merge the server-side support of ALPN from the NSS upstream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove a comment that wasn't useful. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/third_party/nss/patches/applypatches.sh ('k') | net/third_party/nss/ssl/ssl3ext.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* This Source Code Form is subject to the terms of the Mozilla Public 1 /* This Source Code Form is subject to the terms of the Mozilla Public
2 * License, v. 2.0. If a copy of the MPL was not distributed with this 2 * License, v. 2.0. If a copy of the MPL was not distributed with this
3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4 4
5 /* SSL-specific security error codes */ 5 /* SSL-specific security error codes */
6 /* caller must include "sslerr.h" */ 6 /* caller must include "sslerr.h" */
7 7
8 ER3(SSL_ERROR_EXPORT_ONLY_SERVER, SSL_ERROR_BASE + 0, 8 ER3(SSL_ERROR_EXPORT_ONLY_SERVER, SSL_ERROR_BASE + 0,
9 "Unable to communicate securely. Peer does not support high-grade encryption.") 9 "Unable to communicate securely. Peer does not support high-grade encryption.")
10 10
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 406
407 ER3(SSL_ERROR_UNSUPPORTED_HASH_ALGORITHM, (SSL_ERROR_BASE + 126), 407 ER3(SSL_ERROR_UNSUPPORTED_HASH_ALGORITHM, (SSL_ERROR_BASE + 126),
408 "Unsupported hash algorithm used by TLS peer.") 408 "Unsupported hash algorithm used by TLS peer.")
409 409
410 ER3(SSL_ERROR_DIGEST_FAILURE, (SSL_ERROR_BASE + 127), 410 ER3(SSL_ERROR_DIGEST_FAILURE, (SSL_ERROR_BASE + 127),
411 "Digest function failed.") 411 "Digest function failed.")
412 412
413 ER3(SSL_ERROR_INCORRECT_SIGNATURE_ALGORITHM, (SSL_ERROR_BASE + 128), 413 ER3(SSL_ERROR_INCORRECT_SIGNATURE_ALGORITHM, (SSL_ERROR_BASE + 128),
414 "Incorrect signature algorithm specified in a digitally-signed element.") 414 "Incorrect signature algorithm specified in a digitally-signed element.")
415 415
416 ER3(SSL_ERROR_BAD_CHANNEL_ID_DATA, (SSL_ERROR_BASE + 129), 416 ER3(SSL_ERROR_NEXT_PROTOCOL_NO_CALLBACK, (SSL_ERROR_BASE + 129),
417 "SSL received a malformed TLS Channel ID extension.") 417 "The next protocol negotiation extension was enabled, but the callback was clear ed prior to being needed.")
418 418
419 ER3(SSL_ERROR_INVALID_CHANNEL_ID_KEY, (SSL_ERROR_BASE + 130), 419 ER3(SSL_ERROR_NEXT_PROTOCOL_NO_PROTOCOL, (SSL_ERROR_BASE + 130),
420 "The application provided an invalid TLS Channel ID key.") 420 "The server supports no protocols that the client advertises in the ALPN extensi on.")
421 421
422 ER3(SSL_ERROR_GET_CHANNEL_ID_FAILED, (SSL_ERROR_BASE + 131), 422 ER3(SSL_ERROR_INAPPROPRIATE_FALLBACK_ALERT, (SSL_ERROR_BASE + 131),
423 "The application could not get a TLS Channel ID.")
424
425 ER3(SSL_ERROR_INAPPROPRIATE_FALLBACK_ALERT, (SSL_ERROR_BASE + 132),
426 "The connection was using a lesser TLS version as a result of a previous" 423 "The connection was using a lesser TLS version as a result of a previous"
427 " handshake failure, but the server indicated that it should not have been" 424 " handshake failure, but the server indicated that it should not have been"
428 " needed.") 425 " needed.")
426
427 ER3(SSL_ERROR_BAD_CHANNEL_ID_DATA, (SSL_ERROR_BASE + 132),
428 "SSL received a malformed TLS Channel ID extension.")
429
430 ER3(SSL_ERROR_INVALID_CHANNEL_ID_KEY, (SSL_ERROR_BASE + 133),
431 "The application provided an invalid TLS Channel ID key.")
432
433 ER3(SSL_ERROR_GET_CHANNEL_ID_FAILED, (SSL_ERROR_BASE + 134),
434 "The application could not get a TLS Channel ID.")
OLDNEW
« no previous file with comments | « net/third_party/nss/patches/applypatches.sh ('k') | net/third_party/nss/ssl/ssl3ext.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698