summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tests/certificate_set_x509_crl.c4
-rw-r--r--tests/mini-record-range.c2
-rw-r--r--tests/mini-x509-callbacks.c2
-rw-r--r--tests/openpgp-auth2.c16
-rw-r--r--tests/record-sizes-range.c14
-rw-r--r--tests/resume.c12
6 files changed, 24 insertions, 26 deletions
diff --git a/tests/certificate_set_x509_crl.c b/tests/certificate_set_x509_crl.c
index 7aa19581cc..eebfff7557 100644
--- a/tests/certificate_set_x509_crl.c
+++ b/tests/certificate_set_x509_crl.c
@@ -32,7 +32,7 @@
#include <gnutls/gnutls.h>
#include <gnutls/x509.h>
-static char crl[] =
+static char g_crl[] =
"-----BEGIN X509 CRL-----\n"
"MIIB9DCCAV8CAQEwCwYJKoZIhvcNAQEFMIIBCDEXMBUGA1UEChMOVmVyaVNpZ24s\n"
"IEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxRjBEBgNVBAsT\n"
@@ -54,7 +54,7 @@ int main(void)
{
int rc;
gnutls_certificate_credentials_t crt;
- gnutls_datum_t crldatum = { (uint8_t *) crl, strlen(crl) };
+ gnutls_datum_t crldatum = { (uint8_t *) g_crl, strlen(g_crl) };
gnutls_x509_crl_t crl;
rc = global_init();
diff --git a/tests/mini-record-range.c b/tests/mini-record-range.c
index 7d35b9303c..f1d56e8e0f 100644
--- a/tests/mini-record-range.c
+++ b/tests/mini-record-range.c
@@ -29,7 +29,7 @@
#if 1
-int main()
+int main(void)
{
exit(77);
}
diff --git a/tests/mini-x509-callbacks.c b/tests/mini-x509-callbacks.c
index 66ab17b6d4..8b596aec22 100644
--- a/tests/mini-x509-callbacks.c
+++ b/tests/mini-x509-callbacks.c
@@ -67,7 +67,7 @@ unsigned int msg_order[] = {
};
static int handshake_callback(gnutls_session_t session, unsigned int htype,
- unsigned post, unsigned int incoming)
+ unsigned post, unsigned int incoming, const gnutls_datum_t *rawmsg)
{
static unsigned idx = 0;
unsigned int msg;
diff --git a/tests/openpgp-auth2.c b/tests/openpgp-auth2.c
index 12accbaa67..6bec3b9141 100644
--- a/tests/openpgp-auth2.c
+++ b/tests/openpgp-auth2.c
@@ -46,7 +46,7 @@
* addition it tests DSS signatures under that.
*/
-static const char message[] = "Hello, brave GNU world!";
+static const char g_message[] = "Hello, brave GNU world!";
/* The OpenPGP key pair for use and the key ID in those keys. */
static const char pub_key_file[] = "../guile/tests/openpgp-pub.asc";
@@ -150,10 +150,10 @@ void doit()
printf("client handshake successful\n");
sent =
- gnutls_record_send(session, message, sizeof(message));
- if (sent != sizeof(message))
+ gnutls_record_send(session, g_message, sizeof(g_message));
+ if (sent != sizeof(g_message))
fail("client sent %li vs. %li\n",
- (long) sent, (long) sizeof(message));
+ (long) sent, (long) sizeof(g_message));
err = gnutls_bye(session, GNUTLS_SHUT_RDWR);
if (err != 0)
@@ -169,7 +169,7 @@ void doit()
gnutls_session_t session;
gnutls_dh_params_t dh_params;
gnutls_certificate_credentials_t cred;
- char greetings[sizeof(message) * 2];
+ char greetings[sizeof(g_message) * 2];
ssize_t received;
pid_t done;
int status;
@@ -231,10 +231,10 @@ void doit()
received =
gnutls_record_recv(session, greetings,
sizeof(greetings));
- if (received != sizeof(message)
- || memcmp(greetings, message, sizeof(message)))
+ if (received != sizeof(g_message)
+ || memcmp(greetings, g_message, sizeof(g_message)))
fail("server received %li vs. %li\n",
- (long) received, (long) sizeof(message));
+ (long) received, (long) sizeof(g_message));
err = gnutls_bye(session, GNUTLS_SHUT_RDWR);
if (err != 0)
diff --git a/tests/record-sizes-range.c b/tests/record-sizes-range.c
index 2f60649542..b4f2825fa0 100644
--- a/tests/record-sizes-range.c
+++ b/tests/record-sizes-range.c
@@ -45,7 +45,7 @@ static void tls_log_func(int level, const char *str)
#define MAX_BUF 32*1024
#define MAX_SEND 16384
-static char b1[MAX_BUF + 1];
+static char buffer1[MAX_BUF + 1];
static char buffer[MAX_BUF + 1];
static void try_send(gnutls_session_t client, gnutls_session_t server,
@@ -134,22 +134,22 @@ void doit(void)
gnutls_transport_set_pull_function(client, client_pull);
gnutls_transport_set_ptr(client, client);
- memset(b1, 0, sizeof(b1));
+ memset(buffer1, 0, sizeof(buffer1));
HANDSHAKE(client, server);
if (debug)
success("Handshake established\n");
- memset(b1, 1, MAX_BUF);
+ memset(buffer1, 1, MAX_BUF);
range.low = 1024;
range.high = MAX_SEND;
- try_send(client, server, b1, MAX_SEND, buffer, MAX_BUF, &range);
- try_send(client, server, b1, 1024, buffer, MAX_BUF, &range);
- try_send(client, server, b1, 4096, buffer, MAX_BUF, &range);
- /*try_send(client, server, b1, 128, buffer, MAX_BUF, &range) */ ;
+ try_send(client, server, buffer1, MAX_SEND, buffer, MAX_BUF, &range);
+ try_send(client, server, buffer1, 1024, buffer, MAX_BUF, &range);
+ try_send(client, server, buffer1, 4096, buffer, MAX_BUF, &range);
+ /*try_send(client, server, buffer1, 128, buffer, MAX_BUF, &range) */ ;
if (debug)
diff --git a/tests/resume.c b/tests/resume.c
index d845a779bf..55cd92bf0a 100644
--- a/tests/resume.c
+++ b/tests/resume.c
@@ -534,11 +534,9 @@ wrap_db_store(void *dbf, gnutls_datum_t key, gnutls_datum_t data)
static gnutls_datum_t wrap_db_fetch(void *dbf, gnutls_datum_t key)
{
gnutls_datum_t res = { NULL, 0 };
- int i;
+ unsigned i;
if (debug) {
- unsigned int i;
-
fprintf(stderr, "resume db looking for (%d): ", key.size);
for (i = 0; i < key.size; i++) {
fprintf(stderr, "%02x", key.data[i] & 0xFF);
@@ -567,12 +565,12 @@ static gnutls_datum_t wrap_db_fetch(void *dbf, gnutls_datum_t key)
res.size);
if (debug) {
- unsigned int i;
+ unsigned int j;
printf("data:\n");
- for (i = 0; i < res.size; i++) {
+ for (j = 0; j < res.size; j++) {
printf("%02x ",
- res.data[i] & 0xFF);
- if ((i + 1) % 16 == 0)
+ res.data[j] & 0xFF);
+ if ((j + 1) % 16 == 0)
printf("\n");
}
printf("\n");
View Lorry Controller Status