diff options
| author | Frederik Wedel-Heinen <[email protected]> | 2026-06-24 14:40:52 +0200 |
|---|---|---|
| committer | Norbert Pocs <[email protected]> | 2026-07-20 11:05:57 +0200 |
| commit | 7f58002be84c84e0765a6b481f8162df6527d498 (patch) | |
| tree | c872b3c4c4d664846ce5a96f7cef83912d3f35fa | |
| parent | tests: Check the return value of BN_hex2bn() (diff) | |
| download | openssl-7f58002be84c84e0765a6b481f8162df6527d498.tar.gz openssl-7f58002be84c84e0765a6b481f8162df6527d498.zip | |
Removes unused functions and macros from ssl_local.h and recmethod_local.h
Reviewed-by: Tim Hudson <[email protected]>
Reviewed-by: Paul Dale <[email protected]>
MergeDate: Mon Jul 20 09:06:08 2026
(Merged from https://github.com/openssl/openssl/pull/31719)
| -rw-r--r-- | ssl/record/methods/recmethod_local.h | 1 | ||||
| -rw-r--r-- | ssl/ssl_local.h | 17 |
2 files changed, 0 insertions, 18 deletions
diff --git a/ssl/record/methods/recmethod_local.h b/ssl/record/methods/recmethod_local.h index c5cdfc6cfc6..1bfea266317 100644 --- a/ssl/record/methods/recmethod_local.h +++ b/ssl/record/methods/recmethod_local.h @@ -456,7 +456,6 @@ int tls_read_record(OSSL_RECORD_LAYER *rl, void **rechandle, int *rversion, uint8_t *type, const unsigned char **data, size_t *datalen, uint16_t *epoch, unsigned char *seq_num); int tls_release_record(OSSL_RECORD_LAYER *rl, void *rechandle, size_t length); -int tls_default_set_protocol_version(OSSL_RECORD_LAYER *rl, int version); int tls_set_protocol_version(OSSL_RECORD_LAYER *rl, int version); void tls_set_plain_alerts(OSSL_RECORD_LAYER *rl, int allow); void tls_set_first_handshake(OSSL_RECORD_LAYER *rl, int first); diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h index 978f6272900..aeb0c170ad1 100644 --- a/ssl/ssl_local.h +++ b/ssl/ssl_local.h @@ -294,12 +294,6 @@ */ #define SSL_USE_SIGALGS(s) \ (SSL_CONNECTION_GET_SSL(s)->method->ssl3_enc->enc_flags & SSL_ENC_FLAG_SIGALGS) -/* - * Allow TLS 1.2 ciphersuites: applies to DTLS 1.2 as well as TLS 1.2: may - * apply to others in future. - */ -#define SSL_USE_TLS1_2_CIPHERS(s) \ - (SSL_CONNECTION_GET_SSL(s)->method->ssl3_enc->enc_flags & SSL_ENC_FLAG_TLS1_2_CIPHERS) #define IS_MAX_FRAGMENT_LENGTH_EXT_VALID(value) \ (((value) >= TLSEXT_max_fragment_length_512) && ((value) <= TLSEXT_max_fragment_length_4096)) @@ -800,16 +794,6 @@ typedef struct { uint32_t amask; /* authmask corresponding to key type */ } SSL_CERT_LOOKUP; -/* flags values */ -#define TLS_GROUP_TYPE 0x0000000FU /* Mask for group type */ -#define TLS_GROUP_CURVE_PRIME 0x00000001U -#define TLS_GROUP_CURVE_CHAR2 0x00000002U -#define TLS_GROUP_CURVE_CUSTOM 0x00000004U -#define TLS_GROUP_FFDHE 0x00000008U -#define TLS_GROUP_ONLY_FOR_TLS1_3 0x00000010U - -#define TLS_GROUP_FFDHE_FOR_TLS1_3 (TLS_GROUP_FFDHE | TLS_GROUP_ONLY_FOR_TLS1_3) - #if !defined(OPENSSL_NO_TLS1) \ || !defined(OPENSSL_NO_TLS1_1) \ || !defined(OPENSSL_NO_TLS1_2) \ @@ -2508,7 +2492,6 @@ void ssl_cert_set_cert_cb(CERT *c, int (*cb)(SSL *ssl, void *arg), void *arg); __owur int ssl_verify_cert_chain(SSL_CONNECTION *s, STACK_OF(X509) *sk); __owur int ssl_verify_rpk(SSL_CONNECTION *s, EVP_PKEY *rpk); -__owur int ssl_verify_ocsp(SSL *s, STACK_OF(X509) *sk); __owur int ssl_build_cert_chain(SSL_CONNECTION *s, SSL_CTX *ctx, int flags); __owur int ssl_cert_set_cert_store(CERT *c, X509_STORE *store, int chain, int ref); |
