diff options
author | jsing <> | 2022-08-21 19:39:44 +0000 |
---|---|---|
committer | jsing <> | 2022-08-21 19:39:44 +0000 |
commit | 7fe8799b48e0b5267eb3138fe5229520af2a9519 (patch) | |
tree | dd5f0acd7e713e5bbeb81e92110d0ff96c5443c0 /src/lib/libssl/s3_lib.c | |
parent | 3c351e711595523526ff652c526430c9865244a9 (diff) | |
download | openbsd-7fe8799b48e0b5267eb3138fe5229520af2a9519.tar.gz openbsd-7fe8799b48e0b5267eb3138fe5229520af2a9519.tar.bz2 openbsd-7fe8799b48e0b5267eb3138fe5229520af2a9519.zip |
Wire up SSL_QUIC_METHOD callbacks to the record layer callbacks for QUIC.
ok tb@
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
-rw-r--r-- | src/lib/libssl/s3_lib.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index e93298c2db..989165b207 100644 --- a/src/lib/libssl/s3_lib.c +++ b/src/lib/libssl/s3_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_lib.c,v 1.237 2022/08/17 18:51:47 tb Exp $ */ | 1 | /* $OpenBSD: s3_lib.c,v 1.238 2022/08/21 19:39:44 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1569,6 +1569,8 @@ ssl3_free(SSL *s) | |||
1569 | freezero(s->s3->hs.tls13.cookie, s->s3->hs.tls13.cookie_len); | 1569 | freezero(s->s3->hs.tls13.cookie, s->s3->hs.tls13.cookie_len); |
1570 | tls13_clienthello_hash_clear(&s->s3->hs.tls13); | 1570 | tls13_clienthello_hash_clear(&s->s3->hs.tls13); |
1571 | 1571 | ||
1572 | tls_buffer_free(s->s3->hs.tls13.quic_read_buffer); | ||
1573 | |||
1572 | sk_X509_NAME_pop_free(s->s3->hs.tls12.ca_names, X509_NAME_free); | 1574 | sk_X509_NAME_pop_free(s->s3->hs.tls12.ca_names, X509_NAME_free); |
1573 | sk_X509_pop_free(s->internal->verified_chain, X509_free); | 1575 | sk_X509_pop_free(s->internal->verified_chain, X509_free); |
1574 | 1576 | ||
@@ -1615,6 +1617,11 @@ ssl3_clear(SSL *s) | |||
1615 | s->s3->hs.tls13.cookie_len = 0; | 1617 | s->s3->hs.tls13.cookie_len = 0; |
1616 | tls13_clienthello_hash_clear(&s->s3->hs.tls13); | 1618 | tls13_clienthello_hash_clear(&s->s3->hs.tls13); |
1617 | 1619 | ||
1620 | tls_buffer_free(s->s3->hs.tls13.quic_read_buffer); | ||
1621 | s->s3->hs.tls13.quic_read_buffer = NULL; | ||
1622 | s->s3->hs.tls13.quic_read_level = ssl_encryption_initial; | ||
1623 | s->s3->hs.tls13.quic_write_level = ssl_encryption_initial; | ||
1624 | |||
1618 | s->s3->hs.extensions_seen = 0; | 1625 | s->s3->hs.extensions_seen = 0; |
1619 | 1626 | ||
1620 | rp = s->s3->rbuf.buf; | 1627 | rp = s->s3->rbuf.buf; |