openssl/ssl
Neil Horman 473e6bcb2c Fixup conflict between 3rd party quic-tls api and quic-server
Build.info changes between quic-server and master occured here, resolve
them.  Can't do it as a fixup as the conficting changes have already
been merged to master

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26762)
2025-02-17 11:27:34 -05:00
..
quic Fixup conflict between 3rd party quic-tls api and quic-server 2025-02-17 11:27:34 -05:00
record libssl: Move SSL object unwrapping macros to separate header 2025-02-17 11:27:32 -05:00
rio SSL_poll(): Handle blocking with no poll items 2025-02-17 11:27:33 -05:00
statem libssl: Move SSL object unwrapping macros to separate header 2025-02-17 11:27:32 -05:00
bio_ssl.c libssl: Move SSL object unwrapping macros to separate header 2025-02-17 11:27:32 -05:00
build.info de-duplicate fnv1a_hash 2025-02-17 11:27:34 -05:00
d1_lib.c libssl: Move SSL object unwrapping macros to separate header 2025-02-17 11:27:32 -05:00
d1_msg.c libssl: Move SSL object unwrapping macros to separate header 2025-02-17 11:27:32 -05:00
d1_srtp.c libssl: Move SSL object unwrapping macros to separate header 2025-02-17 11:27:32 -05:00
methods.c Update some inclusions of <openssl/macros.h> 2019-11-07 11:37:25 +01:00
pqueue.c Stop raising ERR_R_MALLOC_FAILURE in most places 2022-10-05 14:02:03 +02:00
priority_queue.c Copyright year updates 2024-09-05 09:35:49 +02:00
s3_enc.c libssl: Move SSL object unwrapping macros to separate header 2025-02-17 11:27:32 -05:00
s3_lib.c libssl: Move SSL object unwrapping macros to separate header 2025-02-17 11:27:32 -05:00
s3_msg.c libssl: Move SSL object unwrapping macros to separate header 2025-02-17 11:27:32 -05:00
ssl_asn1.c RFC7250 (RPK) support 2023-03-28 13:49:54 -04:00
ssl_cert.c libssl: Move SSL object unwrapping macros to separate header 2025-02-17 11:27:32 -05:00
ssl_cert_comp.c Minor fixes 2025-02-17 11:27:32 -05:00
ssl_cert_table.h Make ssl_cert_info read-only 2023-11-27 07:51:33 +00:00
ssl_ciph.c libssl: Move SSL object unwrapping macros to separate header 2025-02-17 11:27:32 -05:00
ssl_conf.c libssl: Move SSL object unwrapping macros to separate header 2025-02-17 11:27:32 -05:00
ssl_err.c make update 2025-02-17 11:27:32 -05:00
ssl_err_legacy.c Update copyright year 2021-06-17 13:24:59 +01:00
ssl_init.c Ensure WSAStartup() before calling WSASocketA() 2025-02-17 11:27:33 -05:00
ssl_lib.c Remove NEW_TOKEN public api 2025-02-17 11:27:33 -05:00
ssl_local.h Remove SSL_TOKEN_STORE_HANDLE type 2025-02-17 11:27:33 -05:00
ssl_mcnf.c Copyright year updates 2024-09-05 09:35:49 +02:00
ssl_rsa.c libssl: Move SSL object unwrapping macros to separate header 2025-02-17 11:27:32 -05:00
ssl_rsa_legacy.c Check file name for not being NULL before opening it 2024-09-26 20:35:26 +02:00
ssl_sess.c libssl: Move SSL object unwrapping macros to separate header 2025-02-17 11:27:32 -05:00
ssl_stat.c libssl: Move SSL object unwrapping macros to separate header 2025-02-17 11:27:32 -05:00
ssl_txt.c Copyright year updates 2024-09-05 09:35:49 +02:00
ssl_utst.c Remove the old buffer management code 2022-10-20 14:39:33 +01:00
sslerr.h Add an API for other QUIC stacks to use our TLS implementation 2025-02-11 17:17:10 +00:00
t1_enc.c libssl: Move SSL object unwrapping macros to separate header 2025-02-17 11:27:32 -05:00
t1_lib.c libssl: Move SSL object unwrapping macros to separate header 2025-02-17 11:27:32 -05:00
t1_trce.c Minor updates 2025-02-17 11:27:32 -05:00
tls13_enc.c libssl: Move SSL object unwrapping macros to separate header 2025-02-17 11:27:32 -05:00
tls_depr.c libssl: Move SSL object unwrapping macros to separate header 2025-02-17 11:27:32 -05:00
tls_srp.c libssl: Move SSL object unwrapping macros to separate header 2025-02-17 11:27:32 -05:00