aboutsummaryrefslogtreecommitdiff
path: root/meta-linaro-integration/recipes-devtools/opkg/files/0001-md5-Add-md5_to_string-function.patch
blob: 8af775866b286385046e00041a7db23c296360f5 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
From dee50138f4431550598762e781b7e1524da05fd4 Mon Sep 17 00:00:00 2001
From: Paul Barker <pa...@paulbarker.me.uk>
Date: Sat, 24 Oct 2015 20:15:17 +0100
Subject: [PATCH 1/3] md5: Add md5_to_string function

Signed-off-by: Paul Barker <pa...@paulbarker.me.uk>
---
 libopkg/file_util.c | 28 +++-------------------------
 libopkg/md5.c       | 17 +++++++++++++++++
 libopkg/md5.h       |  3 +++
 3 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/libopkg/file_util.c b/libopkg/file_util.c
index 5eff469..cb3dbf0 100644
--- a/libopkg/file_util.c
+++ b/libopkg/file_util.c
@@ -349,27 +349,13 @@ int file_mkdir_hier(const char *path, long mode)
 
 char *file_md5sum_alloc(const char *file_name)
 {
-    static const int md5sum_bin_len = 16;
-    static const int md5sum_hex_len = 32;
-
-    static const unsigned char bin2hex[16] = {
-        '0', '1', '2', '3',
-        '4', '5', '6', '7',
-        '8', '9', 'a', 'b',
-        'c', 'd', 'e', 'f'
-    };
-
-    int i, err;
+    int err;
     FILE *file;
-    char *md5sum_hex;
-    unsigned char md5sum_bin[md5sum_bin_len];
-
-    md5sum_hex = xcalloc(1, md5sum_hex_len + 1);
+    unsigned char md5sum_bin[16];
 
     file = fopen(file_name, "r");
     if (file == NULL) {
         opkg_perror(ERROR, "Failed to open file %s", file_name);
-        free(md5sum_hex);
         return NULL;
     }
 
@@ -377,20 +363,12 @@ char *file_md5sum_alloc(const char *file_name)
     if (err) {
         opkg_msg(ERROR, "Could't compute md5sum for %s.\n", file_name);
         fclose(file);
-        free(md5sum_hex);
         return NULL;
     }
 
     fclose(file);
 
-    for (i = 0; i < md5sum_bin_len; i++) {
-        md5sum_hex[i * 2] = bin2hex[md5sum_bin[i] >> 4];
-        md5sum_hex[i * 2 + 1] = bin2hex[md5sum_bin[i] & 0xf];
-    }
-
-    md5sum_hex[md5sum_hex_len] = '\0';
-
-    return md5sum_hex;
+    return md5_to_string(md5sum_bin);
 }
 
 #ifdef HAVE_SHA256
diff --git a/libopkg/md5.c b/libopkg/md5.c
index d476b8b..7138681 100644
--- a/libopkg/md5.c
+++ b/libopkg/md5.c
@@ -30,6 +30,8 @@
 #include <string.h>
 #include <sys/types.h>
 
+#include "xfuncs.h"
+
 #if USE_UNLOCKED_IO
 #include "unlocked-io.h"
 #endif
@@ -431,3 +433,18 @@ void md5_process_block(const void *buffer, size_t len, struct md5_ctx *ctx)
     ctx->C = C;
     ctx->D = D;
 }
+
+char *md5_to_string(const void *md5sum_bin)
+{
+    int i;
+    const char *src = (const char *)md5sum_bin;
+    char *buf = xmalloc(33);
+
+    /* Print 4 bytes at a time. */
+    for (i = 0; i < 16; i += 4) {
+        sprintf(&buf[2*i], "%02hhx%02hhx%02hhx%02hhx",
+                src[i], src[i+1], src[i+2], src[i+3]);
+    }
+
+    return buf;
+}
diff --git a/libopkg/md5.h b/libopkg/md5.h
index 01320f5..2a7274d 100644
--- a/libopkg/md5.h
+++ b/libopkg/md5.h
@@ -118,6 +118,9 @@ extern int __md5_stream(FILE * stream, void *resblock) __THROW;
 extern void *__md5_buffer(const char *buffer, size_t len,
                           void *resblock) __THROW;
 
+/* Convert a binary md5sum value to an ASCII string. */
+char *md5_to_string(const void *md5sum_bin);
+
 #ifdef __cplusplus
 }
 #endif
-- 
2.6.1