aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2019-07-17 17:44:18 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2019-09-12 17:48:09 +0200
commit6f36381ff5b5a1c28cd6c00791d4093f1a63e38d (patch)
tree7e01275242cf6f9b7783af1cc68905ff0e572f14
parent57fc268528e654b2a90a7e859ee596427664cda4 (diff)
downloadhardware_replicant_libsamsung-ipc-6f36381ff5b5a1c28cd6c00791d4093f1a63e38d.tar.gz
hardware_replicant_libsamsung-ipc-6f36381ff5b5a1c28cd6c00791d4093f1a63e38d.tar.bz2
hardware_replicant_libsamsung-ipc-6f36381ff5b5a1c28cd6c00791d4093f1a63e38d.zip
ipc_nv_data_md5_calculate: print errors
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r--samsung-ipc/rfs.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/samsung-ipc/rfs.c b/samsung-ipc/rfs.c
index 9e52ace..dc1a03f 100644
--- a/samsung-ipc/rfs.c
+++ b/samsung-ipc/rfs.c
@@ -32,8 +32,9 @@
#include <ipc.h>
-char *ipc_nv_data_md5_calculate(const char *path, const char *secret,
- size_t size, size_t chunk_size)
+char *ipc_nv_data_md5_calculate(struct ipc_client *client,
+ const char *path, const char *secret,
+ size_t size, size_t chunk_size)
{
void *data = NULL;
char *md5_string = NULL;
@@ -41,12 +42,15 @@ char *ipc_nv_data_md5_calculate(const char *path, const char *secret,
MD5_CTX ctx;
if (secret == NULL) {
- return NULL;
+ ipc_client_log(client, "%s: Failed: secret is NULL", __FUNCTION__);
+ return NULL;
}
data = file_data_read(path, size, chunk_size, 0);
- if (data == NULL)
- return NULL;
+ if (data == NULL) {
+ ipc_client_log(client, "%s: Failed: data is NULL", __FUNCTION__);
+ return NULL;
+ }
MD5_Init(&ctx);
MD5_Update(&ctx, data, size);
@@ -218,7 +222,7 @@ int ipc_nv_data_check(struct ipc_client *client)
goto error;
}
- md5_string = ipc_nv_data_md5_calculate(path, secret, size, chunk_size);
+ md5_string = ipc_nv_data_md5_calculate(client, path, secret, size, chunk_size);
if (md5_string == NULL) {
ipc_client_log(client, "%s: Calculating nv_data md5 failed",
__FUNCTION__);
@@ -298,7 +302,7 @@ int ipc_nv_data_backup_check(struct ipc_client *client)
goto error;
}
- backup_md5_string = ipc_nv_data_md5_calculate(backup_path, secret, size, chunk_size);
+ backup_md5_string = ipc_nv_data_md5_calculate(client, backup_path, secret, size, chunk_size);
if (backup_md5_string == NULL) {
ipc_client_log(client, "%s: Calculating nv_data backup md5 failed",
__FUNCTION__);
@@ -380,7 +384,7 @@ int ipc_nv_data_backup(struct ipc_client *client)
goto error;
}
- md5_string = ipc_nv_data_md5_calculate(path, secret, size, chunk_size);
+ md5_string = ipc_nv_data_md5_calculate(client, path, secret, size, chunk_size);
if (md5_string == NULL) {
ipc_client_log(client, "%s: Calculating nv_data md5 failed",
__FUNCTION__);
@@ -636,7 +640,7 @@ int ipc_nv_data_write(struct ipc_client *client, const void *data, size_t size,
if (size == 0)
goto error;
- md5_string = ipc_nv_data_md5_calculate(path, secret, size, chunk_size);
+ md5_string = ipc_nv_data_md5_calculate(client, path, secret, size, chunk_size);
if (md5_string == NULL) {
ipc_client_log(client, "%s: Calculating nv_data md5 failed",
__FUNCTION__);