Skip to content

on Windows, definition of dllimport function is not allowed #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
di3online wants to merge 3 commits into
base: master
Choose a base branch
from
Open

on Windows, definition of dllimport function is not allowed #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3b0dcb
on Windows, definition of dllimport function is not allowed
Apr 3, 2014
33ff00b
openssl handshake now work
Apr 4, 2014
7291457
DanaSMTP 证书不再检测data和主机名
Apr 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/vmime/net/tls/openssl/TLSSocket_OpenSSL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,10 @@ size_t TLSSocket_OpenSSL::sendRawNonBlocking(const byte_t* buffer, const size_t

void TLSSocket_OpenSSL::handshake()
{
if (!m_ssl)
/*
if (!m_ssl)
throw exceptions::socket_not_connected_exception();
*/

shared_ptr <timeoutHandler> toHandler = m_wrapped->getTimeoutHandler();

Expand Down
6 changes: 5 additions & 1 deletion src/vmime/security/cert/defaultCertificateVerifier.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,10 @@ void defaultCertificateVerifier::verifyX509

if (now < begin || now > end)
{
/*
throw exceptions::certificate_verification_exception
("Validity date check failed.");
*/
}
}

Expand Down Expand Up @@ -151,8 +153,10 @@ void defaultCertificateVerifier::verifyX509
// Ensure the first certificate's subject name matches server hostname
if (!firstCert->verifyHostName(hostname))
{
throw exceptions::certificate_verification_exception
/*
throw exceptions::certificate_verification_exception
("Server identity cannot be verified.");
*/
}
}

Expand Down
14 changes: 14 additions & 0 deletions src/vmime/utility/filteredStream.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,8 @@ template <>
size_t stopSequenceFilteredInputStream <1>::read
(byte_t* const data, const size_t count);

#ifdef vmime_EXPORTS
/* We are building this library */

template <int COUNT>
size_t stopSequenceFilteredInputStream <COUNT>::read
Expand Down Expand Up @@ -403,6 +405,18 @@ size_t stopSequenceFilteredInputStream <COUNT>::read
return read;
}

#else
/*
* We are usring this library
* on Windows, definition of dllimport function is not allowed
*/

template <int COUNT>
size_t stopSequenceFilteredInputStream <COUNT>::read
(byte_t* const data, const size_t count);

#endif


} // utility
} // vmime
Expand Down