diff options
| author | Tomas Mraz <tomas@openssl.org> | 2022-11-11 16:18:48 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-02-08 16:20:55 +0100 |
| commit | 25624c9087d5422c3bb93cd987a066cb7c883a16 (patch) | |
| tree | ed3b762338f9a08a0fcccfbe09d32f18c5e15bb2 /crypto/packet.c | |
| parent | 416a9286859d444e5a77bbdcc73f0c35b34e574b (diff) | |
Rationalize FIPS sources
Avoid including QUIC related stuff in the FIPS sources.
Also avoid including libssl headers in ssl3_cbc.c.
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19658)
Diffstat (limited to 'crypto/packet.c')
| -rw-r--r-- | crypto/packet.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crypto/packet.c b/crypto/packet.c index f80774c3c2..ac5c2e33f8 100644 --- a/crypto/packet.c +++ b/crypto/packet.c @@ -9,6 +9,9 @@ #include "internal/cryptlib.h" #include "internal/packet.h" +#if !defined OPENSSL_NO_QUIC && !defined FIPS_MODULE +# include "internal/packet_quic.h" +#endif #include <openssl/err.h> #define DEFAULT_BUF_SIZE 256 @@ -223,7 +226,7 @@ static int put_value(unsigned char *data, uint64_t value, size_t len) return 1; } -#ifndef OPENSSL_NO_QUIC +#if !defined OPENSSL_NO_QUIC && !defined FIPS_MODULE static int put_quic_value(unsigned char *data, size_t value, size_t len) { if (data == NULL) @@ -274,7 +277,7 @@ static int wpacket_intern_close(WPACKET *pkt, WPACKET_SUB *sub, int doclose) unsigned char *buf = GETBUF(pkt); if (buf != NULL) { -#ifndef OPENSSL_NO_QUIC +#if !defined OPENSSL_NO_QUIC && !defined FIPS_MODULE if ((sub->flags & WPACKET_FLAGS_QUIC_VLINT) == 0) { if (!put_value(&buf[sub->packet_len], packlen, sub->lenbytes)) return 0; @@ -531,7 +534,7 @@ void WPACKET_cleanup(WPACKET *pkt) pkt->subs = NULL; } -#ifndef OPENSSL_NO_QUIC +#if !defined OPENSSL_NO_QUIC && !defined FIPS_MODULE int WPACKET_start_quic_sub_packet_bound(WPACKET *pkt, size_t max_len) { |