18 files changed, 86 insertions, 104 deletions

diff --git a/src/microhttpd/test_client_put_stop.c b/src/microhttpd/test_client_put_stop.c
index 9ee7dcf6..c26ff78a 100644
--- a/src/microhttpd/test_client_put_stop.c
+++ b/src/microhttpd/test_client_put_stop.c
@@ -802,6 +802,7 @@ _MHD_dumbClient_send_req (struct _MHD_dumbClient *clnt)
 
 
 /* internal */
+_MHD_NORETURN /* Declared as 'noreturn' until it is implemented */
 static void
 _MHD_dumbClient_recv_reply (struct _MHD_dumbClient *clnt)
 {
@@ -1687,7 +1688,8 @@ printTestResults (FILE *stream,
     fprintf (stream, " Final notification callback has been called %u time%s "
              "with %s code.", term_result->num_called,
              (1 == term_result->num_called) ? "" : "s",
-             term_reason_str (term_result->term_reason));
+             term_reason_str ((enum MHD_RequestTerminationCode)
+                              term_result->term_reason));
   fprintf (stream, "\n");
   fflush (stream);
 }
@@ -1848,7 +1850,9 @@ performTestQueries (struct MHD_Daemon *d, uint16_t d_port,
   if (! found_right_reason)
   {
     fprintf (stderr, "FAILED: termination callback was not called with "
-             "expected (%s) reason.\n", term_reason_str (expected_reason));
+             "expected (%s) reason.\n",
+             term_reason_str ((enum MHD_RequestTerminationCode)
+                              expected_reason));
     fflush (stderr);
     ret |= 1 << 1;
   }
@@ -1971,7 +1975,7 @@ startTestMhdDaemon (enum testMhdThreadsType thrType,
     dinfo = MHD_get_daemon_info (d, MHD_DAEMON_INFO_BIND_PORT);
     if ((NULL == dinfo) || (0 == dinfo->port))
       mhdErrorExitDesc ("MHD_get_daemon_info() failed");
-    *pport = (int) dinfo->port;
+    *pport = dinfo->port;
     if (0 == global_port)
       global_port = *pport; /* Reuse the same port for all tests */
   }
diff --git a/src/microhttpd/test_set_panic.c b/src/microhttpd/test_set_panic.c
index f1548380..a2d889c1 100644
--- a/src/microhttpd/test_set_panic.c
+++ b/src/microhttpd/test_set_panic.c
@@ -708,6 +708,7 @@ _MHD_dumbClient_send_req (struct _MHD_dumbClient *clnt)
 
 
 /* internal */
+_MHD_NORETURN /* not implemented */
 static void
 _MHD_dumbClient_recv_reply (struct _MHD_dumbClient *clnt)
 {
@@ -988,7 +989,7 @@ _MHD_dumbClient_close (struct _MHD_dumbClient *clnt)
 }
 
 
