Fix builds without session tickets.

icing · icing · commit 9d0b16097ec6 · 2022-12-16T09:40:51.000+01:00
diff --git a/src/ssl.c b/src/ssl.c
@@ -16771,8 +16771,8 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
             return BAD_FUNC_ARG;
 
         ctx->mask = wolf_set_options(ctx->mask, opt);
-
-#if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER) || defined(WOLFSSL_WPAS_SMALL)
+#if defined(HAVE_SESSION_TICKET) && (defined(OPENSSL_EXTRA) \
+        || defined(HAVE_WEBSERVER) || defined(WOLFSSL_WPAS_SMALL))
         if ((ctx->mask & WOLFSSL_OP_NO_TICKET) == WOLFSSL_OP_NO_TICKET) {
           ctx->noTicketTls12 = 1;
         }
@@ -23559,7 +23559,8 @@ long wolfSSL_set_options(WOLFSSL* ssl, long op)
     #endif
     }
 
-#if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER) || defined(WOLFSSL_WPAS_SMALL)
+#if defined(HAVE_SESSION_TICKET) && (defined(OPENSSL_EXTRA) \
+        || defined(HAVE_WEBSERVER) || defined(WOLFSSL_WPAS_SMALL))
     if ((ssl->options.mask & WOLFSSL_OP_NO_TICKET) == WOLFSSL_OP_NO_TICKET) {
       ssl->options.noTicketTls12 = 1;
     }

Original file line number	Diff line number	Diff line change
`@@ -16771,8 +16771,8 @@ int wolfSSL_set_compression(WOLFSSL* ssl)`
`16771`	`16771`	`return BAD_FUNC_ARG;`
`16772`	`16772`
`16773`	`16773`	`ctx->mask = wolf_set_options(ctx->mask, opt);`
`16774`		`-`
`16775`		`-#if defined(OPENSSL_EXTRA) \|\| defined(HAVE_WEBSERVER) \|\| defined(WOLFSSL_WPAS_SMALL)`
	`16774`	`+#if defined(HAVE_SESSION_TICKET) && (defined(OPENSSL_EXTRA) \`
	`16775`	`+ \|\| defined(HAVE_WEBSERVER) \|\| defined(WOLFSSL_WPAS_SMALL))`
`16776`	`16776`	`if ((ctx->mask & WOLFSSL_OP_NO_TICKET) == WOLFSSL_OP_NO_TICKET) {`
`16777`	`16777`	`ctx->noTicketTls12 = 1;`
`16778`	`16778`	`}`
`@@ -23559,7 +23559,8 @@ long wolfSSL_set_options(WOLFSSL* ssl, long op)`
`23559`	`23559`	`#endif`
`23560`	`23560`	`}`
`23561`	`23561`
`23562`		`-#if defined(OPENSSL_EXTRA) \|\| defined(HAVE_WEBSERVER) \|\| defined(WOLFSSL_WPAS_SMALL)`
	`23562`	`+#if defined(HAVE_SESSION_TICKET) && (defined(OPENSSL_EXTRA) \`
	`23563`	`+ \|\| defined(HAVE_WEBSERVER) \|\| defined(WOLFSSL_WPAS_SMALL))`
`23563`	`23564`	`if ((ssl->options.mask & WOLFSSL_OP_NO_TICKET) == WOLFSSL_OP_NO_TICKET) {`
`23564`	`23565`	`ssl->options.noTicketTls12 = 1;`
`23565`	`23566`	`}`