On Sunday 06 of December 2009 17:54:22 Peter Stuge wrote:
> All the other changes, for missing initializations and such, are
> great! Could you make them into a separate patch?

And maybe yet another one to consider...

Kamil
From 79a91d22dd98d362715401863af076171e451541 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdu...@redhat.com>
Date: Sun, 6 Dec 2009 18:25:51 +0100
Subject: [PATCH] fix some less common gcc warnings

---
 src/openssl.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/openssl.c b/src/openssl.c
index 000c9ec..ab62940 100644
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -215,6 +215,8 @@ aes_ctr_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
     if (c == NULL)
 	return 0;
 
+    (void) enc;
+
     AES_set_encrypt_key(key, 8 * ctx->key_len, &c->key);
     memcpy(c->ctr, iv, AES_BLOCK_SIZE);
 
@@ -327,6 +329,7 @@ read_private_key_from_file(void ** key_ctx, LIBSSH2_SESSION * session,
                            unsigned const char *passphrase)
 {
     BIO * bp;
+    (void) session;
 
     *key_ctx = NULL;
 
@@ -335,7 +338,7 @@ read_private_key_from_file(void ** key_ctx, LIBSSH2_SESSION * session,
         return -1;
     }
 
-    *key_ctx = read_private_key(bp, NULL, (void *) passphrase_cb,
+    *key_ctx = read_private_key(bp, NULL, (pem_password_cb *) passphrase_cb,
                                 (void *) passphrase);
 
     BIO_free(bp);
-- 
1.6.2.5

_______________________________________________
libssh2-devel http://cool.haxx.se/cgi-bin/mailman/listinfo/libssh2-devel

Reply via email to