net/third_party/nss/ssl/ssl3con.c - Issue 18346010: net: support ALPN.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/third_party/nss/ssl/ssl3con.c

Issue 18346010: net: support ALPN. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove the new error. Created 7 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:

Index: net/third_party/nss/ssl/ssl3con.c

diff --git a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3con.c

index 00c83dbf10a4e17380700e06f2eae9fd613d5421..4916dfc4d6b5179e3488a0cfe7f0e1633c74a59a 100644

--- a/net/third_party/nss/ssl/ssl3con.c

+++ b/net/third_party/nss/ssl/ssl3con.c

@@ -9907,8 +9907,10 @@ ssl3_SendNextProto(sslSocket *ss)

int padding_len;

static const unsigned char padding[32] = {0};

- if (ss->ssl3.nextProto.len == 0)

+ if (ss->ssl3.nextProto.len == 0 ||

+ ss->ssl3.nextProtoState == SSL_NEXT_PROTO_SELECTED) {

return SECSuccess;

+ }

PORT_Assert( ss->opt.noLocks || ssl_HaveXmitBufLock(ss));

PORT_Assert( ss->opt.noLocks || ssl_HaveSSL3HandshakeLock(ss));