m_ssl_openssl Remove unused MAX_DESCRIPTORS define

[user/henk/code/inspircd.git] / src / modules / extra / m_ssl_openssl.cpp

diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index ee024318b5ed6c1da43efab644954887422dd2c1..0ce36ed803ac19bb870dd988d45b632ea81d1d1f 100644 (file)
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -44,8 +44,6 @@
 # pragma comment(lib, "libgcc.lib")
 # pragma comment(lib, "libmingwex.lib")
 # pragma comment(lib, "gdi32.lib")
-# undef MAX_DESCRIPTORS
-# define MAX_DESCRIPTORS 10000
 #endif
 
 /* $CompileFlags: pkgconfversion("openssl","0.9.7") pkgconfincludes("openssl","/openssl/ssl.h","") -Wno-pedantic */
@@ -109,6 +107,9 @@ namespace OpenSSL
                {
                        SSL_CTX_set_mode(ctx, SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
                        SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, OnVerify);
+
+                       const unsigned char session_id[] = "inspircd";
+                       SSL_CTX_set_session_id_context(ctx, session_id, sizeof(session_id) - 1);
                }
 
                ~Context()
@@ -352,8 +353,11 @@ class OpenSSLIOHook : public SSLIOHook
                        certinfo->trusted = false;
                }
 
-               certinfo->dn = X509_NAME_oneline(X509_get_subject_name(cert),0,0);
-               certinfo->issuer = X509_NAME_oneline(X509_get_issuer_name(cert),0,0);
+               char buf[512];
+               X509_NAME_oneline(X509_get_subject_name(cert), buf, sizeof(buf));
+               certinfo->dn = buf;
+               X509_NAME_oneline(X509_get_issuer_name(cert), buf, sizeof(buf));
+               certinfo->issuer = buf;
 
                if (!X509_digest(cert, profile->GetDigest(), md, &n))
                {