Skip to content

Commit 4bfa3d2

Browse files
Merge remote-tracking branch 'upstream/master' into gh9951
2 parents 38f95a4 + 0de6e8f commit 4bfa3d2

66 files changed

Lines changed: 5283 additions & 262 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/os-check.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ jobs:
9090
'--enable-all CPPFLAGS=''-DNO_WOLFSSL_SERVER -DWOLFSSL_NO_CLIENT_AUTH''',
9191
'--enable-curve25519=nonblock --enable-ecc=nonblock --enable-sp=yes,nonblock CPPFLAGS="-DWOLFSSL_PUBLIC_MP -DWOLFSSL_DEBUG_NONBLOCK"',
9292
'--enable-certreq --enable-certext --enable-certgen --disable-secure-renegotiation-info CPPFLAGS="-DNO_TLS"',
93+
'--enable-ocsp --enable-ocsp-responder --enable-ocspstapling',
9394
]
9495
name: make check
9596
if: github.repository_owner == 'wolfssl'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ examples/sctp/sctp-client
7070
examples/sctp/sctp-client-dtls
7171
examples/asn1/asn1
7272
examples/pem/pem
73+
examples/ocsp_responder/ocsp_responder
7374
server_ready
7475
snifftest
7576
output

.wolfssl_known_macro_extras

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,6 @@ WOLFSSL_NO_WORD64_OPS
847847
WOLFSSL_NO_XOR_OPS
848848
WOLFSSL_NRF51_AES
849849
WOLFSSL_OLDTLS_AEAD_CIPHERSUITES
850-
WOLFSSL_OLDTLS_SHA2_CIPHERSUITES
851850
WOLFSSL_OLD_SET_CURVES_LIST
852851
WOLFSSL_OLD_TIMINGPADVERIFY
853852
WOLFSSL_OLD_UNSUPPORTED_EXTENSION
@@ -882,7 +881,6 @@ WOLFSSL_RSA_DECRYPT_TO_0_LEN
882881
WOLFSSL_RW_THREADED
883882
WOLFSSL_SAKKE_SMALL
884883
WOLFSSL_SAKKE_SMALL_MODEXP
885-
WOLFSSL_SLHDSA_FULL_HASH
886884
WOLFSSL_SE050_AUTO_ERASE
887885
WOLFSSL_SE050_CRYPT
888886
WOLFSSL_SE050_HASH
@@ -897,6 +895,7 @@ WOLFSSL_SHA256_ALT_CH_MAJ
897895
WOLFSSL_SHA512_HASHTYPE
898896
WOLFSSL_SHUTDOWNONCE
899897
WOLFSSL_SILABS_TRNG
898+
WOLFSSL_SLHDSA_FULL_HASH
900899
WOLFSSL_SM4_EBC
901900
WOLFSSL_SNIFFER_NO_RECOVERY
902901
WOLFSSL_SP_ARM32_UDIV

IDE/WIN/user_settings.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@
4040
#define HAVE_CRL
4141
#define HAVE_CRL_MONITOR
4242

43+
#define HAVE_OCSP
44+
#define HAVE_OCSP_RESPONDER
45+
#define WOLFSSL_CERT_GEN
46+
#define HAVE_CERTIFICATE_STATUS_REQUEST
47+
4348
#if defined(WOLFSSL_LIB)
4449
/* The lib */
4550
#define OPENSSL_EXTRA

certs/ocsp/include.am

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,46 @@ EXTRA_DIST += \
1414
certs/ocsp/openssl.cnf \
1515
certs/ocsp/renewcerts-for-test.sh \
1616
certs/ocsp/intermediate1-ca-key.pem \
17+
certs/ocsp/intermediate1-ca-key.der \
1718
certs/ocsp/intermediate1-ca-cert.pem \
19+
certs/ocsp/intermediate1-ca-cert.der \
1820
certs/ocsp/intermediate2-ca-key.pem \
21+
certs/ocsp/intermediate2-ca-key.der \
1922
certs/ocsp/intermediate2-ca-cert.pem \
23+
certs/ocsp/intermediate2-ca-cert.der \
2024
certs/ocsp/intermediate3-ca-key.pem \
25+
certs/ocsp/intermediate3-ca-key.der \
2126
certs/ocsp/intermediate3-ca-cert.pem \
27+
certs/ocsp/intermediate3-ca-cert.der \
2228
certs/ocsp/ocsp-responder-key.pem \
29+
certs/ocsp/ocsp-responder-key.der \
2330
certs/ocsp/ocsp-responder-cert.pem \
31+
certs/ocsp/ocsp-responder-cert.der \
2432
certs/ocsp/server1-key.pem \
33+
certs/ocsp/server1-key.der \
2534
certs/ocsp/server1-cert.pem \
35+
certs/ocsp/server1-cert.der \
2636
certs/ocsp/server1-chain-noroot.pem \
2737
certs/ocsp/server2-key.pem \
38+
certs/ocsp/server2-key.der \
2839
certs/ocsp/server2-cert.pem \
40+
certs/ocsp/server2-cert.der \
2941
certs/ocsp/server3-key.pem \
42+
certs/ocsp/server3-key.der \
3043
certs/ocsp/server3-cert.pem \
44+
certs/ocsp/server3-cert.der \
3145
certs/ocsp/server4-key.pem \
46+
certs/ocsp/server4-key.der \
3247
certs/ocsp/server4-cert.pem \
48+
certs/ocsp/server4-cert.der \
3349
certs/ocsp/server5-key.pem \
50+
certs/ocsp/server5-key.der \
3451
certs/ocsp/server5-cert.pem \
52+
certs/ocsp/server5-cert.der \
3553
certs/ocsp/root-ca-key.pem \
54+
certs/ocsp/root-ca-key.der \
3655
certs/ocsp/root-ca-cert.pem \
56+
certs/ocsp/root-ca-cert.der \
3757
certs/ocsp/root-ca-crl.pem \
3858
certs/ocsp/test-response.der \
3959
certs/ocsp/test-response-rsapss.der \
1.24 KB
Binary file not shown.
1.17 KB
Binary file not shown.
1.24 KB
Binary file not shown.
1.16 KB
Binary file not shown.
1.24 KB
Binary file not shown.

0 commit comments

Comments
 (0)