6 files changed, 29 insertions, 29 deletions
diff --git a/src/net/service.cpp b/src/net/service.cpp
index 8dde675a..6b1c34f3 100644
--- a/src/net/service.cpp
+++ b/src/net/service.cpp
@@ -29,7 +29,7 @@
 #endif // VMIME_HAVE_SASL_SUPPORT
 
 #if VMIME_HAVE_TLS_SUPPORT
-	#include "vmime/net/tls/defaultCertificateVerifier.hpp"
+	#include "vmime/security/cert/defaultCertificateVerifier.hpp"
 #endif // VMIME_HAVE_TLS_SUPPORT
 
 
@@ -53,7 +53,7 @@ service::service(ref <session> sess, const serviceInfos& /* infos */,
 	}
 
 #if VMIME_HAVE_TLS_SUPPORT
-	m_certVerifier = vmime::create <tls::defaultCertificateVerifier>();
+	m_certVerifier = vmime::create <security::cert::defaultCertificateVerifier>();
 #endif // VMIME_HAVE_TLS_SUPPORT
 
 	m_socketFactory = platformDependant::getHandler()->getSocketFactory();
@@ -97,13 +97,13 @@ void service::setAuthenticator(ref <security::authenticator> auth)
 
 #if VMIME_HAVE_TLS_SUPPORT
 
-void service::setCertificateVerifier(ref <tls::certificateVerifier> cv)
+void service::setCertificateVerifier(ref <security::cert::certificateVerifier> cv)
 {
 	m_certVerifier = cv;
 }
 
 
-ref <tls::certificateVerifier> service::getCertificateVerifier()
+ref <security::cert::certificateVerifier> service::getCertificateVerifier()
 {
 	return m_certVerifier;
 }
diff --git a/src/net/tls/TLSSession.cpp b/src/net/tls/TLSSession.cpp
index fb84714c..caa63d0a 100644
--- a/src/net/tls/TLSSession.cpp
+++ b/src/net/tls/TLSSession.cpp
@@ -91,7 +91,7 @@ static TLSGlobal g_gnutlsGlobal;
 
 
 
-TLSSession::TLSSession(ref <certificateVerifier> cv)
+TLSSession::TLSSession(ref <security::cert::certificateVerifier> cv)
 	: m_certVerifier(cv)
 {
 	int res;
@@ -212,7 +212,7 @@ ref <TLSSocket> TLSSession::getSocket(ref <socket> sok)
 }
 
 
-ref <tls::certificateVerifier> TLSSession::getCertificateVerifier()
+ref <security::cert::certificateVerifier> TLSSession::getCertificateVerifier()
 {
 	return m_certVerifier;
 }
diff --git a/src/net/tls/TLSSocket.cpp b/src/net/tls/TLSSocket.cpp
index ebf3214b..93066b98 100644
--- a/src/net/tls/TLSSocket.cpp
+++ b/src/net/tls/TLSSocket.cpp
@@ -29,7 +29,7 @@
 
 #include "vmime/platformDependant.hpp"
 
-#include "vmime/net/tls/X509Certificate.hpp"
+#include "vmime/security/cert/X509Certificate.hpp"
 
 
 namespace vmime {
@@ -185,7 +185,7 @@ void TLSSocket::handshake(ref <timeoutHandler> toHandler)
 	m_toHandler = NULL;
 
 	// Verify server's certificate(s)
-	ref <certificateChain> certs = getPeerCertificates();
+	ref <security::cert::certificateChain> certs = getPeerCertificates();
 
 	if (certs == NULL)
 		throw exceptions::tls_exception("No peer certificate.");
@@ -280,7 +280,7 @@ ssize_t TLSSocket::gnutlsPullFunc
 }
 
 
