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

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

index 92e2cf3eb444f93d1b0d54d94b72673e8ff712d7..45a76ae70f60173799b4d1bedc76aa63a793bf39 100644

--- a/openssl/ssl/ssl_lib.c

+++ b/openssl/ssl/ssl_lib.c

@@ -2836,6 +2836,18 @@ void ssl_clear_cipher_ctx(SSL *s)

OPENSSL_free(s->enc_write_ctx);

s->enc_write_ctx=NULL;

}

+ if (s->aead_read_ctx != NULL)

+ {

+ EVP_AEAD_CTX_cleanup(&s->aead_read_ctx->ctx);

+ OPENSSL_free(s->aead_read_ctx);

+ s->aead_read_ctx = NULL;

+ }

+ if (s->aead_write_ctx != NULL)

+ {

+ EVP_AEAD_CTX_cleanup(&s->aead_write_ctx->ctx);

+ OPENSSL_free(s->aead_write_ctx);

+ s->aead_write_ctx = NULL;

+ }

#ifndef OPENSSL_NO_COMP

if (s->expand != NULL)

{

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