[coaps] include coaps in `make dist` (#3096)
diff --git a/Makefile.am b/Makefile.am
index 447d096..9697f08 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,7 @@
AM_DISTCHECK_CONFIGURE_FLAGS = \
--enable-address-sanitizer \
--enable-application-coap \
+ --enable-application-coap-secure \
--enable-border-router \
--enable-cli \
--enable-commissioner \
diff --git a/examples/Makefile-posix b/examples/Makefile-posix
index a7d4208..4d30e08 100644
--- a/examples/Makefile-posix
+++ b/examples/Makefile-posix
@@ -46,6 +46,7 @@
configure_OPTIONS = \
--enable-application-coap \
+ --enable-application-coap-secure \
--enable-border-agent \
--enable-border-router \
--enable-cert-log \
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index 71fb85d..f37e102 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -168,6 +168,7 @@
cli_server.hpp \
cli_uart.hpp \
cli_udp_example.hpp \
+ x509_cert_key.hpp \
$(NULL)
if OPENTHREAD_BUILD_COVERAGE
diff --git a/src/cli/x509_cert_key.hpp b/src/cli/x509_cert_key.hpp
index cd70326..45eb96e 100644
--- a/src/cli/x509_cert_key.hpp
+++ b/src/cli/x509_cert_key.hpp
@@ -56,51 +56,51 @@
* place your X.509 certificate (PEM format) for ssl session
* with ECDHE_ECDSA_WITH_AES_128_CCM_8 here.
*/
-#define OT_CLI_COAPS_X509_CERT \
-"-----BEGIN CERTIFICATE-----\r\n" \
-"MIIBrTCCAVICBgDRArfDJTAKBggqhkjOPQQDAjBcMQswCQYDVQQGEwJaWTESMBAG\r\n" \
-"A1UECAwJWW91clN0YXRlMRAwDgYDVQQKDAdZb3VyT3JnMRQwEgYDVQQLDAtZb3Vy\r\n" \
-"T3JnVW5pdDERMA8GA1UEAwwIVmVuZG9yQ0EwIBcNMTgwNzEzMTIzNzA3WhgPMjI5\r\n" \
-"MjA0MjYxMjM3MDdaMGExCzAJBgNVBAYTAlpZMRIwEAYDVQQIDAlZb3VyU3RhdGUx\r\n" \
-"EDAOBgNVBAoMB1lvdXJPcmcxFDASBgNVBAsMC1lvdXJPcmdVbml0MRYwFAYDVQQD\r\n" \
-"DA1QWEMzLkU3NS0xMDBBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIUtlV99w\r\n" \
-"OggiASflg6CVsGMzXMXYrNgQ1piLIybCkrq+YoqJ3mwcbJHWlvxGPxNIQw6i8kzK\r\n" \
-"bkC642ZWgBT5MzAKBggqhkjOPQQDAgNJADBGAiEA/1yk69A+37kLBvdOWPDRXGwe\r\n" \
-"0AoICTGaLqzB3cF5mtACIQC28WwmzHb5gqe3nOPAM73py1v17EXZj07PU89BAEcb\r\n" \
-"yg==\r\n" \
-"-----END CERTIFICATE-----\r\n"
+#define OT_CLI_COAPS_X509_CERT \
+ "-----BEGIN CERTIFICATE-----\r\n" \
+ "MIIBrTCCAVICBgDRArfDJTAKBggqhkjOPQQDAjBcMQswCQYDVQQGEwJaWTESMBAG\r\n" \
+ "A1UECAwJWW91clN0YXRlMRAwDgYDVQQKDAdZb3VyT3JnMRQwEgYDVQQLDAtZb3Vy\r\n" \
+ "T3JnVW5pdDERMA8GA1UEAwwIVmVuZG9yQ0EwIBcNMTgwNzEzMTIzNzA3WhgPMjI5\r\n" \
+ "MjA0MjYxMjM3MDdaMGExCzAJBgNVBAYTAlpZMRIwEAYDVQQIDAlZb3VyU3RhdGUx\r\n" \
+ "EDAOBgNVBAoMB1lvdXJPcmcxFDASBgNVBAsMC1lvdXJPcmdVbml0MRYwFAYDVQQD\r\n" \
+ "DA1QWEMzLkU3NS0xMDBBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIUtlV99w\r\n" \
+ "OggiASflg6CVsGMzXMXYrNgQ1piLIybCkrq+YoqJ3mwcbJHWlvxGPxNIQw6i8kzK\r\n" \
+ "bkC642ZWgBT5MzAKBggqhkjOPQQDAgNJADBGAiEA/1yk69A+37kLBvdOWPDRXGwe\r\n" \
+ "0AoICTGaLqzB3cF5mtACIQC28WwmzHb5gqe3nOPAM73py1v17EXZj07PU89BAEcb\r\n" \
+ "yg==\r\n" \
+ "-----END CERTIFICATE-----\r\n"
/**
* place your private key (PEM format) for ssl session
* with ECDHE_ECDSA_WITH_AES_128_CCM_8 here.
*/
-#define OT_CLI_COAPS_PRIV_KEY \
-"-----BEGIN EC PRIVATE KEY-----\r\n" \
-"MHcCAQEEIFYQh2R7M48qOHePw+VE4b034UlZmWWC/iNAK34sQbucoAoGCCqGSM49\r\n" \
-"AwEHoUQDQgAEIUtlV99wOggiASflg6CVsGMzXMXYrNgQ1piLIybCkrq+YoqJ3mwc\r\n" \
-"bJHWlvxGPxNIQw6i8kzKbkC642ZWgBT5Mw==\r\n" \
-"-----END EC PRIVATE KEY-----\r\n"
+#define OT_CLI_COAPS_PRIV_KEY \
+ "-----BEGIN EC PRIVATE KEY-----\r\n" \
+ "MHcCAQEEIFYQh2R7M48qOHePw+VE4b034UlZmWWC/iNAK34sQbucoAoGCCqGSM49\r\n" \
+ "AwEHoUQDQgAEIUtlV99wOggiASflg6CVsGMzXMXYrNgQ1piLIybCkrq+YoqJ3mwc\r\n" \
+ "bJHWlvxGPxNIQw6i8kzKbkC642ZWgBT5Mw==\r\n" \
+ "-----END EC PRIVATE KEY-----\r\n"
/**
* Place peers CA certificate (PEM format) here.
* It's necessary to validate the peers certificate. If you haven't a
* CA certificate, you must run the coaps without checking certificate.
*/
-#define OT_CLI_COAPS_TRUSTED_ROOT_CERTIFICATE \
-"-----BEGIN CERTIFICATE-----\r\n" \
-"MIICDzCCAbWgAwIBAgIESZYC0jAKBggqhkjOPQQDAjBcMQswCQYDVQQGEwJaWTES\r\n" \
-"MBAGA1UECAwJWW91clN0YXRlMRAwDgYDVQQKDAdZb3VyT3JnMRQwEgYDVQQLDAtZ\r\n" \
-"b3VyT3JnVW5pdDERMA8GA1UEAwwIVmVuZG9yQ0EwIBcNMTgwNzEzMTE1NjA5WhgP\r\n" \
-"MjI5MjA0MjYxMTU2MDlaMFwxCzAJBgNVBAYTAlpZMRIwEAYDVQQIDAlZb3VyU3Rh\r\n" \
-"dGUxEDAOBgNVBAoMB1lvdXJPcmcxFDASBgNVBAsMC1lvdXJPcmdVbml0MREwDwYD\r\n" \
-"VQQDDAhWZW5kb3JDQTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGAAuYcBIgP0\r\n" \
-"fMC1Bd+1nAH5S1goR0TaDAIadK4hULQr5LwziuDk9XTQaOTwmWB9iR1eiHC6RY8W\r\n" \
-"wyrGBbnEbzujYzBhMB0GA1UdDgQWBBQ+yCpIszhzbmXe2At1GofREjnBxjAfBgNV\r\n" \
-"HSMEGDAWgBQ+yCpIszhzbmXe2At1GofREjnBxjAPBgNVHRMBAf8EBTADAQH/MA4G\r\n" \
-"A1UdDwEB/wQEAwIBhjAKBggqhkjOPQQDAgNIADBFAiBW60XgdSRD24rbTgdneS+V\r\n" \
-"SHVix8LuXunPYW50LmxbrwIhAOw4gMroRIOS26y0TcND03FnyO3wBNF9MjM0hWKQ\r\n" \
-"JXk3\r\n" \
-"-----END CERTIFICATE-----\r\n" \
+#define OT_CLI_COAPS_TRUSTED_ROOT_CERTIFICATE \
+ "-----BEGIN CERTIFICATE-----\r\n" \
+ "MIICDzCCAbWgAwIBAgIESZYC0jAKBggqhkjOPQQDAjBcMQswCQYDVQQGEwJaWTES\r\n" \
+ "MBAGA1UECAwJWW91clN0YXRlMRAwDgYDVQQKDAdZb3VyT3JnMRQwEgYDVQQLDAtZ\r\n" \
+ "b3VyT3JnVW5pdDERMA8GA1UEAwwIVmVuZG9yQ0EwIBcNMTgwNzEzMTE1NjA5WhgP\r\n" \
+ "MjI5MjA0MjYxMTU2MDlaMFwxCzAJBgNVBAYTAlpZMRIwEAYDVQQIDAlZb3VyU3Rh\r\n" \
+ "dGUxEDAOBgNVBAoMB1lvdXJPcmcxFDASBgNVBAsMC1lvdXJPcmdVbml0MREwDwYD\r\n" \
+ "VQQDDAhWZW5kb3JDQTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGAAuYcBIgP0\r\n" \
+ "fMC1Bd+1nAH5S1goR0TaDAIadK4hULQr5LwziuDk9XTQaOTwmWB9iR1eiHC6RY8W\r\n" \
+ "wyrGBbnEbzujYzBhMB0GA1UdDgQWBBQ+yCpIszhzbmXe2At1GofREjnBxjAfBgNV\r\n" \
+ "HSMEGDAWgBQ+yCpIszhzbmXe2At1GofREjnBxjAPBgNVHRMBAf8EBTADAQH/MA4G\r\n" \
+ "A1UdDwEB/wQEAwIBhjAKBggqhkjOPQQDAgNIADBFAiBW60XgdSRD24rbTgdneS+V\r\n" \
+ "SHVix8LuXunPYW50LmxbrwIhAOw4gMroRIOS26y0TcND03FnyO3wBNF9MjM0hWKQ\r\n" \
+ "JXk3\r\n" \
+ "-----END CERTIFICATE-----\r\n"
#endif // MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
#endif // OPENTHREAD_ENABLE_APPLICATION_COAP_SECURE
@@ -111,7 +111,7 @@
*/
#ifdef __cplusplus
-} // extern "C"
+} // extern "C"
#endif
#endif /* SRC_CLI_X509_CERT_KEY_HPP_ */
diff --git a/src/core/openthread-core-default-config.h b/src/core/openthread-core-default-config.h
index 3bfa48e..50163d3 100644
--- a/src/core/openthread-core-default-config.h
+++ b/src/core/openthread-core-default-config.h
@@ -1068,7 +1068,7 @@
*/
#ifndef OPENTHREAD_CONFIG_HEAP_SIZE
#if OPENTHREAD_ENABLE_APPLICATION_COAP_SECURE
-#define OPENTHREAD_CONFIG_HEAP_SIZE (1800 * sizeof(void *))
+#define OPENTHREAD_CONFIG_HEAP_SIZE (3072 * sizeof(void *))
#else
#define OPENTHREAD_CONFIG_HEAP_SIZE (1536 * sizeof(void *))
#endif // OPENTHREAD_ENABLE_APPLICATION_COAP_SECURE
diff --git a/src/posix/Makefile-posix b/src/posix/Makefile-posix
index a543bf8..113b0a2 100644
--- a/src/posix/Makefile-posix
+++ b/src/posix/Makefile-posix
@@ -46,6 +46,7 @@
configure_OPTIONS = \
--enable-application-coap \
+ --enable-application-coap-secure \
--enable-border-agent \
--enable-border-router \
--enable-cert-log \