-ref <certificateChain> TLSSocket::getPeerCertificates()
+ref <security::cert::certificateChain> TLSSocket::getPeerCertificates()
 {
 	unsigned int certCount = 0;
 	const gnutls_datum* rawData = gnutls_certificate_get_peers
@@ -304,7 +304,7 @@ ref <certificateChain> TLSSocket::getPeerCertificates()
 
 	if (res >= 1)
 	{
-		std::vector <ref <certificate> > certs;
+		std::vector <ref <security::cert::certificate> > certs;
 		bool error = false;
 
 		count = static_cast <unsigned int>(res);
@@ -321,8 +321,8 @@ ref <certificateChain> TLSSocket::getPeerCertificates()
 			gnutls_x509_crt_export(x509Certs[i],
 				GNUTLS_X509_FMT_DER, data, &dataSize);
 
-			ref <X509Certificate> cert =
-				X509Certificate::import(data, dataSize);
+			ref <security::cert::X509Certificate> cert =
+				security::cert::X509Certificate::import(data, dataSize);
 
 			if (cert != NULL)
 				certs.push_back(cert);
@@ -339,7 +339,7 @@ ref <certificateChain> TLSSocket::getPeerCertificates()
 		if (error)
 			return NULL;
 
-		return vmime::create <certificateChain>(certs);
+		return vmime::create <security::cert::certificateChain>(certs);
 	}
 
 	delete [] x509Certs;
diff --git a/src/net/tls/X509Certificate.cpp b/src/security/cert/X509Certificate.cpp
index cfb52a1d..a1310f51 100644
--- a/src/net/tls/X509Certificate.cpp
+++ b/src/security/cert/X509Certificate.cpp
@@ -26,12 +26,12 @@
 
 #include <ctime>
 
-#include "vmime/net/tls/X509Certificate.hpp"
+#include "vmime/security/cert/X509Certificate.hpp"
 
 
 namespace vmime {
-namespace net {
-namespace tls {
+namespace security {
+namespace cert {
 
 
 #ifndef VMIME_BUILDING_DOC
@@ -267,7 +267,7 @@ const bool X509Certificate::equals(ref <const certificate> other) const
 }
 
 
-} // tls
-} // net
+} // cert
+} // security
 } // vmime
 
diff --git a/src/net/tls/certificateChain.cpp b/src/security/cert/certificateChain.cpp
index 52855cc2..2ac25258 100644
--- a/src/net/tls/certificateChain.cpp
+++ b/src/security/cert/certificateChain.cpp
@@ -21,12 +21,12 @@
 // the GNU General Public License cover the whole combination.
 //
 
-#include "vmime/net/tls/certificateChain.hpp"
+#include "vmime/security/cert/certificateChain.hpp"
 
 
 namespace vmime {
-namespace net {
-namespace tls {
+namespace security {
+namespace cert {
 
 
 certificateChain::certificateChain(const std::vector <ref <certificate> >& certs)
@@ -47,7 +47,7 @@ ref <certificate> certificateChain::getAt(const unsigned int index)
 }
 
 
-} // tls
-} // net
+} // cert
+} // security
 } // vmime
 
diff --git a/src/net/tls/defaultCertificateVerifier.cpp b/src/security/cert/defaultCertificateVerifier.cpp
index de0c6e45..b125d3e4 100644
--- a/src/net/tls/defaultCertificateVerifier.cpp
+++ b/src/security/cert/defaultCertificateVerifier.cpp
@@ -21,16 +21,16 @@
 // the GNU General Public License cover the whole combination.
 //
 
-#include "vmime/net/tls/defaultCertificateVerifier.hpp"
+#include "vmime/security/cert/defaultCertificateVerifier.hpp"
 
-#include "vmime/net/tls/X509Certificate.hpp"
+#include "vmime/security/cert/X509Certificate.hpp"
 
 #include "vmime/exception.hpp"
 
 
 namespace vmime {
-namespace net {
-namespace tls {
+namespace security {
+namespace cert {
 
 
 defaultCertificateVerifier::defaultCertificateVerifier()
@@ -158,7 +158,7 @@ void defaultCertificateVerifier::setX509TrustedCerts
 }
 
 
-} // tls
-} // net
+} // cert
+} // security
 } // vmime