Remove redefinition of SSL_AD_NO_ALERT

The SSL_AD_NO_ALERT value was defined in two places. We centralise its
definition.

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18132)

diff --git a/ssl/record/methods/tls_common.c b/ssl/record/methods/tls_common.c
index d98badffe470204933d4ab89adc8c35e1ed12beb..a537db6ffd7fa3591918a5cfc23f49e5aaf9997d 100644 (file)
--- a/ssl/record/methods/tls_common.c
+++ b/ssl/record/methods/tls_common.c
@@ -17,8 +17,6 @@
 #include "../record_local.h"
 #include "recmethod_local.h"
 
-# define SSL_AD_NO_ALERT    -1
-
 static void tls_int_free(OSSL_RECORD_LAYER *rl);
 
 void ossl_rlayer_fatal(OSSL_RECORD_LAYER *rl, int al, int reason,

diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h
index 7f5c8a0ba5409a4232365dd8d663e8e7dfe03f74..38b2c7e970fe0de0b30b4765b8129e9800799e78 100644 (file)
--- a/ssl/ssl_local.h
+++ b/ssl/ssl_local.h
@@ -146,6 +146,7 @@
 # define DTLS_VERSION_LT(v1, v2) (dtls_ver_ordinal(v1) > dtls_ver_ordinal(v2))
 # define DTLS_VERSION_LE(v1, v2) (dtls_ver_ordinal(v1) >= dtls_ver_ordinal(v2))
 
+# define SSL_AD_NO_ALERT    -1
 
 /*
  * Define the Bitmasks for SSL_CIPHER.algorithms.

diff --git a/ssl/statem/statem.h b/ssl/statem/statem.h
index 7dbe71ed7d48a5cf0a92a22d72f4b1d7c41ffca9..75fb06481c0f2e219f5c1e48dd58c02e01d6f57e 100644 (file)
--- a/ssl/statem/statem.h
+++ b/ssl/statem/statem.h
@@ -127,7 +127,6 @@ void ossl_statem_set_renegotiate(SSL_CONNECTION *s);
 void ossl_statem_send_fatal(SSL_CONNECTION *s, int al);
 void ossl_statem_fatal(SSL_CONNECTION *s, int al, int reason,
                        const char *fmt, ...);
-# define SSL_AD_NO_ALERT    -1
 # define SSLfatal_alert(s, al) ossl_statem_send_fatal((s), (al))
 # define SSLfatal(s, al, r) SSLfatal_data((s), (al), (r), NULL)
 # define SSLfatal_data                                          \