aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/exception.cpp12
-rw-r--r--src/net/authHelper.cpp30
-rw-r--r--src/net/pop3/POP3Store.cpp11
-rw-r--r--src/security/digest/md5/md5MessageDigest.cpp (renamed from src/utility/md5.cpp)103
-rw-r--r--src/security/digest/messageDigest.cpp53
-rw-r--r--src/security/digest/messageDigestFactory.cpp80
-rw-r--r--src/security/digest/sha1/sha1MessageDigest.cpp262
7 files changed, 490 insertions, 61 deletions
diff --git a/src/exception.cpp b/src/exception.cpp
index a8479b82..7482482a 100644
--- a/src/exception.cpp
+++ b/src/exception.cpp
@@ -121,6 +121,18 @@ const char* no_encoder_available::name() const throw() { return "no_encoder_avai
//
+// no_digest_algorithm_available
+//
+
+no_digest_algorithm_available::~no_digest_algorithm_available() throw() {}
+no_digest_algorithm_available::no_digest_algorithm_available(const string& name, const exception& other)
+ : exception("No algorithm available: '" + name + "'.", other) {}
+
+exception* no_digest_algorithm_available::clone() const { return new no_digest_algorithm_available(*this); }
+const char* no_digest_algorithm_available::name() const throw() { return "no_digest_algorithm_available"; }
+
+
+//
// no_such_parameter
//
diff --git a/src/net/authHelper.cpp b/src/net/authHelper.cpp
index e10b47ee..a946e6f1 100644
--- a/src/net/authHelper.cpp
+++ b/src/net/authHelper.cpp
@@ -20,7 +20,7 @@
#include "vmime/net/authHelper.hpp"
#include "vmime/config.hpp"
-#include "vmime/utility/md5.hpp"
+#include "vmime/security/digest/messageDigestFactory.hpp"
namespace vmime {
@@ -42,13 +42,17 @@ void hmac_md5(const string& text, const string& key, string& hexDigest)
unsigned char tkey[16];
int tkeyLen;
+ ref <security::digest::messageDigest> md5 =
+ security::digest::messageDigestFactory::getInstance()->create("md5");
+
// If key is longer than 64 bytes reset it to key = MD5(key)
if (key.length() > 64)
{
- utility::md5 keyMD5;
- keyMD5.update(reinterpret_cast <const vmime_uint8*>(key.data()), key.length());
+ md5->reset();
+ md5->update(reinterpret_cast <const vmime_uint8*>(key.data()), key.length());
+ md5->finalize();
- std::copy(keyMD5.hash(), keyMD5.hash() + 16, tkey);
+ std::copy(md5->getDigest(), md5->getDigest() + 16, tkey);
tkeyLen = 16;
}
else
@@ -84,20 +88,22 @@ void hmac_md5(const string& text, const string& key, string& hexDigest)
}
// Perform inner MD5
- utility::md5 innerMD5;
- innerMD5.update(ipad, 64);
- innerMD5.update(text);
+ md5->reset();
+ md5->update(ipad, 64);
+ md5->update(text);
+ md5->finalize();
- std::copy(innerMD5.hash(), innerMD5.hash() + 16, digest);
+ std::copy(md5->getDigest(), md5->getDigest() + 16, digest);
// Perform outer MD5
- utility::md5 outerMD5;
- outerMD5.update(opad, 64);
- outerMD5.update(digest, 16);
+ md5->reset();
+ md5->update(opad, 64);
+ md5->update(digest, 16);
+ md5->finalize();
//std::copy(outerMD5.hash(), outerMD5.hash() + 16, digest);
- hexDigest = outerMD5.hex();
+ hexDigest = md5->getHexDigest();
}
diff --git a/src/net/pop3/POP3Store.cpp b/src/net/pop3/POP3Store.cpp
index 9ccfa7b7..5041d2d3 100644
--- a/src/net/pop3/POP3Store.cpp
+++ b/src/net/pop3/POP3Store.cpp
@@ -23,7 +23,7 @@
#include "vmime/exception.hpp"
#include "vmime/platformDependant.hpp"
#include "vmime/messageId.hpp"
-#include "vmime/utility/md5.hpp"
+#include "vmime/security/digest/messageDigestFactory.hpp"
#include "vmime/utility/filteredStream.hpp"
#include <algorithm>
@@ -145,8 +145,13 @@ void POP3Store::connect()
if (mid.getLeft().length() && mid.getRight().length())
{
// <digest> is the result of MD5 applied to "<message-id>password"
- sendRequest("APOP " + auth.getUsername() + " "
- + utility::md5(mid.generate() + auth.getPassword()).hex());
+ ref <security::digest::messageDigest> md5 =
+ security::digest::messageDigestFactory::getInstance()->create("md5");
+
+ md5->update(mid.generate() + auth.getPassword());
+ md5->finalize();
+
+ sendRequest("APOP " + auth.getUsername() + " " + md5->getHexDigest());
readResponse(response, false);
if (isSuccessResponse(response))
diff --git a/src/utility/md5.cpp b/src/security/digest/md5/md5MessageDigest.cpp
index b5899e36..d5fa036c 100644
--- a/src/utility/md5.cpp
+++ b/src/security/digest/md5/md5MessageDigest.cpp
@@ -44,37 +44,28 @@
// These notices must be retained in any copies of any part of this
// documentation and/or software.
-#include "vmime/utility/md5.hpp"
+#include "vmime/security/digest/md5/md5MessageDigest.hpp"
namespace vmime {
-namespace utility {
+namespace security {
+namespace digest {
+namespace md5 {
-md5::md5()
- : m_finalized(false)
+md5MessageDigest::md5MessageDigest()
{
init();
}
-md5::md5(const vmime_uint8* const in, const unsigned long length)
- : m_finalized(false)
+void md5MessageDigest::reset()
{
init();
- update(in, length);
}
-md5::md5(const string& in)
- : m_finalized(false)
-{
- init();
- update(reinterpret_cast <const vmime_uint8*>(in.c_str()), in.length());
-}
-
-
-void md5::init()
+void md5MessageDigest::init()
{
m_hash[0] = 0x67452301;
m_hash[1] = 0xefcdab89;
@@ -82,6 +73,7 @@ void md5::init()
m_hash[3] = 0x10325476;
m_byteCount = 0;
+ m_finalized = false;
}
@@ -121,18 +113,29 @@ static inline void swapUint32Array(vmime_uint32* buf, unsigned long words)
}
-void md5::update(const string& in)
+void md5MessageDigest::update(const byte b)
{
- update(reinterpret_cast <const vmime_uint8*>(in.c_str()), in.length());
+ update(&b, 1);
}
-void md5::update(const vmime_uint8* data, unsigned long len)
+void md5MessageDigest::update(const string& s)
{
- if (m_finalized)
- return;
+ update(reinterpret_cast <const byte*>(s.data()), s.length());
+}
+
+void md5MessageDigest::update(const byte* data, const unsigned long offset,
+ const unsigned long len)
+{
+ update(data + offset, len);
+}
+
+
+void md5MessageDigest::update(const byte* data, const unsigned long length)
+{
const unsigned long avail = 64 - (m_byteCount & 0x3f);
+ unsigned long len = length;
m_byteCount += len;
@@ -161,7 +164,29 @@ void md5::update(const vmime_uint8* data, unsigned long len)
}
-void md5::finalize()
+void md5MessageDigest::finalize(const string& s)
+{
+ update(s);
+ finalize();
+}
+
+
+void md5MessageDigest::finalize(const byte* buffer, const unsigned long len)
+{
+ update(buffer, len);
+ finalize();
+}
+
+
+void md5MessageDigest::finalize(const byte* buffer,
+ const unsigned long offset, const unsigned long len)
+{
+ update(buffer, offset, len);
+ finalize();
+}
+
+
+void md5MessageDigest::finalize()
{
const long offset = m_byteCount & 0x3f;
@@ -197,7 +222,7 @@ void md5::finalize()
}
-void md5::transformHelper()
+void md5MessageDigest::transformHelper()
{
#if VMIME_BYTE_ORDER_BIG_ENDIAN
swapUint32Array((vmime_uint32*) m_block, 64 / 4);
@@ -206,7 +231,7 @@ void md5::transformHelper()
}
-void md5::transform()
+void md5MessageDigest::transform()
{
const vmime_uint32* const in = reinterpret_cast <vmime_uint32*>(m_block);
@@ -298,34 +323,20 @@ void md5::transform()
}
-const string md5::hex()
+const int md5MessageDigest::getDigestLength() const
{
- if (!m_finalized)
- finalize();
-
- static const unsigned char hex[] = "0123456789abcdef";
-
- std::ostringstream oss;
- const vmime_uint8* const digest = reinterpret_cast <vmime_uint8*>(m_hash);
-
- for (int i = 0 ; i < 16 ; ++i)
- {
- oss << hex[(digest[i] & 0xf0) >> 4];
- oss << hex[(digest[i] & 0x0f)];
- }
-
- return (oss.str());
+ return 16;
}
-const vmime_uint8* md5::hash()
+const byte* md5MessageDigest::getDigest() const
{
- if (!m_finalized)
- finalize();
-
- return (reinterpret_cast <const vmime_uint8*>(m_hash));
+ return reinterpret_cast <const byte*>(m_hash);
}
-} // utility
+} // md5
+} // digest
+} // security
} // vmime
+
diff --git a/src/security/digest/messageDigest.cpp b/src/security/digest/messageDigest.cpp
new file mode 100644
index 00000000..8fb56543
--- /dev/null
+++ b/src/security/digest/messageDigest.cpp
@@ -0,0 +1,53 @@
+//
+// VMime library (http://www.vmime.org)
+// Copyright (C) 2002-2005 Vincent Richard <[email protected]>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+
+#include "vmime/security/digest/messageDigest.hpp"
+
+#include <sstream>
+
+
+namespace vmime {
+namespace security {
+namespace digest {
+
+
+const string messageDigest::getHexDigest() const
+{
+ const byte* hash = getDigest();
+ const int len = getDigestLength();
+
+ static const unsigned char hex[] = "0123456789abcdef";
+
+ std::ostringstream oss;
+
+ for (int i = 0 ; i < len ; ++i)
+ {
+ oss << hex[(hash[i] & 0xf0) >> 4];
+ oss << hex[(hash[i] & 0x0f)];
+ }
+
+ return oss.str();
+
+}
+
+
+} // digest
+} // security
+} // vmime
+
diff --git a/src/security/digest/messageDigestFactory.cpp b/src/security/digest/messageDigestFactory.cpp
new file mode 100644
index 00000000..eccc545c
--- /dev/null
+++ b/src/security/digest/messageDigestFactory.cpp
@@ -0,0 +1,80 @@
+//
+// VMime library (http://www.vmime.org)
+// Copyright (C) 2002-2005 Vincent Richard <[email protected]>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+
+#include "vmime/security/digest/messageDigestFactory.hpp"
+#include "vmime/exception.hpp"
+
+#include "vmime/security/digest/md5/md5MessageDigest.hpp"
+#include "vmime/security/digest/sha1/sha1MessageDigest.hpp"
+
+
+namespace vmime {
+namespace security {
+namespace digest {
+
+
+messageDigestFactory::messageDigestFactory()
+{
+ registerAlgorithm <md5::md5MessageDigest>("md5");
+ registerAlgorithm <sha1::sha1MessageDigest>("sha1");
+}
+
+
+messageDigestFactory::~messageDigestFactory()
+{
+}
+
+
+messageDigestFactory* messageDigestFactory::getInstance()
+{
+ static messageDigestFactory instance;
+ return (&instance);
+}
+
+
+ref <messageDigest> messageDigestFactory::create(const string& name)
+{
+ const MapType::const_iterator it = m_algos.find
+ (utility::stringUtils::toLower(name));
+
+ if (it != m_algos.end())
+ return (*it).second->create();
+
+ throw exceptions::no_digest_algorithm_available(name);
+}
+
+
+const std::vector <string> messageDigestFactory::getSupportedAlgorithms() const
+{
+ std::vector <string> res;
+
+ for (MapType::const_iterator it = m_algos.begin() ;
+ it != m_algos.end() ; ++it)
+ {
+ res.push_back((*it).first);
+ }
+
+ return res;
+}
+
+
+} // digest
+} // security
+} // vmime
+
diff --git a/src/security/digest/sha1/sha1MessageDigest.cpp b/src/security/digest/sha1/sha1MessageDigest.cpp
new file mode 100644
index 00000000..de3f6948
--- /dev/null
+++ b/src/security/digest/sha1/sha1MessageDigest.cpp
@@ -0,0 +1,262 @@
+//
+// VMime library (http://www.vmime.org)
+// Copyright (C) 2002-2005 Vincent Richard <[email protected]>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+//
+// This is an implementation by Steve Reid <[email protected]>
+// 100% public domain.
+
+#include "vmime/security/digest/sha1/sha1MessageDigest.hpp"
+
+
+namespace vmime {
+namespace security {
+namespace digest {
+namespace sha1 {
+
+
+#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+
+// blk0() and blk() perform the initial expand.
+// I got the idea of expanding during the round function from SSLeay
+#if VMIME_BYTE_ORDER_LITTLE_ENDIAN
+ #define blk0(i) (block->l[i] = (rol(block->l[i], 24) & 0xFF00FF00) \
+ | (rol(block->l[i], 8) & 0x00FF00FF))
+#else
+ #define blk0(i) block->l[i]
+#endif
+
+#define blk(i) (block->l[i & 15] = rol(block->l[(i + 13) & 15] ^ block->l[(i + 8) & 15] \
+ ^ block->l[(i + 2) & 15] ^ block->l[i & 15], 1))
+
+// (R0+R1), R2, R3, R4 are the different operations used in SHA1
+#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
+#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
+#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+
+
+sha1MessageDigest::sha1MessageDigest()
+{
+ init();
+}
+
+
+void sha1MessageDigest::reset()
+{
+ init();
+}
+
+
+void sha1MessageDigest::init()
+{
+ m_state[0] = 0x67452301;
+ m_state[1] = 0xefcdab89;
+ m_state[2] = 0x98badcfe;
+ m_state[3] = 0x10325476;
+ m_state[4] = 0xc3d2e1f0;
+
+ m_count[0] = 0;
+ m_count[1] = 0;
+}
+
+
+void sha1MessageDigest::update(const byte b)
+{
+ update(&b, 1);
+}
+
+
+void sha1MessageDigest::update(const string& s)
+{
+ update(reinterpret_cast <const byte*>(s.data()), s.length());
+}
+
+
+void sha1MessageDigest::update(const byte* buffer, const unsigned long offset,
+ const unsigned long len)
+{
+ update(buffer + offset, len);
+}
+
+
+void sha1MessageDigest::update(const byte* buffer, const unsigned long len)
+{
+ unsigned int i, j;
+
+ j = (m_count[0] >> 3) & 63;
+
+ if ((m_count[0] += len << 3) < (len << 3))
+ m_count[1]++;
+
+ m_count[1] += (len >> 29);
+
+ if ((j + len) > 63)
+ {
+ memcpy(&m_buffer[j], buffer, (i = 64 - j));
+
+ transform(m_state, m_buffer);
+
+ for ( ; i + 63 < len ; i += 64)
+ transform(m_state, &buffer[i]);
+
+ j = 0;
+ }
+ else
+ {
+ i = 0;
+ }
+
+ memcpy(&m_buffer[j], &buffer[i], len - i);
+}
+
+
+void sha1MessageDigest::finalize()
+{
+ unsigned long i, j;
+ unsigned char finalcount[8];
+
+ for (i = 0 ; i < 8 ; i++)
+ {
+ finalcount[i] = static_cast <unsigned char>
+ ((m_count[(i >= 4 ? 0 : 1)]
+ >> ((3-(i & 3)) * 8) ) & 255); // Endian independent
+ }
+
+ update(reinterpret_cast <const byte*>("\200"), 1);
+
+ while ((m_count[0] & 504) != 448)
+ update(reinterpret_cast <const byte*>("\0"), 1);
+
+ update(finalcount, 8); // Should cause a transform()
+
+ for (i = 0 ; i < 20 ; i++)
+ {
+ m_digest[i] = static_cast <unsigned char>
+ ((m_state[i >> 2] >> ((3 - (i & 3)) * 8)) & 255);
+ }
+
+ // Wipe variables
+ i = j = 0;
+
+ memset(m_buffer, 0, 64);
+ memset(m_state, 0, 20);
+ memset(m_count, 0, 8);
+ memset(&finalcount, 0, 8);
+}
+
+
+void sha1MessageDigest::finalize(const string& s)
+{
+ finalize(reinterpret_cast <const byte*>(s.data()), s.length());
+}
+
+
+void sha1MessageDigest::finalize(const byte* buffer, const unsigned long len)
+{
+ update(buffer, len);
+ finalize();
+}
+
+
+void sha1MessageDigest::finalize(const byte* buffer,
+ const unsigned long offset, const unsigned long len)
+{
+ finalize(buffer + offset, len);
+}
+
+
+/** Hash a single 512-bit block.
+ * This is the core of the algorithm.
+ */
+void sha1MessageDigest::transform
+ (unsigned long state[5], const unsigned char buffer[64])
+{
+ unsigned long a, b, c, d, e;
+
+ typedef union
+ {
+ unsigned char c[64];
+ unsigned long l[16];
+ } CHAR64LONG16;
+
+ CHAR64LONG16* block;
+ static unsigned char workspace[64];
+
+ block = reinterpret_cast <CHAR64LONG16*>(workspace);
+ memcpy(block, buffer, 64);
+
+ // Copy context->state[] to working vars
+ a = state[0];
+ b = state[1];
+ c = state[2];
+ d = state[3];
+ e = state[4];
+
+ // 4 rounds of 20 operations each. Loop unrolled.
+ R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+ R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+ R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
+ R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
+ R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
+ R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
+ R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
+ R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
+ R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
+ R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
+ R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
+ R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
+ R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
+ R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
+ R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
+ R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
+ R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
+ R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+ R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+ R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+
+ // Add the working vars back into context.state[]
+ state[0] += a;
+ state[1] += b;
+ state[2] += c;
+ state[3] += d;
+ state[4] += e;
+
+ // Wipe variables
+ a = b = c = d = e = 0;
+}
+
+
+const int sha1MessageDigest::getDigestLength() const
+{
+ return 20;
+}
+
+
+const byte* sha1MessageDigest::getDigest() const
+{
+ return m_digest;
+}
+
+
+} // sha1
+} // digest
+} // security
+} // vmime
+
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-29 15:28:41 +0000