system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-01 13:55:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
* 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
This commit is contained in:
Dan Williams 2008-11-13 21:47:52 +00:00
parent e2f65ce12a
commit 543d9b995c
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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)

4
libnm-util/crypto.c
View file

@ -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)) {