Skip to content

Commit d52e8fa

Browse files
committed
Clean up compilation errors
- `tls/` can now build with the default build
1 parent e0f0441 commit d52e8fa

3 files changed

Lines changed: 29 additions & 4 deletions

File tree

dtls/client-dtls13-earlydata.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ int main(int argc, char** argv)
125125
}
126126

127127
/* Check if ticket was received */
128-
if (!wolfSSL_SessionIsSetup(wolfSSL_SSL_get0_session(ssl))) {
128+
if (!wolfSSL_SessionIsSetup(wolfSSL_get_session(ssl))) {
129129
(void)wolfSSL_peek(ssl, recvBuf, 0);
130-
if (!wolfSSL_SessionIsSetup(wolfSSL_SSL_get0_session(ssl))) {
130+
if (!wolfSSL_SessionIsSetup(wolfSSL_get_session(ssl))) {
131131
fprintf(stderr, "Session ticket not received from server\n");
132132
goto cleanup;
133133
}

tls/client-tls13-earlydata.c

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
#include <wolfssl/ssl.h>
3636
#include <wolfssl/wolfio.h>
3737

38+
#ifdef WOLFSSL_EARLY_DATA
39+
3840
#define DEFAULT_PORT 11111
3941
#define CERT_FILE "../certs/client-cert.pem"
4042
#define KEY_FILE "../certs/client-key.pem"
@@ -128,10 +130,10 @@ int main(int argc, char** argv)
128130
}
129131

130132
/* Check if ticket was received */
131-
if (!wolfSSL_SessionIsSetup(wolfSSL_SSL_get0_session(ssl))) {
133+
if (!wolfSSL_SessionIsSetup(wolfSSL_get_session(ssl))) {
132134
/* Attempt to read a session ticket from server */
133135
(void)wolfSSL_peek(ssl, recvBuf, 0);
134-
if (!wolfSSL_SessionIsSetup(wolfSSL_SSL_get0_session(ssl))) {
136+
if (!wolfSSL_SessionIsSetup(wolfSSL_get_session(ssl))) {
135137
fprintf(stderr, "Session ticket not received from server\n");
136138
goto cleanup;
137139
}
@@ -208,3 +210,13 @@ int main(int argc, char** argv)
208210
wolfSSL_Cleanup();
209211
return ret;
210212
}
213+
214+
#else
215+
int main(int argc, char** argv)
216+
{
217+
printf("Example requires TLS v1.3 with Early Data support\n");
218+
(void)argc;
219+
(void)argv;
220+
return 1;
221+
}
222+
#endif /* WOLFSSL_EARLY_DATA */

tls/server-tls13-earlydata.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
#include <wolfssl/ssl.h>
3535
#include <wolfssl/wolfio.h>
3636

37+
#ifdef WOLFSSL_EARLY_DATA
38+
3739
#define DEFAULT_PORT 11111
3840
#define CERT_FILE "../certs/server-cert.pem"
3941
#define KEY_FILE "../certs/server-key.pem"
@@ -198,3 +200,14 @@ int main(int argc, char** argv)
198200
wolfSSL_Cleanup();
199201
return ret;
200202
}
203+
204+
#else
205+
206+
int main(int argc, char** argv)
207+
{
208+
printf("Example requires WOLFSSL_EARLY_DATA to be enabled\n");
209+
(void)argc;
210+
(void)argv;
211+
return 0;
212+
}
213+
#endif /* WOLFSSL_EARLY_DATA */

0 commit comments

Comments
 (0)