Merge branch 'wip/dueno/build-fixes' into 'master'

Fix build issues after 0.20.0 release

Closes #36 and #35

See merge request GNOME/libsecret!45

2 files changed, 23 insertions, 19 deletions

diff --git a/libsecret/secret-file-collection.c b/libsecret/secret-file-collection.c
index 79863ea..8ffb542 100644
--- a/libsecret/secret-file-collection.c
+++ b/libsecret/secret-file-collection.c
@@ -68,7 +68,7 @@ enum {
 };
 
 static gboolean
-derive (SecretFileCollection *self)
+do_derive_key (SecretFileCollection *self)
 {
 	const gchar *password;
 	gsize n_password;
@@ -93,9 +93,9 @@ derive (SecretFileCollection *self)
 }
 
 static gboolean
-calculate_mac (SecretFileCollection *self,
-	       const guint8 *value, gsize n_value,
-	       guint8 *buffer)
+do_calculate_mac (SecretFileCollection *self,
+		  const guint8 *value, gsize n_value,
+		  guint8 *buffer)
 {
 	gcry_mac_hd_t hd;
 	gcry_error_t gcry;
@@ -130,9 +130,9 @@ calculate_mac (SecretFileCollection *self,
 }
 
 static gboolean
-decrypt (SecretFileCollection *self,
-	 guint8 *data,
-	 gsize n_data)
+do_decrypt (SecretFileCollection *self,
+	    guint8 *data,
+	    gsize n_data)
 {
 	gcry_cipher_hd_t hd;
 	gcry_error_t gcry;
@@ -164,9 +164,9 @@ decrypt (SecretFileCollection *self,
 }
 
 static gboolean
-encrypt (SecretFileCollection *self,
-	 guint8 *data,
-	 gsize n_data)
+do_encrypt (SecretFileCollection *self,
+	    guint8 *data,
+	    gsize n_data)
 {
 	gcry_cipher_hd_t hd;
 	gcry_error_t gcry;
@@ -311,7 +311,7 @@ on_load_contents (GObject *source_object,
 			self->modified = g_date_time_new_now_utc ();
 			self->usage_count = 0;
 
-			if (!derive (self)) {
+			if (!do_derive_key (self)) {
 				g_task_return_new_error (task,
 							 SECRET_ERROR,
 							 SECRET_ERROR_PROTOCOL,
@@ -375,7 +375,7 @@ on_load_contents (GObject *source_object,
 	g_assert (n_data == salt_size);
 
 	self->salt = g_bytes_new (data, n_data);
-	if (!derive (self)) {
+	if (!do_derive_key (self)) {
 		g_task_return_new_error (task,
 					 SECRET_ERROR,
 					 SECRET_ERROR_PROTOCOL,
@@ -442,7 +442,7 @@ hash_attributes (SecretFileCollection *self,
 		GVariant *variant;
 
 		value = g_hash_table_lookup (attributes, l->data);
-		if (!calculate_mac (self, (guint8 *)value, strlen (value), buffer)) {
+		if (!do_calculate_mac (self, (guint8 *)value, strlen (value), buffer)) {
 			g_list_free (keys);
 			return NULL;
 		}
@@ -485,7 +485,7 @@ hashed_attributes_match (SecretFileCollection *self,
 			return FALSE;
 		}
 
-		if (!calculate_mac (self, value, strlen ((char *)value), buffer)) {
+		if (!do_calculate_mac (self, value, strlen ((char *)value), buffer)) {
 			g_variant_unref (hashed_attribute);
 			return FALSE;
 		}
@@ -584,7 +584,7 @@ secret_file_collection_replace (SecretFileCollection *self,
 	g_variant_store (serialized_item, data);
 	g_variant_unref (serialized_item);
 	memset (data + n_data, n_padded - n_data, n_padded - n_data);
-	if (!encrypt (self, data, n_padded)) {
+	if (!do_encrypt (self, data, n_padded)) {
 		egg_secure_free (data);
 		g_set_error (error,
 			     SECRET_ERROR,
@@ -593,8 +593,8 @@ secret_file_collection_replace (SecretFileCollection *self,
 		return FALSE;
 	}
 
-	if (!calculate_mac (self, data, n_padded + IV_SIZE,
-			    data + n_padded + IV_SIZE)) {
+	if (!do_calculate_mac (self, data, n_padded + IV_SIZE,
+			       data + n_padded + IV_SIZE)) {
 		egg_secure_free (data);
 		g_set_error (error,
 			     SECRET_ERROR,
@@ -681,7 +681,7 @@ _secret_file_item_decrypt (GVariant *encrypted,
 	}
 	n_padded -= IV_SIZE + MAC_SIZE;
 
-	if (!calculate_mac (collection, data, n_padded + IV_SIZE, mac)) {
+	if (!do_calculate_mac (collection, data, n_padded + IV_SIZE, mac)) {
 		egg_secure_free (data);
 		g_set_error (error,
 			     SECRET_ERROR,
@@ -699,7 +699,7 @@ _secret_file_item_decrypt (GVariant *encrypted,
 		return FALSE;
 	}
 
-	if (!decrypt (collection, data, n_padded)) {
+	if (!do_decrypt (collection, data, n_padded)) {
 		egg_secure_free (data);
 		g_set_error (error,
 			     SECRET_ERROR,
diff --git a/libsecret/test-file-collection.c b/libsecret/test-file-collection.c
index e016d45..512bfb6 100644
--- a/libsecret/test-file-collection.c
+++ b/libsecret/test-file-collection.c
@@ -1,11 +1,15 @@
 
 #include "config.h"
 
+#undef G_DISABLE_ASSERT
+
 #include "egg/egg-testing.h"
 #include "secret-file-collection.h"
 #include "secret-retrievable.h"
 #include "secret-schema.h"
 
+#include <stdlib.h>
+
 typedef struct {
 	gchar *directory;
 	GMainLoop *loop;