openssl/ssl/s2_srvr.c - Issue 59083010: third_party/openssl: add ChaCha20+Poly1305 support.

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/s2_srvr.c

Issue 59083010: third_party/openssl: add ChaCha20+Poly1305 support. Base URL: https://chromium.googlesource.com/chromium/deps/openssl.git@master

Patch Set: Created 7 years, 1 month 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/s2_srvr.c

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

index 2cba426bb7efdef03b0407faa44145c012a9dee8..3b14faa3630497440a95e13ea7605faad3773ba6 100644

--- a/openssl/ssl/s2_srvr.c

+++ b/openssl/ssl/s2_srvr.c

@@ -452,7 +452,7 @@ static int get_client_master_key(SSL *s)

is_export=SSL_C_IS_EXPORT(s->session->cipher);

- if (!ssl_cipher_get_evp(s->session,&c,&md,NULL,NULL,NULL))

+ if (!ssl_cipher_get_evp(s->session,&c,&md,NULL,NULL))

{

ssl2_return_error(s,SSL2_PE_NO_CIPHER);

SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_PROBLEMS_MAPPING_CIPHER_FUNCTIONS);

« no previous file with comments | « openssl/ssl/s2_enc.c ('k') | openssl/ssl/s3_enc.c » ('j') | no next file with comments »