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

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

index 804291e27c32b9190dd68c99b8a60acfd64683c7..9f117d17331d3d60bae1ce4c017c960c17ba9c66 100644

--- a/openssl/ssl/s3_pkt.c

+++ b/openssl/ssl/s3_pkt.c

@@ -773,7 +773,12 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,

else

eivlen = 0;

}

- else

+ else if (s->aead_write_ctx != NULL &&

+ s->aead_write_ctx->variable_nonce_included_in_record)

+ {

+ eivlen = s->aead_write_ctx->variable_nonce_len;

+ }

+ else

eivlen = 0;

/* lets setup the record stuff. */

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