generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-12-31 07:09:37 +01:00
Code Issues Projects Releases Wiki Activity

merge fix for #878

Browse Source
This commit is contained in:
Guenter Obiltschnig
2015-07-31 12:17:20 +02:00
parent 5781bcbe35
commit e4dcb85c1f
6 changed files with 116 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Foundation/src/UUIDGenerator.cpp
View File

@@ -19,6 +19,7 @@
#include "Poco/RandomStream.h"
#include "Poco/DigestEngine.h"
#include "Poco/MD5Engine.h"
#include "Poco/SHA1Engine.h"
#include "Poco/SingletonHolder.h"
#include <cstring>
@@ -62,6 +63,14 @@ UUID UUIDGenerator::createFromName(const UUID& nsid, const std::string& name)
UUID UUIDGenerator::createFromName(const UUID& nsid, const std::string& name, DigestEngine& de)
{
UUID::Version version = UUID::UUID_NAME_BASED;
if (dynamic_cast<SHA1Engine*>(&de)) version = UUID::UUID_NAME_BASED_SHA1;
return createFromName(nsid, name, de, version);
}
UUID UUIDGenerator::createFromName(const UUID& nsid, const std::string& name, DigestEngine& de, UUID::Version version)
{
poco_assert_dbg (de.digestLength() >= 16);
@@ -80,7 +89,7 @@ UUID UUIDGenerator::createFromName(const UUID& nsid, const std::string& name, Di
{
buffer[i] = d[i];
}
return UUID(buffer, UUID::UUID_NAME_BASED);
return UUID(buffer, version);
}