Skip to content

Commit 0df51fb

Browse files
authored
Merge pull request #190 from wolfSSL/pid_t-bug
Add `HAVE_GETPID` to options.h to fix `dh->ctx` override by rng
2 parents 5b46b88 + a3b52a0 commit 0df51fb

2 files changed

Lines changed: 16 additions & 6 deletions

File tree

.github/workflows/tnftp.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,16 @@ jobs:
4040
with:
4141
fetch-depth: 1
4242

43-
- name: Retrieving wolfSSL/wolfProvider from cache
43+
- name: Retrieve wolfSSL/wolfProvider from cache
4444
uses: actions/cache/restore@v4
4545
id: wolfprov-cache
4646
with:
4747
path: |
48-
scripts
49-
wolfssl-source
5048
wolfssl-install
5149
wolfprov-install
52-
openssl-install
53-
provider.conf
54-
50+
openssl-install/lib64
51+
openssl-install/include
52+
openssl-install/bin
5553
key: wolfprov-${{ matrix.wolfssl_ref }}-${{ matrix.openssl_ref }}-${{ github.sha }}
5654
fail-on-cache-miss: true
5755

configure.ac

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,18 @@ if test "x$have_wolfssl" = "xyes"; then
5252
LDFLAGS="$LDFLAGS $WOLFSSL_LDFLAGS"
5353
fi
5454

55+
# Check for required headers
56+
AC_CHECK_HEADERS([stdlib.h])
57+
AC_CHECK_HEADERS([unistd.h])
58+
AC_CHECK_HEADERS([ctype.h])
59+
60+
# Check for getpid function and add HAVE_GETPID to AM_CFLAGS for inclusion in options.h
61+
AC_CHECK_FUNC([getpid])
62+
if test "$ac_cv_func_getpid" = "yes"
63+
then
64+
AM_CFLAGS="$AM_CFLAGS -DHAVE_GETPID=1"
65+
fi
66+
5567
# DEBUG
5668
DEBUG_CFLAGS="-g -O0 -DWOLFPROV_DEBUG"
5769

0 commit comments

Comments
 (0)