net/third_party/nss/ssl/SSLerrs.h - Issue 10424013: Support TLS Channel IDs in NSS

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

Issue 10424013: Support TLS Channel IDs in NSS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Update patch file before committing. Created 8 years, 6 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 | Annotate | Revision Log

« no previous file with comments | « net/third_party/nss/patches/channelid.patch ('k') | net/third_party/nss/ssl/ssl.h » ('j') | no next file with comments »

OLD	NEW
1 /* *** BEGIN LICENSE BLOCK ***	1 /* *** BEGIN LICENSE BLOCK ***

2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1	2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1

3 *	3 *

4 * The contents of this file are subject to the Mozilla Public License Version	4 * The contents of this file are subject to the Mozilla Public License Version

5 * 1.1 (the "License"); you may not use this file except in compliance with	5 * 1.1 (the "License"); you may not use this file except in compliance with

6 * the License. You may obtain a copy of the License at	6 * the License. You may obtain a copy of the License at

7 * http://www.mozilla.org/MPL/	7 * http://www.mozilla.org/MPL/

8 *	8 *

9 * Software distributed under the License is distributed on an "AS IS" basis,	9 * Software distributed under the License is distributed on an "AS IS" basis,

10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License	10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

(...skipping 411 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
422 "SSL version range is not valid.")	422 "SSL version range is not valid.")

423	423

424 ER3(SSL_ERROR_RX_UNEXPECTED_CERT_STATUS, (SSL_ERROR_BASE + 121),	424 ER3(SSL_ERROR_RX_UNEXPECTED_CERT_STATUS, (SSL_ERROR_BASE + 121),

425 "SSL received an unexpected Certificate Status handshake message.")	425 "SSL received an unexpected Certificate Status handshake message.")

426	426

427 ER3(SSL_ERROR_RX_MALFORMED_HELLO_VERIFY_REQUEST, (SSL_ERROR_BASE + 122),	427 ER3(SSL_ERROR_RX_MALFORMED_HELLO_VERIFY_REQUEST, (SSL_ERROR_BASE + 122),

428 "SSL received a malformed Hello Verify Request handshake message.")	428 "SSL received a malformed Hello Verify Request handshake message.")

429	429

430 ER3(SSL_ERROR_RX_UNEXPECTED_HELLO_VERIFY_REQUEST, (SSL_ERROR_BASE + 123),	430 ER3(SSL_ERROR_RX_UNEXPECTED_HELLO_VERIFY_REQUEST, (SSL_ERROR_BASE + 123),

431 "SSL received an unexpected Hello Verify Request handshake message.")	431 "SSL received an unexpected Hello Verify Request handshake message.")

	432

	433 ER3(SSL_ERROR_BAD_CHANNEL_ID_DATA, (SSL_ERROR_BASE + 124),

	434 "SSL received a malformed TLS Channel ID extension.")

	435

	436 ER3(SSL_ERROR_INVALID_CHANNEL_ID_KEY, (SSL_ERROR_BASE + 125),

	437 "An invalid TLS Channel ID key was returned by the callback.")
	wtc 2012/05/31 18:19:53 Nit: it's not clear what "callback" means. How ab Nit: it's not clear what "callback" means. How about "The application provided an invalid TLS Channel ID key." or "The TLS Channel ID key was invalid." agl 2012/05/31 19:48:24 Done. Show quoted text On 2012/05/31 18:19:53, wtc wrote: > > Nit: it's not clear what "callback" means. How about > "The application provided an invalid TLS Channel ID key." or > "The TLS Channel ID key was invalid." Done.
	438

	439 ER3(SSL_ERROR_GET_CHANNEL_ID_FAILED, (SSL_ERROR_BASE + 126),

	440 "The callback set by SSL_SetClientChannelIDCallback failed.")
	wtc 2012/05/31 18:19:53 Nit: this error message seems to expose too much i Nit: this error message seems to expose too much implementation detail. (Some applications simply display these error messages to their users.) How about "The application could not get a TLS Channel ID." or "The application could not provide a TLS Channel ID."? An alternative design is to require the callback to call PORT_SetError() to set an NSPR/NSS error code, and NSS just reports that error. agl 2012/05/31 19:48:24 Done. Show quoted text On 2012/05/31 18:19:53, wtc wrote: > > Nit: this error message seems to expose too much implementation > detail. (Some applications simply display these error > messages to their users.) > > How about "The application could not get a TLS Channel ID." > or "The application could not provide a TLS Channel ID."? > > An alternative design is to require the callback to call > PORT_SetError() to set an NSPR/NSS error code, and NSS > just reports that error. Done.
OLD	NEW