diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 05047e916390f..d457aa72c2146 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -3189,15 +3189,6 @@ long SSL_CTX_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp) (void)) } } -int ssl_cipher_id_cmp(const SSL_CIPHER *a, const SSL_CIPHER *b) -{ - if (a->id > b->id) - return 1; - if (a->id < b->id) - return -1; - return 0; -} - int ssl_cipher_ptr_id_cmp(const SSL_CIPHER *const *ap, const SSL_CIPHER *const *bp) { @@ -4795,11 +4786,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 9083ec2f3bb63..6007b884335e1 100644 --- a/ssl/ssl_local.h +++ b/ssl/ssl_local.h @@ -79,12 +79,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 */ @@ -369,12 +365,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 @@ -1869,12 +1859,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; @@ -2109,8 +2093,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 :-) @@ -2221,9 +2203,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]; @@ -2472,7 +2451,6 @@ __owur SSL_SESSION *lookup_sess_in_cache(SSL_CONNECTION *s, size_t sess_id_len); __owur int ssl_get_prev_session(SSL_CONNECTION *s, CLIENTHELLO_MSG *hello); __owur SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket); -__owur int ssl_cipher_id_cmp(const SSL_CIPHER *a, const SSL_CIPHER *b); DECLARE_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER, ssl_cipher_id); __owur int ssl_cipher_ptr_id_cmp(const SSL_CIPHER *const *ap, const SSL_CIPHER *const *bp); @@ -2536,7 +2514,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); @@ -2910,8 +2887,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);