Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-30 00:00:11 +01:00
Code Issues Releases Wiki Activity

uuid: use other uuids as namespace

Browse source
This commit is contained in:
Steffen Vogel 2020-10-16 11:11:16 +02:00
parent e63dd10f3f
commit 0f11f80194
2 changed files with 54 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/include/villas/utils.hpp
View file

@ -203,10 +203,12 @@ size_t strlenp(const char *str);
int sha1sum(FILE *f, unsigned char *sha1); int sha1sum(FILE *f, unsigned char *sha1);
/** Generate an UUID by MD5 hashing the provided string */ /** Generate an UUID by MD5 hashing the provided string */
void uuid_generate_from_str(uuid_t out, const std::string &data, const std::string &ns = ""); int uuid_generate_from_str(uuid_t out, const std::string &data, const std::string &ns = "");
int uuid_generate_from_str(uuid_t out, const std::string &data, const uuid_t ns);
/** Generate an UUID by MD5 hashing the serialized representation of the provided JSON object */ /** Generate an UUID by MD5 hashing the serialized representation of the provided JSON object */
void uuid_generate_from_json(uuid_t out, json_t *json, const std::string &ns = ""); int uuid_generate_from_json(uuid_t out, json_t *json, const uuid_t ns);
namespace base64 { namespace base64 {

58
common/lib/utils.cpp
View file

@ -357,25 +357,67 @@ int sha1sum(FILE *f, unsigned char *sha1)
return 0; return 0;
} }
void uuid_generate_from_str(uuid_t out, const std::string &data, const std::string &ns) int uuid_generate_from_str(uuid_t out, const std::string &data, const std::string &ns)
{ {
std::stringstream ss; int ret;
MD5_CTX c;
if (!ns.empty()) ret = MD5_Init(&c);
ss << ns << "|"; if (!ret)
return -1;
ss << data; /* Namespace */
ret = MD5_Update(&c, (unsigned char *) ns.c_str(), ns.size());
if (!ret)
return -1;
MD5((unsigned char*) ss.str().c_str(), ss.str().size(), (unsigned char *) &out); /* Data */
ret = MD5_Update(&c, (unsigned char *) data.c_str(), data.size());
if (!ret)
return -1;
ret = MD5_Final((unsigned char *) out, &c);
if (!ret)
return -1;
return 0;
} }
void uuid_generate_from_json(uuid_t out, json_t *json, const std::string &ns) int uuid_generate_from_str(uuid_t out, const std::string &data, const uuid_t ns)
{
int ret;
MD5_CTX c;
ret = MD5_Init(&c);
if (!ret)
return -1;
/* Namespace */
ret = MD5_Update(&c, (unsigned char *) ns, 16);
if (!ret)
return -1;
/* Data */
ret = MD5_Update(&c, (unsigned char *) data.c_str(), data.size());
if (!ret)
return -1;
ret = MD5_Final((unsigned char *) out, &c);
if (!ret)
return -1;
return 0;
}
int uuid_generate_from_json(uuid_t out, json_t *json, const uuid_t ns)
{ {
char *str = json_dumps(json, JSON_COMPACT | JSON_SORT_KEYS); char *str = json_dumps(json, JSON_COMPACT | JSON_SORT_KEYS);
uuid_generate_from_str(out, str, ns); int ret = uuid_generate_from_str(out, str, ns);
free(str); free(str);
return ret;
} }
} /* namespace utils */ } /* namespace utils */