openssl/ssl/s3_clnt.c - Issue 270103002: Revert of New tls channel id version for OpenSSL

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: openssl/ssl/s3_clnt.c

Issue 270103002: Revert of New tls channel id version for OpenSSL (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl

Patch Set: Created 6 years, 7 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: openssl/ssl/s3_clnt.c

diff --git a/openssl/ssl/s3_clnt.c b/openssl/ssl/s3_clnt.c

index 94fd9c8542897adb11bb1495c5ef3de82e1cece3..d1b3224b1b27876f0135c03f90d794f5ad39e312 100644

--- a/openssl/ssl/s3_clnt.c

+++ b/openssl/ssl/s3_clnt.c

@@ -583,18 +583,6 @@

#endif

s->s3->tmp.next_state=SSL3_ST_CR_FINISHED_A;

}

- if (s->s3->tlsext_channel_id_valid)

- {

- /* This is a non-resumption handshake. If it

- * involves ChannelID, then record the

- * handshake hashes at this point in the

- * session so that any resumption of this

- * session with ChannelID can sign those

- * hashes. */

- ret = tls1_record_handshake_hashes_for_channel_id(s);

- if (ret <= 0)

- goto end;

- }

}

s->init_num=0;

break;

« no previous file with comments | « openssl/patches/new_channelid.patch ('k') | openssl/ssl/ssl.h » ('j') | no next file with comments »