diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-08-31 21:06:00 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-09-01 11:30:30 +0200 |
| commit | c80fcdeb016e197be54ad7ebbefeeb9823d76155 (patch) | |
| tree | c2c7447776f86af05ed5c3653e3eb9c99e0030b2 /pkcs11 | |
| parent | 08aa3f057147d345b8e8e14affbec01750e7c4cf (diff) | |
| download | gnome-keyring-c80fcdeb016e197be54ad7ebbefeeb9823d76155.tar.gz | |
egg: Make OpenSSL PEM routines return outer block as well.
* We expose this in GcrParser so that we can reparse a block that needs
a password.
Diffstat (limited to 'pkcs11')
| -rw-r--r-- | pkcs11/gkm/tests/test-data-der.c | 9 | ||||
| -rw-r--r-- | pkcs11/roots-store/gkm-roots-module.c | 9 | ||||
| -rw-r--r-- | pkcs11/ssh-store/gkm-ssh-openssh.c | 18 |
3 files changed, 28 insertions, 8 deletions
diff --git a/pkcs11/gkm/tests/test-data-der.c b/pkcs11/gkm/tests/test-data-der.c index ac1ac487..6b5531d9 100644 --- a/pkcs11/gkm/tests/test-data-der.c +++ b/pkcs11/gkm/tests/test-data-der.c @@ -297,8 +297,13 @@ test_write_certificate (Test *test, gconstpointer unused) } static void -on_ca_certificate_public_key_info (GQuark type, const guchar *data, gsize n_data, - GHashTable *headers, gpointer user_data) +on_ca_certificate_public_key_info (GQuark type, + const guchar *data, + gsize n_data, + const gchar *outer, + gsize n_outer, + GHashTable *headers, + gpointer user_data) { GNode *asn1 = NULL; GkmDataResult res; diff --git a/pkcs11/roots-store/gkm-roots-module.c b/pkcs11/roots-store/gkm-roots-module.c index 8f978956..32569f41 100644 --- a/pkcs11/roots-store/gkm-roots-module.c +++ b/pkcs11/roots-store/gkm-roots-module.c @@ -136,8 +136,13 @@ add_certificate_for_data (GkmRootsModule *self, const guchar *data, } static void -parsed_pem_block (GQuark type, const guchar *data, gsize n_data, - GHashTable *headers, gpointer user_data) +parsed_pem_block (GQuark type, + const guchar *data, + gsize n_data, + const gchar *outer, + gsize n_outer, + GHashTable *headers, + gpointer user_data) { static GQuark PEM_CERTIFICATE; static volatile gsize quarks_inited = 0; diff --git a/pkcs11/ssh-store/gkm-ssh-openssh.c b/pkcs11/ssh-store/gkm-ssh-openssh.c index 46e86605..a20ce92b 100644 --- a/pkcs11/ssh-store/gkm-ssh-openssh.c +++ b/pkcs11/ssh-store/gkm-ssh-openssh.c @@ -205,8 +205,13 @@ is_private_key_type (GQuark type) } static void -parsed_pem_block (GQuark type, const guchar *data, gsize n_data, - GHashTable *headers, gpointer user_data) +parsed_pem_block (GQuark type, + const guchar *data, + gsize n_data, + const gchar *outer, + gsize n_outer, + GHashTable *headers, + gpointer user_data) { ParsePrivate *ctx = (ParsePrivate*)user_data; const gchar *dekinfo; @@ -233,8 +238,13 @@ parsed_pem_block (GQuark type, const guchar *data, gsize n_data, } static void -digest_pem_block (GQuark type, const guchar *data, gsize n_data, - GHashTable *headers, gpointer user_data) +digest_pem_block (GQuark type, + const guchar *data, + gsize n_data, + const gchar *outer, + gsize n_outer, + GHashTable *headers, + gpointer user_data) { gchar **result = (gchar**)user_data; |