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
|
diff --git a/src/filters.cc b/src/filters.cc
index f725c247..030a5fb4 100644
--- a/src/filters.cc
+++ b/src/filters.cc
@@ -237,8 +237,6 @@ void anonymize_posts::render_commodity(amount_t& amt)
void anonymize_posts::operator()(post_t& post)
{
- boost::uuids::detail::sha1 sha;
- unsigned int message_digest[5];
bool copy_xact_details = false;
if (last_xact != post.xact) {
@@ -255,12 +253,7 @@ void anonymize_posts::operator()(post_t& post)
std::ostringstream buf;
buf << reinterpret_cast<boost::uintmax_t>(post.xact->payee.c_str())
<< integer_gen() << post.xact->payee.c_str();
-
- sha.reset();
- sha.process_bytes(buf.str().c_str(), buf.str().length());
- sha.get_digest(message_digest);
-
- xact.payee = to_hex(message_digest);
+ xact.payee = sha1sum(buf.str(), 8);
xact.note = none;
} else {
xact.journal = post.xact->journal;
@@ -273,12 +266,7 @@ void anonymize_posts::operator()(post_t& post)
acct = acct->parent) {
std::ostringstream buf;
buf << integer_gen() << acct << acct->fullname();
-
- sha.reset();
- sha.process_bytes(buf.str().c_str(), buf.str().length());
- sha.get_digest(message_digest);
-
- account_names.push_front(to_hex(message_digest));
+ account_names.push_front(sha1sum(buf.str(), 8));
}
account_t * new_account =
@@ -1268,7 +1256,7 @@ void budget_posts::report_budget_items(const date_t& date)
foreach (pending_posts_list::iterator& i, posts_to_erase)
pending_posts.erase(i);
}
-
+
if (pending_posts.size() == 0)
return;
diff --git a/src/utils.h b/src/utils.h
index b09377b8..510686fd 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -607,29 +607,39 @@ inline int peek_next_nonws(std::istream& in) {
*_p = '\0'; \
}
-inline string to_hex(unsigned int * message_digest, const int len = 1)
-{
+inline string digest_to_hex(
+ const boost::uuids::detail::sha1::digest_type& message_digest,
+ size_t len = sizeof(boost::uuids::detail::sha1::digest_type) * 2
+) {
std::ostringstream buf;
-
- for(int i = 0; i < 5 ; i++) {
- buf.width(8);
- buf.fill('0');
- buf << std::hex << message_digest[i];
- if (i + 1 >= len)
- break; // only output the first LEN dwords
+ buf.setf(std::ios_base::hex, std::ios_base::basefield);
+ buf.fill('0');
+
+ // sha1::digest_type is an array type and may change between Boost versions
+ const size_t count = std::min(
+ sizeof(message_digest) / sizeof(message_digest[0]),
+ (len - 1) / (sizeof(message_digest[0]) * 2) + 1
+ );
+ for(size_t i = 0; i < count; i++) {
+ buf.width(sizeof(message_digest[i]) * 2);
+ buf << (unsigned int)message_digest[i];
}
- return buf.str();
+ string hex = buf.str();
+ hex.resize(len, '0'); // in case a partial element is requested
+ return hex;
}
-inline string sha1sum(const string& str)
-{
- boost::uuids::detail::sha1 sha;
+inline string sha1sum(
+ const string& str,
+ size_t len = sizeof(boost::uuids::detail::sha1::digest_type) * 2
+) {
+ static boost::uuids::detail::sha1 sha;
+ boost::uuids::detail::sha1::digest_type message_digest;
+ sha.reset();
sha.process_bytes(str.c_str(), str.length());
-
- unsigned int message_digest[5];
sha.get_digest(message_digest);
- return to_hex(message_digest, 5);
+ return digest_to_hex(message_digest, len);
}
extern const string version;
|
