mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-12-09 05:51:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't fall back to pre-defined constants on windows

Browse Source 
We don't want to allow windows systems on new installs to use
OPENSSLDIR/MODULESDIR/ENGINESDIR at all, as it makes no sense to define
paths at build time that have no meaning at install time.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24450)
This commit is contained in:
Neil Horman 2024-06-21 10:34:37 -04:00
parent 525f2bf564
commit 4edcf0b450
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crypto/defaults.c
View File

@ -1,5 +1,5 @@
/*
* Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -121,15 +121,9 @@ const char *ossl_get_openssldir(void)
if (!RUN_ONCE(&defaults_setup_init, do_defaults_setup))
return NULL;
return (const char *)openssldir;
# else
return "UNDEFINED";
# endif
#else
# ifdef OPENSSLDIR
# else
return OPENSSLDIR;
# else
return "";
# endif
#endif
}
@ -149,11 +143,7 @@ const char *ossl_get_enginesdir(void)
return "UNDEFINED";
# endif
#else
# ifdef OPENSSLDIR
return ENGINESDIR;
# else
return "";
# endif
#endif
}
@ -173,11 +163,7 @@ const char *ossl_get_modulesdir(void)
return "UNDEFINED";
# endif
#else
# ifdef MODULESDIR
return MODULESDIR;
# else
return "";
# endif
#endif
}
@ -191,6 +177,6 @@ const char *ossl_get_wininstallcontext(void)
#if defined(_WIN32) && defined (OSSL_WINCTX)
return MAKESTR(OSSL_WINCTX);
#else
return "";
return "UNDEFINED";
#endif
}