root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge 0eea1cf72f into 9919f898b5

This commit is contained in:
Randall S. Becker 2025-10-07 18:02:55 -04:00 committed by GitHub
parent 9919f898b5 0eea1cf72f
commit ae159f26f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Configurations/50-nonstop.conf
View File

@ -168,6 +168,7 @@
# Build models # Build models
'nonstop-model-put' => { 'nonstop-model-put' => {
template => 1, template => 1,
disable => ['secure-memory'],
defines => ['_PUT_MODEL_', defines => ['_PUT_MODEL_',
'_REENTRANT', '_THREAD_SUPPORT_FUNCTIONS'], '_REENTRANT', '_THREAD_SUPPORT_FUNCTIONS'],
ex_libs => '-lput', ex_libs => '-lput',
@ -177,6 +178,7 @@
# Build models # Build models
'nonstop-model-klt' => { 'nonstop-model-klt' => {
template => 1, template => 1,
disable => ['secure-memory'],
defines => ['_KLT_MODEL_', defines => ['_KLT_MODEL_',
'_REENTRANT', '_THREAD_SUPPORT_FUNCTIONS'], '_REENTRANT', '_THREAD_SUPPORT_FUNCTIONS'],
ex_libs => '-lklt', ex_libs => '-lklt',

12
NOTES-NONSTOP.md
View File

@ -37,8 +37,7 @@ for each on the TNS/X (L-Series) platform:
The KLT threading model is a newly released model on NonStop. It implements The KLT threading model is a newly released model on NonStop. It implements
kernel-level threading. KLT provides much closer threading to what OpenSSL kernel-level threading. KLT provides much closer threading to what OpenSSL
uses for Linux-like threading models. KLT continues to use the pthread library uses for Linux-like threading models. KLT continues to use the pthread library
API. There is no supported 32-bit or Guardian builds for KLT. Note: KLT is API. There is no supported 32-bit or Guardian builds for KLT.
not currently available but is planned for post-2024.
The SPT threading model is no longer supported as of OpenSSL 3.2. The SPT threading model is no longer supported as of OpenSSL 3.2.
@ -53,6 +52,9 @@ instead of `nsx` in the set above.
You cannot build for TNS/E for FIPS, so you must specify the `no-fips` You cannot build for TNS/E for FIPS, so you must specify the `no-fips`
option to `./Configure`. option to `./Configure`.
TNS/E has moved to a limited support state, so fixes for this platform will not
be guaranteed in future.
Linking and Loading Considerations Linking and Loading Considerations
---------------------------------- ----------------------------------
@ -73,6 +75,12 @@ for NonStop builds. If you need to have `atexit()` functionality, set
register `OPENSSL_cleanup()` automatically. Preferably, you can explicitly call register `OPENSSL_cleanup()` automatically. Preferably, you can explicitly call
`OPENSSL_cleanup()` from your application. `OPENSSL_cleanup()` from your application.
Secure Memory
-------------
The mechanism used by OpenSSL for secure memory is not supported on NonStop.
Use the `no-secure-memory` option when running `Configure`.
About Prefix and OpenSSLDir About Prefix and OpenSSLDir
--------------------------- ---------------------------

9
crypto/async/arch/async_posix.h
View File

@ -13,7 +13,8 @@
#if defined(OPENSSL_SYS_UNIX) \ #if defined(OPENSSL_SYS_UNIX) \
&& defined(OPENSSL_THREADS) && !defined(OPENSSL_NO_ASYNC) \ && defined(OPENSSL_THREADS) && !defined(OPENSSL_NO_ASYNC) \
&& !defined(__ANDROID__) && !defined(__OpenBSD__) && !defined(__ANDROID__) && !defined(__OpenBSD__) \
&& !defined(OPENSSL_SYS_TANDEM)
# include <unistd.h> # include <unistd.h>
@ -48,7 +49,11 @@
*/ */
# define USE_SWAPCONTEXT # define USE_SWAPCONTEXT
# endif # endif
# include <ucontext.h> # if defined (OPENSSL_SYS_TANDEM)
# include <tdmsig.h>
# else
# include <ucontext.h>
# endif
# ifndef USE_SWAPCONTEXT # ifndef USE_SWAPCONTEXT
# include <setjmp.h> # include <setjmp.h>
# endif # endif