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 #18132)
openssl · Aug 18, 2022 · 226ed5f · 226ed5f
1 parent efc84ea
commit 226ed5f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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
@@ -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                                          \