4 files changed, 200 insertions, 1 deletions
diff --git a/src/platforms/posix/posixCriticalSection.cpp b/src/platforms/posix/posixCriticalSection.cpp
new file mode 100755
index 00000000..83649fc0
--- /dev/null
+++ b/src/platforms/posix/posixCriticalSection.cpp
@@ -0,0 +1,67 @@
+//
+// VMime library (http://www.vmime.org)
+// Copyright (C) 2002-2009 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 3 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.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+
+#include "vmime/config.hpp"
+
+
+#if VMIME_PLATFORM_IS_POSIX
+
+
+#include "vmime/platforms/posix/posixCriticalSection.hpp"
+
+
+namespace vmime {
+namespace platforms {
+namespace posix {
+
+
+posixCriticalSection::posixCriticalSection()
+{
+	pthread_mutex_init(&m_cs, NULL);
+}
+
+
+posixCriticalSection::~posixCriticalSection()
+{
+	pthread_mutex_destroy(&m_cs);
+}
+
+
+void posixCriticalSection::lock()
+{
+	pthread_mutex_lock(&m_cs);
+}
+
+
+void posixCriticalSection::unlock()
+{
+	pthread_mutex_unlock(&m_cs);
+}
+
+
+} // posix
+} // platforms
+} // vmime
+
+
+#endif // VMIME_PLATFORM_IS_POSIX
diff --git a/src/platforms/posix/posixHandler.cpp b/src/platforms/posix/posixHandler.cpp
index 8629b1e2..50428b70 100644
--- a/src/platforms/posix/posixHandler.cpp
+++ b/src/platforms/posix/posixHandler.cpp
@@ -29,8 +29,10 @@
 
 #include "vmime/platforms/posix/posixHandler.hpp"
 
-#include <time.h>
+#include "vmime/platforms/posix/posixCriticalSection.hpp"
 
+#include <time.h>
+#include <fcntl.h>
 #include <unistd.h>
 #include <locale.h>
 #include <langinfo.h>
@@ -39,10 +41,15 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#if VMIME_HAVE_SYSCALL
+#	include <sys/syscall.h>
+#endif
+
 #include <netdb.h>
 
 #include <string.h>
 #include <cassert>
+#include <cstdlib>
 
 #if VMIME_HAVE_PTHREAD
 #	include <pthread.h>
@@ -217,6 +224,18 @@ unsigned int posixHandler::getProcessId() const
 }
 
 
+unsigned int posixHandler::getThreadId() const
+{
+#if VMIME_HAVE_GETTID
+	return static_cast <unsigned int>(::gettid());
+#elif VMIME_HAVE_SYSCALL && VMIME_HAVE_SYSCALL_GETTID
+	return static_cast <unsigned int>(::syscall(SYS_gettid));
+#else
+	#error We have no implementation of getThreadId() for this platform!
+#endif
+}
+
+
 #if VMIME_HAVE_MESSAGING_FEATURES
 
 ref <vmime::net::socketFactory> posixHandler::getSocketFactory()
@@ -261,6 +280,29 @@ void posixHandler::wait() const
 }
 
 
+void posixHandler::generateRandomBytes(unsigned char* buffer, const unsigned int count)
+{
+	int fd = open("/dev/urandom", O_RDONLY);
+
+	if (fd != -1)
+	{
+		read(fd, buffer, count);
+		close(fd);
+	}
+	else  // fallback
+	{
+		for (unsigned int i = 0 ; i < count ; ++i)
+			buffer[i] = static_cast <unsigned char>(rand() % 255);
+	}
+}
+
+
+ref <utility::sync::criticalSection> posixHandler::createCriticalSection()
+{
+	return vmime::create <posixCriticalSection>();
+}
+
+
 } // posix
 } // platforms
 } // vmime
diff --git a/src/platforms/windows/windowsCriticalSection.cpp b/src/platforms/windows/windowsCriticalSection.cpp
new file mode 100755
index 00000000..d3aebd09
--- /dev/null
+++ b/src/platforms/windows/windowsCriticalSection.cpp
@@ -0,0 +1,67 @@
+//
+// VMime library (http://www.vmime.org)
+// Copyright (C) 2002-2009 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 3 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.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+
+#include "vmime/config.hpp"
+
+
+#if VMIME_PLATFORM_IS_WINDOWS
+
+
+#include "vmime/platforms/windows/windowsCriticalSection.hpp"
+
+
+namespace vmime {
+namespace platforms {
+namespace windows {
+
+
+windowsCriticalSection::windowsCriticalSection()
+{
+	InitializeCriticalSectionAndSpinCount(&m_cs, 0x400);
+}
+
+
+windowsCriticalSection::~windowsCriticalSection()
+{
+	DeleteCriticalSection(&m_cs)
+}
+
+
+void windowsCriticalSection::lock()
+{
+	EnterCriticalSection(&m_cs);
+}
+
+
+void windowsCriticalSection::unlock()
+{
+	LeaveCriticalSection(&m_cs);
+}
+
+
+} // windows
+} // platforms
+} // vmime
+
+
+#endif // VMIME_PLATFORM_IS_WINDOWS
diff --git a/src/platforms/windows/windowsHandler.cpp b/src/platforms/windows/windowsHandler.cpp
index 1ed4025b..824589b7 100644
--- a/src/platforms/windows/windowsHandler.cpp
+++ b/src/platforms/windows/windowsHandler.cpp
@@ -29,6 +29,8 @@
 
 #include "vmime/platforms/windows/windowsHandler.hpp"
 
+#include "vmime/platforms/windows/windowsCriticalSection.hpp"
+
 #include <time.h>
 #include <locale.h>
 #include <process.h>
@@ -239,6 +241,12 @@ unsigned int windowsHandler::getProcessId() const
 }
 
 
+unsigned int windowsHandler::getThreadId() cont
+{
+	return static_cast <unsigned int>(::GetCurrentThreadId());
+}
+
+
 #if VMIME_HAVE_MESSAGING_FEATURES
 
 ref <vmime::net::socketFactory> windowsHandler::getSocketFactory()
@@ -272,6 +280,21 @@ void windowsHandler::wait() const
 }
 
 
+void windowsHandler::generateRandomBytes(unsigned char* buffer, const unsigned int count)
+{
+	HCRYPTPROV cryptProvider = 0;
+	CryptAcquireContext(&cryptProvider, 0, 0, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT);
+	CryptGenRandom(cryptProvider, static_cast <unsigned long>(count), static_cast <unsigned char*>(buffer));
+	CryptReleaseContext(cryptProvider, 0);
+}
+
+
+ref <utility::sync::criticalSection> posixHandler::createCriticalSection()
+{
+	return vmime::create <windowsCriticalSection>();
+}
+
+
 } // posix
 } // platforms
 } // vmime