Merge branch 'master' of https://github.com/kisli/vmime
This commit is contained in:
commit
c406d45147
@ -292,11 +292,11 @@ static std::ostream& operator<<(std::ostream& os, const vmime::exception& e)
|
|||||||
* @param s structure object
|
* @param s structure object
|
||||||
* @param level current depth
|
* @param level current depth
|
||||||
*/
|
*/
|
||||||
static void printStructure(vmime::ref <const vmime::net::structure> s, const int level = 0)
|
static void printStructure(vmime::ref <const vmime::net::messageStructure> s, const int level = 0)
|
||||||
{
|
{
|
||||||
for (int i = 0 ; i < s->getPartCount() ; ++i)
|
for (int i = 0 ; i < s->getPartCount() ; ++i)
|
||||||
{
|
{
|
||||||
vmime::ref <const vmime::net::part> part = s->getPartAt(i);
|
vmime::ref <const vmime::net::messagePart> part = s->getPartAt(i);
|
||||||
|
|
||||||
for (int j = 0 ; j < level * 2 ; ++j)
|
for (int j = 0 ; j < level * 2 ; ++j)
|
||||||
std::cout << " ";
|
std::cout << " ";
|
||||||
|
@ -152,7 +152,7 @@ TLSSession_GnuTLS::TLSSession_GnuTLS(ref <security::cert::certificateVerifier> c
|
|||||||
|
|
||||||
// Sets some default priority on the ciphers, key exchange methods,
|
// Sets some default priority on the ciphers, key exchange methods,
|
||||||
// macs and compression methods.
|
// macs and compression methods.
|
||||||
#if VMIME_HAVE_GNUTLS_PRIORITY_FUNCS
|
#ifdef VMIME_HAVE_GNUTLS_PRIORITY_FUNCS
|
||||||
gnutls_dh_set_prime_bits(*m_gnutlsSession, 128);
|
gnutls_dh_set_prime_bits(*m_gnutlsSession, 128);
|
||||||
|
|
||||||
if ((res = gnutls_priority_set_direct
|
if ((res = gnutls_priority_set_direct
|
||||||
|
Loading…
Reference in New Issue
Block a user