From f9a1503591d4a14277600d77114ff117fd205d57 Mon Sep 17 00:00:00 2001 From: gojimmypi Date: Wed, 27 Sep 2023 10:38:43 -0700 Subject: [PATCH 1/2] WOLFMQTT_EXAMPLE_CERT allowing static or extern --- examples/aws/awsiot.c | 6 +++--- examples/mqttexample.h | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/examples/aws/awsiot.c b/examples/aws/awsiot.c index 5f8d701de..283c20e87 100644 --- a/examples/aws/awsiot.c +++ b/examples/aws/awsiot.c @@ -72,7 +72,7 @@ static int mStopRead = 0; #define AWSIOT_PUBLISH_MSG_SZ 400 /* Demo Certificates */ -static const char* root_ca = +WOLFMQTT_EXAMPLE_CERT const char* root_ca = "-----BEGIN CERTIFICATE-----\n" "MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB\n" "yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL\n" @@ -115,7 +115,7 @@ static const char* device_pub_key = "-----END PUBLIC KEY-----"; #endif -static const char* device_priv_key = +WOLFMQTT_EXAMPLE_CERT const char* device_priv_key = #ifndef WOLFSSL_ENCRYPTED_KEYS "-----BEGIN RSA PRIVATE KEY-----\n" "MIIEpAIBAAKCAQEAqsAKVhbfQEWblC8PvgubqpJasVoCEsSfvLF4b5DIAsoMeieP\n" @@ -177,7 +177,7 @@ static const char* device_priv_key = "-----END ENCRYPTED PRIVATE KEY-----"; #endif -static const char* device_cert = +WOLFMQTT_EXAMPLE_CERT const char* device_cert = "-----BEGIN CERTIFICATE-----\n" "MIIDWjCCAkKgAwIBAgIVANIzUucLFUREa2BiJUXoRv6Z4XaIMA0GCSqGSIb3DQEB\n" "CwUAME0xSzBJBgNVBAsMQkFtYXpvbiBXZWIgU2VydmljZXMgTz1BbWF6b24uY29t\n" diff --git a/examples/mqttexample.h b/examples/mqttexample.h index b668ae7f5..5e196b37b 100644 --- a/examples/mqttexample.h +++ b/examples/mqttexample.h @@ -96,6 +96,18 @@ #define DEFAULT_SESS_EXP_INT 0xFFFFFFFF #endif +/* certs are either static or extern, depending on the specific example */ +#ifdef WOLFMQTT_EXTERN_CERT + #undef WOLFMQTT_EXAMPLE_CERT + #define WOLFMQTT_EXAMPLE_CERT /* init extern from mqttexample.h */ + extern const char* root_ca; + extern const char* device_cert; + extern const char* device_priv_key; +#else + #undef WOLFMQTT_EXAMPLE_CERT + #define WOLFMQTT_EXAMPLE_CERT static +#endif + /* MQTT Client state */ typedef enum _MQTTCtxState { WMQ_BEGIN = 0, From 80bd582d0fdf030f7fcd9cdaa40905656b6dd145 Mon Sep 17 00:00:00 2001 From: gojimmypi Date: Thu, 28 Sep 2023 07:58:00 -0700 Subject: [PATCH 2/2] add ubuntu make-check github workflow --- .github/workflows/ubuntu-check.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ubuntu-check.yml b/.github/workflows/ubuntu-check.yml index 9919a7302..e2fa6cc29 100644 --- a/.github/workflows/ubuntu-check.yml +++ b/.github/workflows/ubuntu-check.yml @@ -55,4 +55,9 @@ jobs: - name: make run: make - name: make check + id: make-check run: make check + - name: Show logs on failure + if: ${{ failure() && steps.make-check.outcome == 'failure' }} + run: | + more test-suite.log