Fix warnings found by GCC 4.9.

Too many arguments for format string in a few error messages.

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 87ba30a..66b7d03 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -217,7 +217,7 @@ bool send_metakey(connection_t *c) {
 
        if (1 != RAND_bytes((unsigned char *)c->outkey, len)) {
                int err = ERR_get_error();
 
        if (1 != RAND_bytes((unsigned char *)c->outkey, len)) {
                int err = ERR_get_error();

-               logger(LOG_ERR, "Failed to generate meta key (%s)", "SEND_METAKEY", ERR_error_string(err, NULL));
+               logger(LOG_ERR, "Failed to generate meta key (%s)", ERR_error_string(err, NULL));

                return false;
        }
 
                return false;
        }
 


@@ -398,7 +398,7 @@ bool send_challenge(connection_t *c) {
 
        if (1 != RAND_bytes((unsigned char *)c->hischallenge, len)) {
                int err = ERR_get_error();
 
        if (1 != RAND_bytes((unsigned char *)c->hischallenge, len)) {
                int err = ERR_get_error();

-               logger(LOG_ERR, "Failed to generate challenge (%s)", "SEND_CHALLENGE", ERR_error_string(err, NULL));
+               logger(LOG_ERR, "Failed to generate challenge (%s)", ERR_error_string(err, NULL));

                return false; // Do not send predictable challenges, let connection attempt fail.
        }
 
                return false; // Do not send predictable challenges, let connection attempt fail.
        }
 

diff --git a/src/protocol_key.c b/src/protocol_key.c
index b55e830..22d2ff5 100644 (file)
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -159,7 +159,7 @@ bool send_ans_key(node_t *to) {
        // Create a new key
        if (1 != RAND_bytes((unsigned char *)to->inkey, to->inkeylength)) {
                int err = ERR_get_error();
        // Create a new key
        if (1 != RAND_bytes((unsigned char *)to->inkey, to->inkeylength)) {
                int err = ERR_get_error();

-               logger(LOG_ERR, "Failed to generate random for key (%s)", "SEND_ANS_KEY", ERR_error_string(err, NULL));
+               logger(LOG_ERR, "Failed to generate random for key (%s)", ERR_error_string(err, NULL));

                return false; // Do not send insecure keys, let connection attempt fail.
        }
 
                return false; // Do not send insecure keys, let connection attempt fail.
        }