[gnome-keyring/gnome-3-0] Fix algorithm check in prepare_and_encode_pkcs8_cipher
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring/gnome-3-0] Fix algorithm check in prepare_and_encode_pkcs8_cipher
- Date: Wed, 1 Jun 2011 09:14:19 +0000 (UTC)
commit 3098bd4d5a4abc6e7bc83e6dccd64aa359c9dc49
Author: Joshua Roys <roysjosh gmail com>
Date: Tue May 31 22:49:26 2011 -0400
Fix algorithm check in prepare_and_encode_pkcs8_cipher
pkcs11/gkm/gkm-data-der.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/pkcs11/gkm/gkm-data-der.c b/pkcs11/gkm/gkm-data-der.c
index 4421ef6..8e60651 100644
--- a/pkcs11/gkm/gkm-data-der.c
+++ b/pkcs11/gkm/gkm-data-der.c
@@ -957,8 +957,8 @@ prepare_and_encode_pkcs8_cipher (GNode *asn, const gchar *password,
init_quarks ();
/* Make sure the encryption algorithm works */
- g_return_val_if_fail (gcry_cipher_algo_info (OID_PKCS12_PBE_3DES_SHA1,
- GCRYCTL_TEST_ALGO, NULL, 0), NULL);
+ g_return_val_if_fail (gcry_cipher_algo_info (gcry_cipher_map_name (g_quark_to_string (OID_PKCS12_PBE_3DES_SHA1)),
+ GCRYCTL_TEST_ALGO, NULL, 0) == 0, NULL);
/* The encryption algorithm */
if(!egg_asn1x_set_oid_as_quark (egg_asn1x_node (asn, "encryptionAlgorithm", "algorithm", NULL),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]