diff options
author | Frederik Wedel-Heinen <frederik.wedel-heinen@dencrypt.dk> | 2024-06-14 14:01:40 +0200 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2024-09-10 20:43:16 +0200 |
commit | 2478d3b7f5c4c2da9828e05308b34a4b078035f8 (patch) | |
tree | 66ba86b9540c34b18bfbda26ad05e28ccecb4968 /ssl | |
parent | feat: print <none> in issuer serials in ac targeting extension (diff) | |
download | openssl-2478d3b7f5c4c2da9828e05308b34a4b078035f8.tar.xz openssl-2478d3b7f5c4c2da9828e05308b34a4b078035f8.zip |
Cleanup of unused functions and macros in ssl_local.h
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24648)
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/ssl_lib.c | 5 | ||||
-rw-r--r-- | ssl/ssl_local.h | 24 |
2 files changed, 0 insertions, 29 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index bca2b9faa5..54003b0f79 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -4814,11 +4814,6 @@ int ssl_undefined_void_function(void) return 0; } -int ssl_undefined_const_function(const SSL *s) -{ - return 0; -} - const char *ssl_protocol_to_string(int version) { switch (version) { diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h index 7b2dbe1bb0..af36f38324 100644 --- a/ssl/ssl_local.h +++ b/ssl/ssl_local.h @@ -78,12 +78,8 @@ # define SSL_kRSA 0x00000001U /* tmp DH key no DH cert */ # define SSL_kDHE 0x00000002U -/* synonym */ -# define SSL_kEDH SSL_kDHE /* ephemeral ECDH */ # define SSL_kECDHE 0x00000004U -/* synonym */ -# define SSL_kEECDH SSL_kECDHE /* PSK */ # define SSL_kPSK 0x00000008U /* GOST key exchange */ @@ -368,12 +364,6 @@ * SSL_aDSS <- DSA_SIGN */ -/*- -#define CERT_INVALID 0 -#define CERT_PUBLIC_KEY 1 -#define CERT_PRIVATE_KEY 2 -*/ - /* Certificate Type State */ # define OSSL_CERT_TYPE_CTOS_NONE 0 # define OSSL_CERT_TYPE_CTOS_GOOD 1 @@ -1870,12 +1860,6 @@ typedef struct sigalg_lookup_st { /* Max MTU overhead we know about so far is 40 for IPv6 + 8 for UDP */ # define DTLS1_MAX_MTU_OVERHEAD 48 -/* - * Flag used in message reuse to indicate the buffer contains the record - * header as well as the handshake message header. - */ -# define DTLS1_SKIP_RECORD_HEADER 2 - struct dtls1_retransmit_state { const OSSL_RECORD_METHOD *wrlmethod; OSSL_RECORD_LAYER *wrl; @@ -2110,8 +2094,6 @@ typedef struct cert_st { CRYPTO_REF_COUNT references; /* >1 only if SSL_copy_session_id is used */ } CERT; -# define FP_ICC (int (*)(const void *,const void *)) - /* * This is for the SSLv3/TLSv1.0 differences in crypto/hash stuff It is a bit * of a mess of functions, but hell, think of it as an opaque structure :-) @@ -2256,9 +2238,6 @@ typedef enum downgrade_en { #define SSL_USE_PSS(s) (s->s3.tmp.peer_sigalg != NULL && \ s->s3.tmp.peer_sigalg->sig == EVP_PKEY_RSA_PSS) -/* A dummy signature value not valid for TLSv1.2 signature algs */ -#define TLSEXT_signature_rsa_pss 0x0101 - /* TLSv1.3 downgrade protection sentinel values */ extern const unsigned char tls11downgrade[8]; extern const unsigned char tls12downgrade[8]; @@ -2571,7 +2550,6 @@ __owur const SSL_CERT_LOOKUP *ssl_cert_lookup_by_idx(size_t idx, SSL_CTX *ctx); int ssl_undefined_function(SSL *s); __owur int ssl_undefined_void_function(void); -__owur int ssl_undefined_const_function(const SSL *s); __owur int ssl_get_server_cert_serverinfo(SSL_CONNECTION *s, const unsigned char **serverinfo, size_t *serverinfo_length); @@ -2945,8 +2923,6 @@ __owur int custom_exts_copy_flags(custom_ext_methods *dst, const custom_ext_methods *src); void custom_exts_free(custom_ext_methods *exts); -void ssl_comp_free_compression_methods_int(void); - /* ssl_mcnf.c */ int ssl_ctx_system_config(SSL_CTX *ctx); |