trunk: backport eventing from 1.4.3

This commit is contained in:
Marian Krivos
2012-02-05 12:16:58 +00:00
parent 59fe68edbe
commit 7d7c02c579
412 changed files with 3564 additions and 3634 deletions

View File

@@ -1,7 +1,7 @@
//
// DigestEngine.cpp
//
// $Id: //poco/Main/Foundation/src/DigestEngine.cpp#11 $
// $Id: //poco/1.4/Foundation/src/DigestEngine.cpp#1 $
//
// Library: Foundation
// Package: Crypt
@@ -61,43 +61,43 @@ std::string DigestEngine::digestToHex(const Digest& bytes)
unsigned char c = *it;
result += digits[(c >> 4) & 0xF];
result += digits[c & 0xF];
}
return result;
}
return result;
}
DigestEngine::Digest DigestEngine::digestFromHex(const std::string& digest)
{
if (digest.size() % 2 != 0)
throw DataFormatException();
Digest result;
result.reserve(digest.size()/2);
for (std::size_t i = 0; i < digest.size(); ++i)
{
int c = 0;
// first upper 4 bits
if (digest[i] >= '0' && digest[i] <= '9')
c = digest[i] - '0';
else if (digest[i] >= 'a' && digest[i] <= 'f')
c = digest[i] - 'a'+10;
else if (digest[i] >= 'A' && digest[i] <= 'F')
c = digest[i] - 'A'+10;
else
throw DataFormatException();
c <<= 4;
++i;
if (digest[i] >= '0' && digest[i] <= '9')
c += digest[i] - '0';
else if (digest[i] >= 'a' && digest[i] <= 'f')
c += digest[i] - 'a'+10;
else if (digest[i] >= 'A' && digest[i] <= 'F')
c += digest[i] - 'A'+10;
else
throw DataFormatException();
if (digest.size() % 2 != 0)
throw DataFormatException();
Digest result;
result.reserve(digest.size()/2);
for (std::size_t i = 0; i < digest.size(); ++i)
{
int c = 0;
// first upper 4 bits
if (digest[i] >= '0' && digest[i] <= '9')
c = digest[i] - '0';
else if (digest[i] >= 'a' && digest[i] <= 'f')
c = digest[i] - 'a'+10;
else if (digest[i] >= 'A' && digest[i] <= 'F')
c = digest[i] - 'A'+10;
else
throw DataFormatException();
c <<= 4;
++i;
if (digest[i] >= '0' && digest[i] <= '9')
c += digest[i] - '0';
else if (digest[i] >= 'a' && digest[i] <= 'f')
c += digest[i] - 'a'+10;
else if (digest[i] >= 'A' && digest[i] <= 'F')
c += digest[i] - 'A'+10;
else
throw DataFormatException();
result.push_back(static_cast<unsigned char>(c));
}
return result;
result.push_back(static_cast<unsigned char>(c));
}
return result;
}