Merge pull request #9574 from anhu/dtls_guard

Guard a bit of DTLS code.

Author: dgarske

.github/workflows/os-check.yml

@@ -68,6 +68,8 @@ jobs:
           '--disable-sni --disable-ecc --disable-tls13 --disable-secure-renegotiation-info',
           'CPPFLAGS=-DWOLFSSL_BLIND_PRIVATE_KEY',
           '--enable-all --enable-certgencache',
+          '--enable-sessionexport --enable-dtls --enable-dtls13',
+          '--enable-sessionexport',
         ]
     name: make check
     if: github.repository_owner == 'wolfssl'

src/internal.c

@@ -1555,10 +1555,12 @@ static int ImportOptions(WOLFSSL* ssl, const byte* exp, word32 len, byte ver,
         idx++;
 #endif
     }
-
+#ifdef WOLFSSL_DTLS
     /* If we had a connection established, let's assume that we can act
      * statefully */
     options->dtlsStateful = 1;
+#endif
+
     if (ver > WOLFSSL_EXPORT_VERSION_4) {
 #ifdef WOLFSSL_DTLS
         options->dtlsStateful = exp[idx++];

tests/api.c

@@ -12043,7 +12043,7 @@ static int test_wolfSSL_dtls_export_peers(void)
     };
 
     for (i = 0; i < sizeof(params)/sizeof(*params); i++) {
-        for (j = 0; j <= 0b11; j++) {
+        for (j = 0; j <= 3; j++) {
             XMEMSET(&client_cbf, 0, sizeof(client_cbf));
             XMEMSET(&server_cbf, 0, sizeof(server_cbf));
 
@@ -12052,12 +12052,12 @@ static int test_wolfSSL_dtls_export_peers(void)
             client_cbf.method = params[i].client_meth;
             server_cbf.method = params[i].server_meth;
 
-            if (j & 0b01) {
+            if (j & 0x1) {
                 client_cbf.on_handshake =
                         test_wolfSSL_dtls_export_peers_on_handshake;
                 printf(" With client export;");
             }
-            if (j & 0b10) {
+            if (j & 0x2) {
                 server_cbf.on_handshake =
                         test_wolfSSL_dtls_export_peers_on_handshake;
                 printf(" With server export;");