2008-11-13 Dan Williams <dcbw@redhat.com>

	* libnm-util/crypto.c
		- (crypto_get_private_key_data): fix bad initial arg type checking
			from pkcs#12 patch

git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4281 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

diff --git a/ChangeLog b/ChangeLog
index c849653..46af245 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-13  Dan Williams  <dcbw@redhat.com>
+
+       * libnm-util/crypto.c
+               - (crypto_get_private_key_data): fix bad initial arg type checking
+                       from pkcs#12 patch
+
 2008-11-13  Dan Williams  <dcbw@redhat.com>
 
        Add support for PKCS#12 private keys (bgo #558982)

diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c
index faf4f75..3bd7405 100644 (file)
--- a/libnm-util/crypto.c
+++ b/libnm-util/crypto.c
@@ -480,9 +480,9 @@ crypto_get_private_key_data (GByteArray *contents,
        g_return_val_if_fail (contents != NULL, NULL);
        g_return_val_if_fail (password != NULL, NULL);
        g_return_val_if_fail (out_key_type != NULL, NULL);
-       g_return_val_if_fail (out_key_type == NM_CRYPTO_KEY_TYPE_UNKNOWN, NULL);
+       g_return_val_if_fail (*out_key_type == NM_CRYPTO_KEY_TYPE_UNKNOWN, NULL);
        g_return_val_if_fail (out_file_type != NULL, NULL);
-       g_return_val_if_fail (out_file_type == NM_CRYPTO_FILE_FORMAT_UNKNOWN, NULL);
+       g_return_val_if_fail (*out_file_type == NM_CRYPTO_FILE_FORMAT_UNKNOWN, NULL);
 
        /* Try PKCS#12 first */
        if (crypto_verify_pkcs12 (contents, password, NULL)) {