From: Bob Beck <beck@openssl.org>
Date: Mon, 27 Apr 2026 16:44:29 +0000 (-0600)
Subject: Make apps self-contained
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c9191ff55c0a11cb4d7740a683ba7402ec09504;p=thirdparty%2Fopenssl.git

Make apps self-contained

Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
MergeDate: Wed May  6 11:35:53 2026
(Merged from https://github.com/openssl/openssl/pull/31001)
---

diff --git a/apps/include/apps_ui.h b/apps/include/apps_ui.h
index ea41c092f4d..66caca98ae0 100644
--- a/apps/include/apps_ui.h
+++ b/apps/include/apps_ui.h
@@ -10,6 +10,9 @@
 #ifndef OSSL_APPS_UI_H
 #define OSSL_APPS_UI_H
 
+#include <openssl/types.h>
+#include <openssl/ui.h>
+
 #define PW_MIN_LENGTH 4
 typedef struct pw_cb_data {
     const void *password;
diff --git a/apps/include/ec_common.h b/apps/include/ec_common.h
index f5711657a29..ac160e507f1 100644
--- a/apps/include/ec_common.h
+++ b/apps/include/ec_common.h
@@ -7,7 +7,12 @@
  * https://www.openssl.org/source/license.html
  */
 
+#if !defined(APPS_INCLUDE_EC_COMMON_H)
+#define APPS_INCLUDE_EC_COMMON_H
+
 #ifndef OPENSSL_NO_EC
+#include <stddef.h>
+
 static const char *point_format_options[] = {
     "uncompressed",
     "compressed",
@@ -21,3 +26,5 @@ static const char *asn1_encoding_options[] = {
     NULL
 };
 #endif
+
+#endif /* !defined(APPS_INCLUDE_EC_COMMON_H) */
diff --git a/apps/include/names.h b/apps/include/names.h
index a5d78de6770..c2a8c41dd72 100644
--- a/apps/include/names.h
+++ b/apps/include/names.h
@@ -10,7 +10,9 @@
 #if !defined(OSSL_APPS_INCLUDE_NAMES_H)
 #define OSSL_APPS_INCLUDE_NAMES_H
 
+#include <openssl/evp.h>
 #include <openssl/safestack.h>
+#include <openssl/types.h>
 
 /* Standard comparing function for names */
 int name_cmp(const char *const *a, const char *const *b);
diff --git a/apps/testdsa.h b/apps/testdsa.h
index 59c4bc4da2d..dff64183016 100644
--- a/apps/testdsa.h
+++ b/apps/testdsa.h
@@ -10,6 +10,9 @@
 #if !defined(OSSL_APPS_TESTDSA_H)
 #define OSSL_APPS_TESTDSA_H
 
+#include <openssl/core_names.h>
+#include <openssl/evp.h>
+#include <openssl/params.h>
 #include <openssl/param_build.h>
 
 /* used by speed.c */