Commit 159cdbc600 for openssl.org
commit 159cdbc6006afe7676c5e699f624991ce40d911e
Author: rl2939 <60378449+rl2939@users.noreply.github.com>
Date: Mon Nov 9 04:04:20 2026 -0500
apps/include: rename "configuration.h(.in)" to "app_conf.h(.in)"
Rename "configuration.h" to "app_conf.h" in list.c, configdata.pm.h,
and .gitignore to avoid potential collisions
with include/openssl/configuration.h.
Rename the file "configuration.h.in" to "app_conf.h.in".
This is a trivial action because the only thing that is being changed
is the file name. This is the equivalent of changing a function name.
This is a trivial action under copyright law.
No code is being changed in this commit.
CLA: trivial
Resolves: https://github.com/openssl/openssl/issues/30994
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Billy Bob Brumley <bbb@iki.fi>
Merge-date: Fri Nov 20 10:13:46 2026
Merged-from: https://github.com/openssl/openssl/pull/33453
diff --git a/.gitignore b/.gitignore
index 2922d0b425..cb35e280a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,7 +68,7 @@
/include/openssl/x509_vfy.h
/include/openssl/core_names.h
-/apps/include/configuration.h
+/apps/include/app_conf.h
# Auto generated parameter name files
/crypto/params_idx.c
diff --git a/apps/include/configuration.h.in b/apps/include/app_conf.h.in
similarity index 100%
rename from apps/include/configuration.h.in
rename to apps/include/app_conf.h.in
diff --git a/apps/list.c b/apps/list.c
index a9a55fadee..8245e1b5f5 100644
--- a/apps/list.c
+++ b/apps/list.c
@@ -33,7 +33,7 @@
#include "progs.h"
#include "opt.h"
#include "names.h"
-#include "configuration.h"
+#include "app_conf.h"
static int verbose = 0;
static const char *select_name = NULL;
diff --git a/configdata.pm.in b/configdata.pm.in
index 4d6b17f10f..41664b9afe 100644
--- a/configdata.pm.in
+++ b/configdata.pm.in
@@ -211,9 +211,9 @@ _____
catfile($config{sourcedir}, 'include', 'openssl', 'configuration.h.in');
my $apps_configuration_h =
- catfile('apps', 'include', 'configuration.h');
+ catfile('apps', 'include', 'app_conf.h');
my $apps_configuration_h_in =
- catfile($config{sourcedir}, 'apps', 'include', 'configuration.h.in');
+ catfile($config{sourcedir}, 'apps', 'include', 'app_conf.h.in');
$create_configuration->($configuration_h, $configuration_h_in);
$update_configuration->($configuration_h, $configuration_h_in);