summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Walter <stefw@src.gnome.org>2008-04-06 02:39:08 +0000
committerStefan Walter <stefw@src.gnome.org>2008-04-06 02:39:08 +0000
commite1ec54ab836b3866548b357bdb5cb717e2914d97 (patch)
tree9cd98002205fccc4700f3389f9f1ed88b368f208
parent508892c84378b705b04ff00d3dd823f75b0a5920 (diff)
downloadgnome-keyring-e1ec54ab836b3866548b357bdb5cb717e2914d97.tar.gz
Fix compiler warnings about uninitialized variables. Patch by Alex
* pkix/gkr-pkix-openssl.c: Fix compiler warnings about uninitialized variables. Patch by Alex Converse. Fixes bug #523928 svn path=/trunk/; revision=1129
-rw-r--r--ChangeLog6
-rw-r--r--pkix/gkr-pkix-openssl.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 828ea559..469441f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-05 Stef Walter <stef@memberwebs.com>
+
+ * pkix/gkr-pkix-openssl.c: Fix compiler warnings about
+ uninitialized variables. Patch by Alex Converse. Fixes
+ bug #523928
+
2008-03-20 Sebastian Dröge <slomo@circular-chaos.org>
* daemon/gkr-daemon.c: Include pkcs11 in the --help message too.
diff --git a/pkix/gkr-pkix-openssl.c b/pkix/gkr-pkix-openssl.c
index c39661b2..3b93d327 100644
--- a/pkix/gkr-pkix-openssl.c
+++ b/pkix/gkr-pkix-openssl.c
@@ -209,9 +209,11 @@ gkr_pkix_openssl_decrypt_block (const gchar *dekinfo, const gchar *password,
guchar **decrypted, gsize *n_decrypted)
{
gcry_cipher_hd_t ch;
- guchar *key, *iv;
- int algo, mode;
+ guchar *key = NULL;
+ guchar *iv = NULL;
int gcry, ivlen;
+ int algo = 0;
+ int mode = 0;
if (!parse_dekinfo (dekinfo, &algo, &mode, &iv))
return GKR_PKIX_UNRECOGNIZED;