-static void
+_MHD_NORETURN static void
 socket_cb (void *cls,
            struct MHD_Connection *c,
            void **socket_context,
@@ -1409,7 +1410,7 @@ testNumThreadsForPool (enum testMhdPollType pollType)
 
 #define PANIC_MAGIC_CHECK 1133
 
-static void
+_MHD_NORETURN static void
 myPanicCallback (void *cls,
                  const char *file,
                  unsigned int line,
diff --git a/src/microhttpd/test_str.c b/src/microhttpd/test_str.c
index 16b63bd6..35e31319 100644
--- a/src/microhttpd/test_str.c
+++ b/src/microhttpd/test_str.c
@@ -932,7 +932,7 @@ static const struct str_with_value dstrs_w_values[] = {
 };
 
 /* strings that should overflow uint64_t */
-const struct str_with_len str_ovflw[] = {
+static const struct str_with_len str_ovflw[] = {
   D_STR_W_LEN ("18446744073709551616"),  /* 0x10000000000000000, UINT64_MAX+1 */
   D_STR_W_LEN ("18446744073709551620"),
   D_STR_W_LEN ("18446744083709551615"),
@@ -952,7 +952,7 @@ const struct str_with_len str_ovflw[] = {
 };
 
 /* strings that should not be convertible to numeric value */
-const struct str_with_len str_no_num[] = {
+static const struct str_with_len str_no_num[] = {
   D_STR_W_LEN ("zero"),
   D_STR_W_LEN ("one"),
   D_STR_W_LEN ("\xb9\xb2\xb3"),                                    /* superscript "123" in ISO-8859-1/CP1252 */
@@ -1089,7 +1089,7 @@ static const struct str_with_value xdstrs_w_values[] = {
 };
 
 /* hex strings that should overflow uint64_t */
-const struct str_with_len strx_ovflw[] = {
+static const struct str_with_len strx_ovflw[] = {
   D_STR_W_LEN ("10000000000000000"),            /* 0x10000000000000000, UINT64_MAX+1 */
   D_STR_W_LEN ("10000000000000001"),
   D_STR_W_LEN ("10000000000000002"),
@@ -3338,6 +3338,7 @@ check_str_from_uint64 (void)
                  (unsigned int) i, (unsigned int) t->str.len);
         exit (99);
       }
+      rs = 0; /* Only to mute compiler warning */
       for (b_size = 0; b_size <= t->str.len + 1; ++b_size)
       {
         /* fill buffer with pseudo-random values */
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c
index 5c95a10c..5836db6b 100644
--- a/src/microhttpd/test_upgrade.c
+++ b/src/microhttpd/test_upgrade.c
@@ -184,7 +184,7 @@ enum tls_tool
   TLS_LIB_GNUTLS
 };
 
-enum tls_tool use_tls_tool;
+static enum tls_tool use_tls_tool;
 
 #if defined(HTTPS_SUPPORT) && defined(HAVE_FORK) && defined(HAVE_WAITPID)
 /**
@@ -423,9 +423,9 @@ wr_create_from_plain_sckt (MHD_socket plain_sk)
 static int
 wr_connect (struct wr_socket *s,
             const struct sockaddr *addr,
-            int length)
+            unsigned int length)
 {
-  if (0 != connect (s->fd, addr, length))
+  if (0 != connect (s->fd, addr, (socklen_t) length))
   {
     testErrorLogDesc ("connect() failed");
     return -1;
@@ -797,7 +797,7 @@ send_all (struct wr_socket *sock,
 
 /**
  * Read character-by-character until we
- * get '\r\n\r\n'.
+ * get 'CRLNCRLN'.
  */
 static void
 recv_hdr (struct wr_socket *sock)
@@ -1154,7 +1154,7 @@ run_mhd_select_loop (struct MHD_Daemon *daemon)
  *
  * @param daemon daemon to run it for
  */
-static void
+_MHD_NORETURN static void
 run_mhd_poll_loop (struct MHD_Daemon *daemon)
 {
   (void) daemon; /* Unused. Silent compiler warning. */
@@ -1229,7 +1229,7 @@ run_mhd_epoll_loop (struct MHD_Daemon *daemon)
  */
 static void
 run_mhd_loop (struct MHD_Daemon *daemon,
-              int flags)
+              unsigned int flags)
 {
   if (0 == (flags & (MHD_USE_POLL | MHD_USE_EPOLL)))
     run_mhd_select_loop (daemon);
diff --git a/src/microhttpd/test_upgrade_large.c b/src/microhttpd/test_upgrade_large.c
index e6c9b01b..6f2331fa 100644
--- a/src/microhttpd/test_upgrade_large.c
+++ b/src/microhttpd/test_upgrade_large.c
@@ -350,7 +350,7 @@ enum tls_tool
   TLS_LIB_GNUTLS
 };
 
-enum tls_tool use_tls_tool;
+static enum tls_tool use_tls_tool;
 
 #if defined(HTTPS_SUPPORT) && defined(HAVE_FORK) && defined(HAVE_WAITPID)
 /**
@@ -589,9 +589,9 @@ wr_create_from_plain_sckt (MHD_socket plain_sk)
 static int
 wr_connect (struct wr_socket *s,
             const struct sockaddr *addr,
-            int length)
+            unsigned int length)
 {
-  if (0 != connect (s->fd, addr, length))
+  if (0 != connect (s->fd, addr, (socklen_t) length))
   {
     testErrorLogDesc ("connect() failed");
     return -1;
@@ -973,7 +973,7 @@ send_all (struct wr_socket *sock,
 
 /**
  * Read character-by-character until we
- * get '\r\n\r\n'.
+ * get 'CRLNCRLN'.
  */
 static void
 recv_hdr (struct wr_socket *sock)
@@ -1340,7 +1340,7 @@ run_mhd_select_loop (struct MHD_Daemon *daemon)
  *
  * @param daemon daemon to run it for
  */
-static void
+_MHD_NORETURN static void
 run_mhd_poll_loop (struct MHD_Daemon *daemon)
 {
   (void) daemon; /* Unused. Silent compiler warning. */
@@ -1417,7 +1417,7 @@ run_mhd_epoll_loop (struct MHD_Daemon *daemon)
  */
 static void
 run_mhd_loop (struct MHD_Daemon *daemon,
-              int flags)
+              unsigned int flags)
 {
   if (0 == (flags & (MHD_USE_POLL | MHD_USE_EPOLL)))
     run_mhd_select_loop (daemon);
diff --git a/src/testcurl/https/test_empty_response.c b/src/testcurl/https/test_empty_response.c
index b338fa2e..a8de5cd2 100644
--- a/src/testcurl/https/test_empty_response.c
+++ b/src/testcurl/https/test_empty_response.c
@@ -32,9 +32,7 @@
 #include <gcrypt.h>
 #endif /* MHD_HTTPS_REQUIRE_GRYPT */
 #include "tls_test_common.h"
-
-extern const char srv_key_pem[];
-extern const char srv_self_signed_cert_pem[];
+#include "tls_test_keys.h"
 
 static int oneone;
 
diff --git a/src/testcurl/https/test_https_get.c b/src/testcurl/https/test_https_get.c
index 184cc48e..62546324 100644
--- a/src/testcurl/https/test_https_get.c
+++ b/src/testcurl/https/test_https_get.c
@@ -33,9 +33,7 @@
 #include <gcrypt.h>
 #endif /* MHD_HTTPS_REQUIRE_GRYPT */
 #include "tls_test_common.h"
-
-extern const char srv_signed_cert_pem[];
-extern const char srv_signed_key_pem[];
+#include "tls_test_keys.h"
 
 
 static int global_port;
diff --git a/src/testcurl/https/test_https_get_iovec.c b/src/testcurl/https/test_https_get_iovec.c
index 3bdb610f..b2d46c3f 100644
--- a/src/testcurl/https/test_https_get_iovec.c
+++ b/src/testcurl/https/test_https_get_iovec.c
@@ -41,9 +41,7 @@
 #include <gcrypt.h>
 #endif /* MHD_HTTPS_REQUIRE_GRYPT */
 #include "tls_test_common.h"
-
-extern const char srv_signed_cert_pem[];
-extern const char srv_signed_key_pem[];
+#include "tls_test_keys.h"
 
 
 static int global_port;
diff --git a/src/testcurl/https/test_https_get_parallel.c b/src/testcurl/https/test_https_get_parallel.c
index 47f644d2..3de7cfe7 100644
--- a/src/testcurl/https/test_https_get_parallel.c
+++ b/src/testcurl/https/test_https_get_parallel.c
@@ -35,6 +35,7 @@
 #include <gcrypt.h>
 #endif /* MHD_HTTPS_REQUIRE_GRYPT */
 #include "tls_test_common.h"
+#include "tls_test_keys.h"
 
 #if defined(MHD_CPU_COUNT) && (MHD_CPU_COUNT + 0) < 4
 #undef MHD_CPU_COUNT
@@ -43,9 +44,6 @@
 #define MHD_CPU_COUNT 4
 #endif
 
-extern const char srv_key_pem[];
-extern const char srv_self_signed_cert_pem[];
-
 int curl_check_version (const char *req_version, ...);
 
 
diff --git a/src/testcurl/https/test_https_get_parallel_threads.c b/src/testcurl/https/test_https_get_parallel_threads.c
index 4853e7eb..08ee35e6 100644
--- a/src/testcurl/https/test_https_get_parallel_threads.c
+++ b/src/testcurl/https/test_https_get_parallel_threads.c
@@ -37,6 +37,7 @@
 #include <gcrypt.h>
 #endif /* MHD_HTTPS_REQUIRE_GRYPT */
 #include "tls_test_common.h"
+#include "tls_test_keys.h"
 
 #if defined(MHD_CPU_COUNT) && (MHD_CPU_COUNT + 0) < 4
 #undef MHD_CPU_COUNT
@@ -45,9 +46,6 @@
 #define MHD_CPU_COUNT 4
 #endif
 
-extern const char srv_key_pem[];
-extern const char srv_self_signed_cert_pem[];
-
 int curl_check_version (const char *req_version, ...);
 
 /**
diff --git a/src/testcurl/https/test_https_get_select.c b/src/testcurl/https/test_https_get_select.c
index 217c6bfa..3b45323b 100644
--- a/src/testcurl/https/test_https_get_select.c
+++ b/src/testcurl/https/test_https_get_select.c
@@ -33,9 +33,7 @@
 #include <gcrypt.h>
 #endif /* MHD_HTTPS_REQUIRE_GRYPT */
 #include "tls_test_common.h"
-
-extern const char srv_key_pem[];
-extern const char srv_self_signed_cert_pem[];
+#include "tls_test_keys.h"
 
 static int oneone;
 
diff --git a/src/testcurl/https/test_https_multi_daemon.c b/src/testcurl/https/test_https_multi_daemon.c
index 6c6e2b5d..10e7f6ed 100644
--- a/src/testcurl/https/test_https_multi_daemon.c
+++ b/src/testcurl/https/test_https_multi_daemon.c
@@ -33,9 +33,7 @@
 #include <gcrypt.h>
 #endif /* MHD_HTTPS_REQUIRE_GRYPT */
 #include "tls_test_common.h"
-
-extern const char srv_key_pem[];
-extern const char srv_self_signed_cert_pem[];
+#include "tls_test_keys.h"
 
 /*
  * assert initiating two separate daemons and having one shut down
diff --git a/src/testcurl/https/test_https_session_info.c b/src/testcurl/https/test_https_session_info.c
index b0ccb576..fc6f82f7 100644
--- a/src/testcurl/https/test_https_session_info.c
+++ b/src/testcurl/https/test_https_session_info.c
@@ -33,9 +33,7 @@
 #include <gcrypt.h>
 #endif /* MHD_HTTPS_REQUIRE_GRYPT */
 #include "tls_test_common.h"
-
-extern const char srv_key_pem[];
-extern const char srv_self_signed_cert_pem[];
+#include "tls_test_keys.h"
 
 struct MHD_Daemon *d;
 
diff --git a/src/testcurl/https/test_https_time_out.c b/src/testcurl/https/test_https_time_out.c
index 88877b60..939101a6 100644
--- a/src/testcurl/https/test_https_time_out.c
+++ b/src/testcurl/https/test_https_time_out.c
@@ -52,9 +52,7 @@
 #endif /* !WIN32_LEAN_AND_MEAN */
 #include <windows.h>
 #endif
-
-extern const char srv_key_pem[];
-extern const char srv_self_signed_cert_pem[];
+#include "tls_test_keys.h"
 
 static const int TIME_OUT = 2;
 
diff --git a/src/testcurl/https/test_tls_authentication.c b/src/testcurl/https/test_tls_authentication.c
index 7aedee72..22d47b26 100644
--- a/src/testcurl/https/test_tls_authentication.c
+++ b/src/testcurl/https/test_tls_authentication.c
@@ -33,9 +33,7 @@
 #include <gcrypt.h>
 #endif /* MHD_HTTPS_REQUIRE_GRYPT */
 #include "tls_test_common.h"
-
-extern const char srv_signed_cert_pem[];
-extern const char srv_signed_key_pem[];
+#include "tls_test_keys.h"
 
 
 /* perform a HTTP GET request via SSL/TLS */
diff --git a/src/testcurl/https/test_tls_extensions.c b/src/testcurl/https/test_tls_extensions.c
index 19b98e7e..3fe4ef71 100644
--- a/src/testcurl/https/test_tls_extensions.c
+++ b/src/testcurl/https/test_tls_extensions.c
@@ -32,12 +32,10 @@
 #ifdef MHD_HTTPS_REQUIRE_GRYPT
 #include <gcrypt.h>
 #endif /* MHD_HTTPS_REQUIRE_GRYPT */
+#include "tls_test_keys.h"
 
 #define MAX_EXT_DATA_LENGTH 256
 
-extern const char srv_key_pem[];
-extern const char srv_self_signed_cert_pem[];
-
 /**
  * Test daemon response to TLS client hello requests containing extensions
  *
diff --git a/src/testcurl/https/test_tls_options.c b/src/testcurl/https/test_tls_options.c
index d5aa8310..8c67a0c6 100644
--- a/src/testcurl/https/test_tls_options.c
+++ b/src/testcurl/https/test_tls_options.c
@@ -32,9 +32,7 @@
 #include <gcrypt.h>
 #endif /* MHD_HTTPS_REQUIRE_GRYPT */
 #include "tls_test_common.h"
-
-extern const char srv_key_pem[];
-extern const char srv_self_signed_cert_pem[];
+#include "tls_test_keys.h"
 
 int curl_check_version (const char *req_version, ...);
 
diff --git a/src/testcurl/https/tls_test_keys.h b/src/testcurl/https/tls_test_keys.h
index 0c662c9e..53e2151d 100644
--- a/src/testcurl/https/tls_test_keys.h
+++ b/src/testcurl/https/tls_test_keys.h
@@ -23,7 +23,7 @@
 /* Test Certificates */
 
 /* Certificate Authority cert */
-const char ca_cert_pem[] =
+static const char ca_cert_pem[] =
   "-----BEGIN CERTIFICATE-----\n\
 MIIGITCCBAmgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCUlUx\n\
 DzANBgNVBAgMBk1vc2NvdzEPMA0GA1UEBwwGTW9zY293MRswGQYDVQQKDBJ0ZXN0\n\
@@ -62,7 +62,7 @@ Gy5ZldbTMTjgn7fChNopz15ChPBnwFIjhm+S0CyiLRQAowfknRVq2IBkj7/5kOWg\n\
 
 
 /* test server key */
-const char srv_signed_key_pem[] =
+static const char srv_signed_key_pem[] =
   "-----BEGIN PRIVATE KEY-----\n\
 MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCff7amw9zNSE+h\n\
 rOMhBrzbbsJluUP3gmd8nOKY5MUimoPkxmAXfp2L0il+MPZT/ZEmo11q0k6J2jfG\n\
@@ -93,7 +93,7 @@ qdJNJ1DkyUc9dN2cliX4R+rG\n\
 -----END PRIVATE KEY-----";
 
 /* test server CA signed certificates */
-const char srv_signed_cert_pem[] =
+static const char srv_signed_cert_pem[] =
   "-----BEGIN CERTIFICATE-----\n\
 MIIFSzCCAzOgAwIBAgIBBDANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCUlUx\n\
 DzANBgNVBAgMBk1vc2NvdzEPMA0GA1UEBwwGTW9zY293MRswGQYDVQQKDBJ0ZXN0\n\
@@ -127,52 +127,52 @@ OT1qAbIblaRuWqCsid8BzP7ZQiAnAWgMRSUg1gzDwSwRhrYQRRWAyn/Qipzec+27\n\
 -----END CERTIFICATE-----";
 
 /* test server self signed certificates */
-const char srv_self_signed_cert_pem[] = "-----BEGIN CERTIFICATE-----\n"
-                                        "MIIC+jCCAeSgAwIBAgIES0KCvTALBgkqhkiG9w0BAQUwFzEVMBMGA1UEAxMMdGVz\n"
-                                        "dF9jYV9jZXJ0MB4XDTEwMDEwNTAwMDcyNVoXDTQ1MDMxMjAwMDcyNVowFzEVMBMG\n"
-                                        "A1UEAxMMdGVzdF9jYV9jZXJ0MIIBHzALBgkqhkiG9w0BAQEDggEOADCCAQkCggEA\n"
-                                        "tDEagv3p9OUhUL55jMucxjNK9N5cuozhcnrwDfBSU6oVrqm5kPqO1I7Cggzw68Y5\n"
-                                        "jhTcBi4FXmYOZppm1R3MhSJ5JSi/67Q7X4J5rnJLXYGN27qjMpnoGQ/2xmsNG/is\n"
-                                        "i+h/2vbtPU+WP9SEJnTfPLLpZ7KqCAk7FUUzKsuLx3/SOKtdkrWxPKwYTgnDEN6D\n"
-                                        "JL7tEzCnG5DFc4mQ7YW9PaRdC3rS1T8PvQ3jB2BUnohM0cFvKRuiU35tU7h7CPbL\n"
-                                        "4L66VglXoiwqmgcrwI2U968bD0+wRQ5c5bzNoshJOzN6CTMh1IhbklSh/Z6FA/e8\n"
-                                        "hj0yVo2tdllXuJGVs3PIEwIDAQABo1UwUzAMBgNVHRMBAf8EAjAAMBMGA1UdJQQM\n"
-                                        "MAoGCCsGAQUFBwMBMA8GA1UdDwEB/wQFAwMHIAAwHQYDVR0OBBYEFDfU7pAv9LYn\n"
-                                        "n7jb4WHl4+Vgi2FnMAsGCSqGSIb3DQEBBQOCAQEAkaembPQMmv6OOjbIod8zTatr\n"
-                                        "x5Bwkwp3TOE1NRyy2OytzFIYRUkNrZYlcmrxcbNNycIK41CNVXbriFCF8gcmIq9y\n"
-                                        "vaKZn8Gcy+vGggv+1BP9IAPBGKRwSi0wmq9JoGE8hx+qqTpRSdfbM/cps/09hicO\n"
-                                        "0EIR7kWEbvnpMBcMKYOtYE9Gce7rdSMWVAsKc174xn8vW6TxCUvmWFv5DPg5HG1v\n"
-                                        "y1SUX73qafRo+W6FN4UC/DHfwRhF8RSKEnVbmgDVCs6GHdKBjU2qRgYyj6nWZqK1\n"
-                                        "XFUTWgia+Fl3D9vlsXaFcSZKA0Bq1eojl0B0AfeYAxTFwPWXscKvt/bXZfH8bg==\n"
-                                        "-----END CERTIFICATE-----\n";
+static const char srv_self_signed_cert_pem[] = "-----BEGIN CERTIFICATE-----\n"
+                                               "MIIC+jCCAeSgAwIBAgIES0KCvTALBgkqhkiG9w0BAQUwFzEVMBMGA1UEAxMMdGVz\n"
+                                               "dF9jYV9jZXJ0MB4XDTEwMDEwNTAwMDcyNVoXDTQ1MDMxMjAwMDcyNVowFzEVMBMG\n"
+                                               "A1UEAxMMdGVzdF9jYV9jZXJ0MIIBHzALBgkqhkiG9w0BAQEDggEOADCCAQkCggEA\n"
+                                               "tDEagv3p9OUhUL55jMucxjNK9N5cuozhcnrwDfBSU6oVrqm5kPqO1I7Cggzw68Y5\n"
+                                               "jhTcBi4FXmYOZppm1R3MhSJ5JSi/67Q7X4J5rnJLXYGN27qjMpnoGQ/2xmsNG/is\n"
+                                               "i+h/2vbtPU+WP9SEJnTfPLLpZ7KqCAk7FUUzKsuLx3/SOKtdkrWxPKwYTgnDEN6D\n"
+                                               "JL7tEzCnG5DFc4mQ7YW9PaRdC3rS1T8PvQ3jB2BUnohM0cFvKRuiU35tU7h7CPbL\n"
+                                               "4L66VglXoiwqmgcrwI2U968bD0+wRQ5c5bzNoshJOzN6CTMh1IhbklSh/Z6FA/e8\n"
+                                               "hj0yVo2tdllXuJGVs3PIEwIDAQABo1UwUzAMBgNVHRMBAf8EAjAAMBMGA1UdJQQM\n"
+                                               "MAoGCCsGAQUFBwMBMA8GA1UdDwEB/wQFAwMHIAAwHQYDVR0OBBYEFDfU7pAv9LYn\n"
+                                               "n7jb4WHl4+Vgi2FnMAsGCSqGSIb3DQEBBQOCAQEAkaembPQMmv6OOjbIod8zTatr\n"
+                                               "x5Bwkwp3TOE1NRyy2OytzFIYRUkNrZYlcmrxcbNNycIK41CNVXbriFCF8gcmIq9y\n"
+                                               "vaKZn8Gcy+vGggv+1BP9IAPBGKRwSi0wmq9JoGE8hx+qqTpRSdfbM/cps/09hicO\n"
+                                               "0EIR7kWEbvnpMBcMKYOtYE9Gce7rdSMWVAsKc174xn8vW6TxCUvmWFv5DPg5HG1v\n"
+                                               "y1SUX73qafRo+W6FN4UC/DHfwRhF8RSKEnVbmgDVCs6GHdKBjU2qRgYyj6nWZqK1\n"
+                                               "XFUTWgia+Fl3D9vlsXaFcSZKA0Bq1eojl0B0AfeYAxTFwPWXscKvt/bXZfH8bg==\n"
+                                               "-----END CERTIFICATE-----\n";
 
 /* test server key */
-const char srv_key_pem[] = "-----BEGIN RSA PRIVATE KEY-----\n"
-                           "MIIEpAIBAAKCAQEAtDEagv3p9OUhUL55jMucxjNK9N5cuozhcnrwDfBSU6oVrqm5\n"
-                           "kPqO1I7Cggzw68Y5jhTcBi4FXmYOZppm1R3MhSJ5JSi/67Q7X4J5rnJLXYGN27qj\n"
-                           "MpnoGQ/2xmsNG/isi+h/2vbtPU+WP9SEJnTfPLLpZ7KqCAk7FUUzKsuLx3/SOKtd\n"
-                           "krWxPKwYTgnDEN6DJL7tEzCnG5DFc4mQ7YW9PaRdC3rS1T8PvQ3jB2BUnohM0cFv\n"
-                           "KRuiU35tU7h7CPbL4L66VglXoiwqmgcrwI2U968bD0+wRQ5c5bzNoshJOzN6CTMh\n"
-                           "1IhbklSh/Z6FA/e8hj0yVo2tdllXuJGVs3PIEwIDAQABAoIBAAEtcg+LFLGtoxjq\n"
-                           "b+tFttBJfbRcfdG6ocYqBGmUXF+MgFs573DHX3sHNOQxlaNHtSgIclF1eYgNZFFt\n"
-                           "VLIoBFTzfEQXoFosPUDoEuqVMeXLttmD7P2jwL780XJLZ4Xj6GY07npq1iGBcEZf\n"
-                           "yCcdoyGkr9jgc5Auyis8DStGg/jfUBC4NBvF0GnuuNPAdYRPKUpKw9EatI+FdMjy\n"
-                           "BuroD90fhdkK8EwMEVb9P17bdIc1MCIZFpUE9YHjVdK/oxCUhQ8KRfdbI4JU5Zh3\n"
-                           "UtO6Jm2wFuP3VmeVpPvE/C2rxI70pyl6HMSiFGNc0rhJYCQ+yhohWj7nZ67H4vLx\n"
-                           "plv5LxkCgYEAz7ewou8oFafDAMNoxaqKudvUg+lxXewdLDKaYBF5ACi9uAPCJ+v7\n"
-                           "M5c/fvPFn/XHzo7xaXbtTAH3Z5xzBs+80OsvL+e1Ut4xR+ELRkybknh/s2wQeABk\n"
-                           "Kb0vA59ukQGj12LV5phZMaVoXe6KJ7hZnN62d3K6m1wGE/k58i4pPLUCgYEA3hN8\n"
-                           "G95zW7g0jVdSr+KUeVmephph9yh8Yb+3I3ojwOIv6d45TopGx8pFZlnBAMZf1ZQx\n"
-                           "DIhzJNnaqZy/4w7RNaOGWnPA/5f+MIoHBiLGEEmfHC3lt087Yp9OuwDUHwpETYdV\n"
-                           "o+KBCvVh60Et3bZUgF/1k/3YXxn8J5dsmJsjNqcCgYBLflyRa1BrRnTGMz9CEDCp\n"
-                           "Si9b3h1Y4Hbd2GppHhCXMTd6yMrpDYhYANGQB3M9Juv+s88j4JhwNoq/uonH4Pqk\n"
-                           "B8Y3qAQr4RuSH0WkwDUOsALhqBX4N1QwI1USAQEDbNAqeP5698X7GD3tXcQSmZrg\n"
-                           "O8WfdjBCRNjkq4EW9xX/vQKBgQDONtmwJ0iHiu2BseyeVo/4fzfKlgUSNQ4K1rOA\n"
-                           "xhIdMeu8Bxa/z7caHsGC4SVPSuYCtbE2Kh6BwapChcPJXCD45fgEViiJLuJiwEj1\n"
-                           "caTpyvNsf1IoffJvCe9ZxtMyX549P8ZOgC3Dt0hN5CBrGLwu2Ox5l+YrqT10pi+5\n"
-                           "JZX1UQKBgQCrcXrdkkDAc/a4+PxNRpJRLcU4fhv8/lr+UWItE8eUe7bd25bTQfQm\n"
-                           "VpNKc/kAJ66PjIED6fy3ADhd2y4naT2a24uAgQ/M494J68qLnGh6K4JU/09uxR2v\n"
-                           "1i2q/4FNLdFFk1XP4iNnTHRLZ+NYr2p5Y9RcvQfTjOauz8Ahav0lyg==\n"
-                           "-----END RSA PRIVATE KEY-----\n";
+static const char srv_key_pem[] = "-----BEGIN RSA PRIVATE KEY-----\n"
+                                  "MIIEpAIBAAKCAQEAtDEagv3p9OUhUL55jMucxjNK9N5cuozhcnrwDfBSU6oVrqm5\n"
+                                  "kPqO1I7Cggzw68Y5jhTcBi4FXmYOZppm1R3MhSJ5JSi/67Q7X4J5rnJLXYGN27qj\n"
+                                  "MpnoGQ/2xmsNG/isi+h/2vbtPU+WP9SEJnTfPLLpZ7KqCAk7FUUzKsuLx3/SOKtd\n"
+                                  "krWxPKwYTgnDEN6DJL7tEzCnG5DFc4mQ7YW9PaRdC3rS1T8PvQ3jB2BUnohM0cFv\n"
+                                  "KRuiU35tU7h7CPbL4L66VglXoiwqmgcrwI2U968bD0+wRQ5c5bzNoshJOzN6CTMh\n"
+                                  "1IhbklSh/Z6FA/e8hj0yVo2tdllXuJGVs3PIEwIDAQABAoIBAAEtcg+LFLGtoxjq\n"
+                                  "b+tFttBJfbRcfdG6ocYqBGmUXF+MgFs573DHX3sHNOQxlaNHtSgIclF1eYgNZFFt\n"
+                                  "VLIoBFTzfEQXoFosPUDoEuqVMeXLttmD7P2jwL780XJLZ4Xj6GY07npq1iGBcEZf\n"
+                                  "yCcdoyGkr9jgc5Auyis8DStGg/jfUBC4NBvF0GnuuNPAdYRPKUpKw9EatI+FdMjy\n"
+                                  "BuroD90fhdkK8EwMEVb9P17bdIc1MCIZFpUE9YHjVdK/oxCUhQ8KRfdbI4JU5Zh3\n"
+                                  "UtO6Jm2wFuP3VmeVpPvE/C2rxI70pyl6HMSiFGNc0rhJYCQ+yhohWj7nZ67H4vLx\n"
+                                  "plv5LxkCgYEAz7ewou8oFafDAMNoxaqKudvUg+lxXewdLDKaYBF5ACi9uAPCJ+v7\n"
+                                  "M5c/fvPFn/XHzo7xaXbtTAH3Z5xzBs+80OsvL+e1Ut4xR+ELRkybknh/s2wQeABk\n"
+                                  "Kb0vA59ukQGj12LV5phZMaVoXe6KJ7hZnN62d3K6m1wGE/k58i4pPLUCgYEA3hN8\n"
+                                  "G95zW7g0jVdSr+KUeVmephph9yh8Yb+3I3ojwOIv6d45TopGx8pFZlnBAMZf1ZQx\n"
+                                  "DIhzJNnaqZy/4w7RNaOGWnPA/5f+MIoHBiLGEEmfHC3lt087Yp9OuwDUHwpETYdV\n"
+                                  "o+KBCvVh60Et3bZUgF/1k/3YXxn8J5dsmJsjNqcCgYBLflyRa1BrRnTGMz9CEDCp\n"
+                                  "Si9b3h1Y4Hbd2GppHhCXMTd6yMrpDYhYANGQB3M9Juv+s88j4JhwNoq/uonH4Pqk\n"
+                                  "B8Y3qAQr4RuSH0WkwDUOsALhqBX4N1QwI1USAQEDbNAqeP5698X7GD3tXcQSmZrg\n"
+                                  "O8WfdjBCRNjkq4EW9xX/vQKBgQDONtmwJ0iHiu2BseyeVo/4fzfKlgUSNQ4K1rOA\n"
+                                  "xhIdMeu8Bxa/z7caHsGC4SVPSuYCtbE2Kh6BwapChcPJXCD45fgEViiJLuJiwEj1\n"
+                                  "caTpyvNsf1IoffJvCe9ZxtMyX549P8ZOgC3Dt0hN5CBrGLwu2Ox5l+YrqT10pi+5\n"
+                                  "JZX1UQKBgQCrcXrdkkDAc/a4+PxNRpJRLcU4fhv8/lr+UWItE8eUe7bd25bTQfQm\n"
+                                  "VpNKc/kAJ66PjIED6fy3ADhd2y4naT2a24uAgQ/M494J68qLnGh6K4JU/09uxR2v\n"
+                                  "1i2q/4FNLdFFk1XP4iNnTHRLZ+NYr2p5Y9RcvQfTjOauz8Ahav0lyg==\n"
+                                  "-----END RSA PRIVATE KEY-----\n";
 
 #endif