diff options
| author | Stef Walter <stefw@gnome.org> | 2012-03-10 07:57:41 +0100 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2012-04-07 16:44:27 +0200 |
| commit | 5c4a86255897206875d72fee0c41e657dce3e39f (patch) | |
| tree | be8ff4a2950aec3006a6c8310932503b549556a0 /pkcs11/secret-store | |
| parent | 46748de8fc812dbc384e47b5910d522f57bbc79c (diff) | |
| download | gnome-keyring-5c4a86255897206875d72fee0c41e657dce3e39f.tar.gz | |
Bring over new egg'd components from gcr
* Updated ASN.1, armor, bytes, openssl, etc.
Diffstat (limited to 'pkcs11/secret-store')
| -rw-r--r-- | pkcs11/secret-store/gkm-secret-standalone.c | 2 | ||||
| -rw-r--r-- | pkcs11/secret-store/tests/dump-keyring0-format.c | 2 | ||||
| -rw-r--r-- | pkcs11/secret-store/tests/mock-secret-module.c | 2 | ||||
| -rw-r--r-- | pkcs11/secret-store/tests/test-secret-data.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkcs11/secret-store/gkm-secret-standalone.c b/pkcs11/secret-store/gkm-secret-standalone.c index 70924b9c..cfc3956f 100644 --- a/pkcs11/secret-store/gkm-secret-standalone.c +++ b/pkcs11/secret-store/gkm-secret-standalone.c @@ -35,7 +35,7 @@ #include "pkcs11/pkcs11.h" /* Module callbacks for secure memory */ -EGG_SECURE_GLIB_DEFINITIONS (); +EGG_SECURE_DEFINE_GLIB_GLOBALS (); const gchar* g_module_check_init (GModule *module); diff --git a/pkcs11/secret-store/tests/dump-keyring0-format.c b/pkcs11/secret-store/tests/dump-keyring0-format.c index 9b42d9fa..0da05ed3 100644 --- a/pkcs11/secret-store/tests/dump-keyring0-format.c +++ b/pkcs11/secret-store/tests/dump-keyring0-format.c @@ -55,7 +55,7 @@ enum { ACCESS_REMOVE = 1 << 2 }; -EGG_SECURE_GLIB_DEFINITIONS (); +EGG_SECURE_DEFINE_GLIB_GLOBALS (); #define KEYRING_FILE_HEADER "GnomeKeyring\n\r\0\n" #define KEYRING_FILE_HEADER_LEN 16 diff --git a/pkcs11/secret-store/tests/mock-secret-module.c b/pkcs11/secret-store/tests/mock-secret-module.c index 6cb698c0..7022e690 100644 --- a/pkcs11/secret-store/tests/mock-secret-module.c +++ b/pkcs11/secret-store/tests/mock-secret-module.c @@ -42,7 +42,7 @@ #include <string.h> -EGG_SECURE_GLIB_DEFINITIONS (); +EGG_SECURE_DEFINE_GLIB_GLOBALS (); static GMutex *mutex = NULL; static gchar *directory = NULL; diff --git a/pkcs11/secret-store/tests/test-secret-data.c b/pkcs11/secret-store/tests/test-secret-data.c index a71e3019..c1bf54bb 100644 --- a/pkcs11/secret-store/tests/test-secret-data.c +++ b/pkcs11/secret-store/tests/test-secret-data.c @@ -36,7 +36,7 @@ #include <stdio.h> #include <string.h> -EGG_SECURE_GLIB_DEFINITIONS (); +EGG_SECURE_DEFINE_GLIB_GLOBALS (); static void test_new (void) |