Commit f5070fede4 for openssl.org

commit f5070fede42f0b76528f4ed984305375e9cc5076
Author: Pauli <paul.dale@oracle.com>
Date:   Fri Feb 27 13:27:21 2026 +1100

    Remove SSL_TXT_FIPS

    This refers to an option that is no longer supported or available.
    The option is a remnant of the old FIPS canister from OpenSSL 1.0.

    Reviewed-by: Matt Caswell <matt@openssl.org>
    Reviewed-by: Simo Sorce <simo@redhat.com>
    Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/30200)

diff --git a/include/openssl/ssl.h.in b/include/openssl/ssl.h.in
index abb6db8c1d..ba4cf903d6 100644
--- a/include/openssl/ssl.h.in
+++ b/include/openssl/ssl.h.in
@@ -81,7 +81,6 @@ extern "C" {
 #define SSL_TXT_LOW "LOW"
 #define SSL_TXT_MEDIUM "MEDIUM"
 #define SSL_TXT_HIGH "HIGH"
-#define SSL_TXT_FIPS "FIPS"

 #define SSL_TXT_aNULL "aNULL"
 #define SSL_TXT_eNULL "eNULL"
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 5622ff1ada..e1e439704e 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -265,8 +265,6 @@ static const SSL_CIPHER cipher_aliases[] = {
     { 0, SSL_TXT_LOW, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, SSL_LOW },
     { 0, SSL_TXT_MEDIUM, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, SSL_MEDIUM },
     { 0, SSL_TXT_HIGH, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, SSL_HIGH },
-    /* FIPS 140-2 approved ciphersuite */
-    { 0, SSL_TXT_FIPS, NULL, 0, 0, 0, ~SSL_eNULL, 0, 0, 0, 0, 0, 0 },

     /* "EDH-" aliases to "DHE-" labels (for backward compatibility) */
     { 0, SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA, NULL, 0,