Attachment #139041 for bug #200684

Lines 5864-5870 Link Here

(-)trunk.old/admin/acinclude.m4.in (-1 / +1 lines)
5864	ac_ssl_includes=$ac_ssl_includes ac_ssl_libraries=$ac_ssl_libraries ac_ssl_rsaref=$ac_ssl_rsaref"	5864	ac_ssl_includes=$ac_ssl_includes ac_ssl_libraries=$ac_ssl_libraries ac_ssl_rsaref=$ac_ssl_rsaref"
5865		5865
5866	if test "$have_ssl" = "yes"; then	5866	if test "$have_ssl" = "yes"; then
5867	AC_DEFINE(USE_OPENSSL, 1, [Use OpenSSL])	5867	AC_DEFINE(ENABLE_OPENSSL, 1, [Use OpenSSL])
5868	fi	5868	fi
5869		5869
5870	ssl_libraries="$ac_ssl_libraries"	5870	ssl_libraries="$ac_ssl_libraries"

Lines 151-157 Link Here

(-)trunk.old/altlinux.spec (-2 / +2 lines)
151	-DCMAKE_INSTALL_PREFIX=%_prefix \	151	-DCMAKE_INSTALL_PREFIX=%_prefix \
152	-DCMAKE_SKIP_RPATH=YES \	152	-DCMAKE_SKIP_RPATH=YES \
153	-DUSE_GCC_VISIBILITY=1 \	153	-DUSE_GCC_VISIBILITY=1 \
154	-DUSE_KDE3=0 \	154	-DENABLE_KDE3=0 \
155	-DSIM_FLAVOUR="-qt"	155	-DSIM_FLAVOUR="-qt"
156	%make_build	156	%make_build
157	%makeinstall DESTDIR=%simqtinstalldir	157	%makeinstall DESTDIR=%simqtinstalldir
Lines 168-174 Link Here
168	-DCMAKE_INSTALL_PREFIX=%_prefix \	168	-DCMAKE_INSTALL_PREFIX=%_prefix \
169	-DCMAKE_SKIP_RPATH=YES \	169	-DCMAKE_SKIP_RPATH=YES \
170	-DUSE_GCC_VISIBILITY=1 \	170	-DUSE_GCC_VISIBILITY=1 \
171	-DUSE_KDE3=1	171	-DENABLE_KDE3=1
172	%make_build	172	%make_build
173	%makeinstall DESTDIR=%siminstalldir	173	%makeinstall DESTDIR=%siminstalldir
174	%endif	174	%endif




            GET_FILENAME_COMPONENT(plugin ${_cur_dir} NAME_WE)
            
            STRING(TOUPPER ${plugin} uc_plugin)
            OPTION(ENABLE_PLUGIN_${uc_plugin}  "Enable plugin ${plugin}" ON)

            # all plugins starting with _ are *not* optional!
            IF(${uc_plugin} MATCHES "^_.*$")
                ## prepend
                SET(SIM_PLUGINS ${plugin} ${SIM_PLUGINS})
                MARK_AS_ADVANCED(ENABLE_PLUGIN_${uc_plugin})
            ELSE(${uc_plugin} MATCHES "^_.*$")
                ## append
                SET(SIM_PLUGINS ${SIM_PLUGINS} ${plugin})

MACRO(SIM_INCLUDE_PLUGINS)
    FOREACH(plugin ${SIM_PLUGINS})
        STRING(TOUPPER ${plugin} uc_plugin)
        IF(ENABLE_PLUGIN_${uc_plugin})
            MESSAGE(STATUS "Using plugin " ${plugin})
            ADD_SUBDIRECTORY(plugins/${plugin})
        ELSE(ENABLE_PLUGIN_${uc_plugin})
            MESSAGE(STATUS "Skipping plugin " ${plugin})
        ENDIF(ENABLE_PLUGIN_${uc_plugin})
    ENDFOREACH(plugin ${SIM_PLUGINS})
ENDMACRO(SIM_INCLUDE_PLUGINS)




IF(NOT WIN32)
    INCLUDE(FindKDE3)
    IF(KDE3_FOUND)
        OPTION(ENABLE_KDE3 "Use kde3 integration" YES)
        IF(ENABLE_KDE3)
            INCLUDE_DIRECTORIES(${KDE3_INCLUDE_DIRS})
            LINK_DIRECTORIES(${KDE3_LIB_DIR})
        ENDIF(ENABLE_KDE3)
    ENDIF(KDE3_FOUND)
ENDIF(NOT WIN32)

# do config checks
INCLUDE(ConfigureChecks.cmake)

MACRO_BOOL_TO_01(OPENSSL_FOUND ENABLE_OPENSSL)
MACRO_BOOL_TO_01(X11_FOUND HAVE_X)
MACRO_BOOL_TO_01(ENABLE_KDE3 USE_KDE)

# development or release builds
OPTION(DEV_BUILD "Build development version" YES)

Lines 29-35 Link Here

(-)trunk.old/config.h.cmake (-1 / +1 lines)
29	#cmakedefine HAVE_TM_GMTOFF 1	29	#cmakedefine HAVE_TM_GMTOFF 1
30		30
31	// libraries	31	// libraries
32	#cmakedefine USE_OPENSSL 1	32	#cmakedefine ENABLE_OPENSSL 1
33	#cmakedefine HAVE_X 1	33	#cmakedefine HAVE_X 1
34	#cmakedefine USE_KDE 1	34	#cmakedefine USE_KDE 1
35		35

Lines 2875-2881 Link Here

(-)trunk.old/plugins/icq/icqclient.cpp (-2 / +2 lines)
2875	sendMTN(screen(data), msg->type() == MessageTypingStart ? ICQ_MTN_START : ICQ_MTN_FINISH);	2875	sendMTN(screen(data), msg->type() == MessageTypingStart ? ICQ_MTN_START : ICQ_MTN_FINISH);
2876	delete msg;	2876	delete msg;
2877	return true;	2877	return true;
2878	#ifdef USE_OPENSSL	2878	#ifdef ENABLE_OPENSSL
2879	case MessageOpenSecure: {	2879	case MessageOpenSecure: {
2880	if (data == NULL)	2880	if (data == NULL)
2881	return false;	2881	return false;
Lines 2959-2965 Link Here
2959	(data->Uin.toULong() \|\| hasCap(data, CAP_AIM_SENDFILE));	2959	(data->Uin.toULong() \|\| hasCap(data, CAP_AIM_SENDFILE));
2960	case MessageWarning:	2960	case MessageWarning:
2961	return data && (data->Uin.toULong() == 0);	2961	return data && (data->Uin.toULong() == 0);
2962	#ifdef USE_OPENSSL	2962	#ifdef ENABLE_OPENSSL
2963	case MessageOpenSecure:	2963	case MessageOpenSecure:
2964	if ((data == NULL) \|\| ((data->Status.toULong() & 0xFFFF) == ICQ_STATUS_OFFLINE))	2964	if ((data == NULL) \|\| ((data->Status.toULong() & 0xFFFF) == ICQ_STATUS_OFFLINE))
2965	return false;	2965	return false;

Lines 924-930 Link Here

(-)trunk.old/plugins/icq/icqclient.h (-1 / +1 lines)
924	QValueList<SendDirectMsg> m_queue;	924	QValueList<SendDirectMsg> m_queue;
925	QString name();	925	QString name();
926	QString m_name;	926	QString m_name;
927	#ifdef USE_OPENSSL	927	#ifdef ENABLE_OPENSSL
928	void secureConnect();	928	void secureConnect();
929	void secureListen();	929	void secureListen();
930	void secureStop(bool bShutdown);	930	void secureStop(bool bShutdown);




{
    m_channel = PLUGIN_NULL;
    m_state = WaitLogin;
#ifdef ENABLE_OPENSSL
    m_ssl = NULL;
#endif
}

    m_state   = None;
    m_channel = channel;
    m_port    = (unsigned short)(data->Port.toULong());
#ifdef ENABLE_OPENSSL
    m_ssl = NULL;
#endif
}

            m_data->DirectPluginStatus.clear();
        break;
    }
#ifdef ENABLE_OPENSSL
    secureStop(false);
#endif
}

bool DirectClient::isSecure()
{
#ifdef ENABLE_OPENSSL
    return m_ssl && m_ssl->connected();
#else
    return false;

        case ICQ_MSGxSECURExOPEN:
        case ICQ_MSGxSECURExCLOSE:
            msg_str = QString::null;
#ifdef ENABLE_OPENSSL
            msg_str = "1";
#endif
            sendAck(seq, type, msgFlags, msg_str);
#ifdef ENABLE_OPENSSL
            if (type == ICQ_MSGxSECURExOPEN){
                secureListen();
            }else{

            id.id_l = seq;
            Message *m = m_client->parseMessage(type, m_client->screen(m_data), msg_str, m_socket->readBuffer(), id, 0);
            switch (msg->type()){
#ifdef ENABLE_OPENSSL
            case MessageCloseSecure:
                secureStop(true);
                break;

    processMsgQueue();
}

#ifdef ENABLE_OPENSSL

class ICQ_SSLClient : public SSLClient
{




    : m_url(url)
{
    m_cookie = "0";
#ifdef ENABLE_OPENSSL
    /*
        Buffer k;
        for (unsigned i = 0; i < 48; i++){


QString JabberHttpPool::getKey()
{
#ifdef ENABLE_OPENSSL
    if (m_key.isEmpty()){
        m_key = m_seed;
        return m_key;

        return;
    Buffer *packet = new Buffer;
    *packet << (const char*)m_cookie.local8Bit().data();
#ifdef ENABLE_OPENSSL
    *packet << ";" << (const char*)getKey().local8Bit().data();
#endif
    *packet << ",";

Lines 86-92 Link Here

(-)trunk.old/plugins/jabber/jabber_auth.cpp (-1 / +1 lines)
86	m_requests.push_back(req);	86	m_requests.push_back(req);
87	}	87	}
88		88
89	#ifdef USE_OPENSSL	89	#ifdef ENABLE_OPENSSL
90		90
91	void JabberClient::auth_digest()	91	void JabberClient::auth_digest()
92	{	92	{

Lines 271-277 Link Here

(-)trunk.old/plugins/jabber/jabberclient.cpp (-2 / +2 lines)
271	connected();	271	connected();
272	return;	272	return;
273	}	273	}
274	#ifdef USE_OPENSSL	274	#ifdef ENABLE_OPENSSL
275	m_bSSL = true;	275	m_bSSL = true;
276	SSLClient *ssl = new JabberSSL(socket()->socket());	276	SSLClient *ssl = new JabberSSL(socket()->socket());
277	socket()->setSocket(ssl);	277	socket()->setSocket(ssl);
Lines 902-908 Link Here
902	if (getRegister()){	902	if (getRegister()){
903	auth_register();	903	auth_register();
904	}else{	904	}else{
905	#ifdef USE_OPENSSL	905	#ifdef ENABLE_OPENSSL
906	if (getUsePlain()){	906	if (getUsePlain()){
907	auth_plain();	907	auth_plain();
908	}else{	908	}else{

Lines 457-463 Link Here

(-)trunk.old/plugins/jabber/jabberclient.h (-1 / +1 lines)
457	void processList();	457	void processList();
458		458
459	void auth_plain();	459	void auth_plain();
460	#ifdef USE_OPENSSL	460	#ifdef ENABLE_OPENSSL
461	void auth_digest();	461	void auth_digest();
462	#endif	462	#endif
463	void auth_register();	463	void auth_register();

Lines 57-63 Link Here

(-)trunk.old/plugins/jabber/jabberconfig.cpp (-2 / +2 lines)
57	edtServer1->setText(i18n("jabber.org"));	57	edtServer1->setText(i18n("jabber.org"));
58	edtPort1->setValue(m_client->getPort());	58	edtPort1->setValue(m_client->getPort());
59	}	59	}
60	#ifdef USE_OPENSSL	60	#ifdef ENABLE_OPENSSL
61	chkSSL->setChecked(m_client->getUseSSL());	61	chkSSL->setChecked(m_client->getUseSSL());
62	chkSSL1->setChecked(m_client->getUseSSL());	62	chkSSL1->setChecked(m_client->getUseSSL());
63	chkPlain->setChecked(m_client->getUsePlain());	63	chkPlain->setChecked(m_client->getUsePlain());
Lines 132-138 Link Here
132	m_client->setPassword(edtPasswd->text());	132	m_client->setPassword(edtPasswd->text());
133	m_client->setRegister(chkRegister->isChecked());	133	m_client->setRegister(chkRegister->isChecked());
134	}	134	}
135	#ifdef USE_OPENSSL	135	#ifdef ENABLE_OPENSSL
136	if (m_bConfig){	136	if (m_bConfig){
137	m_client->setUseSSL(chkSSL1->isChecked());	137	m_client->setUseSSL(chkSSL1->isChecked());
138	}else{	138	}else{

Lines 17-23 Link Here

(-)trunk.old/plugins/jabber/jabber_ssl.cpp (-1 / +1 lines)
17		17
18	#include "simapi.h"	18	#include "simapi.h"
19		19
20	#ifdef USE_OPENSSL	20	#ifdef ENABLE_OPENSSL
21		21
22	#include "jabber_ssl.h"	22	#include "jabber_ssl.h"
23		23

Lines 21-27 Link Here

(-)trunk.old/plugins/jabber/jabber_ssl.h (-1 / +1 lines)
21	#include "simapi.h"	21	#include "simapi.h"
22	#include "socket.h"	22	#include "socket.h"
23		23
24	#ifdef USE_OPENSSL	24	#ifdef ENABLE_OPENSSL
25		25
26	class JabberSSL : public SIM::SSLClient	26	class JabberSSL : public SIM::SSLClient
27	{	27	{

Lines 1-4 Link Here

(-)trunk.old/plugins/spell/CMakeLists.txt (-6 / +6 lines)
1	IF(ASPELL_FOUND AND NOT USE_KDE3)	1	IF(ASPELL_FOUND AND NOT ENABLE_KDE3)
2		2
3	#################	3	#################
4	# spell library #	4	# spell library #
Lines 42-51 Link Here
42		42
43	SIM_ADD_PLUGIN(spell)	43	SIM_ADD_PLUGIN(spell)
44		44
45	ELSE(ASPELL_FOUND AND NOT USE_KDE3)	45	ELSE(ASPELL_FOUND AND NOT ENABLE_KDE3)
46	IF(USE_KDE3)	46	IF(ENABLE_KDE3)
47	MESSAGE(STATUS "Spell plugin is disabled when building with KDE")	47	MESSAGE(STATUS "Spell plugin is disabled when building with KDE")
48	ELSE(USE_KDE3)	48	ELSE(ENABLE_KDE3)
49	MESSAGE(STATUS "Cannot build spell plugin because aspell is missing on your system")	49	MESSAGE(STATUS "Cannot build spell plugin because aspell is missing on your system")
50	ENDIF(USE_KDE3)	50	ENDIF(ENABLE_KDE3)
51	ENDIF(ASPELL_FOUND AND NOT USE_KDE3)	51	ENDIF(ASPELL_FOUND AND NOT ENABLE_KDE3)

Lines 1-7 Link Here

(-)trunk.old/plugins/transparent/CMakeLists.txt (-3 / +3 lines)
1	#######################	1	#######################
2	# transparent library #	2	# transparent library #
3	#######################	3	#######################
4	IF(WIN32 OR USE_KDE3)	4	IF(WIN32 OR ENABLE_KDE3)
5	SET(transparent_SRCS	5	SET(transparent_SRCS
6	transparent.cpp	6	transparent.cpp
7	transparentcfg.cpp	7	transparentcfg.cpp
Lines 22-27 Link Here
22	ENDIF(NOT WIN32)	22	ENDIF(NOT WIN32)
23		23
24	SIM_ADD_PLUGIN(transparent)	24	SIM_ADD_PLUGIN(transparent)
25	ELSE(WIN32 OR USE_KDE3)	25	ELSE(WIN32 OR ENABLE_KDE3)
26	MESSAGE(STATUS "This plugin can only be used on windows or KDE")	26	MESSAGE(STATUS "This plugin can only be used on windows or KDE")
27	ENDIF(WIN32 OR USE_KDE3)	27	ENDIF(WIN32 OR ENABLE_KDE3)

Lines 117-127 Link Here

(-)trunk.old/sim/CMakeLists.txt (-2 / +2 lines)
117	TARGET_LINK_LIBRARIES(simlib ${OPENSSL_LIBRARIES} ${OPENSSL_EAY_LIBRARIES})	117	TARGET_LINK_LIBRARIES(simlib ${OPENSSL_LIBRARIES} ${OPENSSL_EAY_LIBRARIES})
118	endif(OPENSSL_FOUND)	118	endif(OPENSSL_FOUND)
119		119
120	IF(USE_KDE3)	120	IF(ENABLE_KDE3)
121	ADD_DEFINITIONS(${KDE3_DEFINITIONS})	121	ADD_DEFINITIONS(${KDE3_DEFINITIONS})
122	LINK_DIRECTORIES(${KDE3_LIB_DIR})	122	LINK_DIRECTORIES(${KDE3_LIB_DIR})
123	TARGET_LINK_LIBRARIES(simlib ${QT_AND_KDECORE_LIBS} kdeui kio)	123	TARGET_LINK_LIBRARIES(simlib ${QT_AND_KDECORE_LIBS} kdeui kio)
124	ENDIF(USE_KDE3)	124	ENDIF(ENABLE_KDE3)
125		125
126	# we need wsock32 on win32	126	# we need wsock32 on win32
127	if (WIN32)	127	if (WIN32)





#include "simapi.h"

#ifdef ENABLE_OPENSSL
#include <openssl/ssl.h>
#include <openssl/err.h>
#include <openssl/bio.h>

    Buffer		m_data;
    Buffer		*m_postData;
    enum State{
#ifdef ENABLE_OPENSSL
        SSLConnect,
#endif
        None,

        Redirect
    };
    State		m_state;
#ifdef ENABLE_OPENSSL
    bool		m_bHTTPS;
#endif
    friend class FetchManager;


#endif

#ifdef ENABLE_OPENSSL

class HTTPSClient : public SSLClient
{

#endif
    m_received = 0;
    m_socket = new ClientSocket(this);
#ifdef ENABLE_OPENSSL
    m_bHTTPS = false;
#endif
    QString proto, host, user, pass, uri, extra;

        return;
    }
    if (proto != "http"){
#ifdef ENABLE_OPENSSL
        if (proto == "https"){
            m_bHTTPS = true;
        }else{
#endif
            log(L_WARN, "Unsupported protocol %s", (const char*)m_uri.local8Bit());
            return;
#ifdef ENABLE_OPENSSL
        }
#endif
    }


void FetchClientPrivate::connect_ready()
{
#ifdef ENABLE_OPENSSL
    if ((m_state == None) & m_bHTTPS){
        m_socket->setRaw(true);
        m_socket->readBuffer().init(0);

        }
        switch (m_state){
        case None:
#ifdef ENABLE_OPENSSL
        case SSLConnect:
#endif
            if (getToken(line, ' ').left(5) != "HTTP/"){

Lines 51-57 Link Here

(-)trunk.old/sim/sim_pch.h (-1 / +1 lines)
51	#include <qsignalslotimp.h>	51	#include <qsignalslotimp.h>
52	#endif	52	#endif
53		53
54	#ifdef USE_OPENSSL	54	#ifdef ENABLE_OPENSSL
55	#include <openssl/ssl.h>	55	#include <openssl/ssl.h>
56	#include <openssl/err.h>	56	#include <openssl/err.h>
57	#include <openssl/bio.h>	57	#include <openssl/bio.h>

Lines 26-32 Link Here

(-)trunk.old/sim/socket.h (-2 / +2 lines)
26		26
27	class QTimer;	27	class QTimer;
28		28
29	#ifdef USE_OPENSSL	29	#ifdef ENABLE_OPENSSL
30	typedef struct ssl_ctx_st SSL_CTX;	30	typedef struct ssl_ctx_st SSL_CTX;
31	typedef struct ssl_st SSL;	31	typedef struct ssl_st SSL;
32	typedef struct bio_st BIO;	32	typedef struct bio_st BIO;
Lines 234-240 Link Here
234	ClientSocket *m_clientSocket;	234	ClientSocket *m_clientSocket;
235	};	235	};
236		236
237	#ifdef USE_OPENSSL	237	#ifdef ENABLE_OPENSSL
238		238
239	EXPORT QByteArray md5(const char*, int size = -1);	239	EXPORT QByteArray md5(const char*, int size = -1);
240	EXPORT QByteArray sha1(const char*, int size = -1);	240	EXPORT QByteArray sha1(const char*, int size = -1);

Lines 19-25 Link Here

(-)trunk.old/sim/sslclient.cpp (-1 / +1 lines)
19	#include "config.h"	19	#include "config.h"
20	#endif	20	#endif
21		21
22	#ifdef USE_OPENSSL	22	#ifdef ENABLE_OPENSSL
23		23
24	#include <openssl/ssl.h>	24	#include <openssl/ssl.h>
25	#include <openssl/err.h>	25	#include <openssl/err.h>

Lines 7-13 Link Here

(-)trunk.old/sim/win32/sim-default.vsprops (-1 / +1 lines)
7	Name="VCCLCompilerTool"	7	Name="VCCLCompilerTool"
8	AdditionalIncludeDirectories="$(QTDIR)\include;$(SolutionDir)\sim;$(SolutionDir)\sim\win32;$(SolutionDir)\plugins\_core"	8	AdditionalIncludeDirectories="$(QTDIR)\include;$(SolutionDir)\sim;$(SolutionDir)\sim\win32;$(SolutionDir)\plugins\_core"
9	BufferSecurityCheck="true"	9	BufferSecurityCheck="true"
10	PreprocessorDefinitions="NO_MOC_INCLUDES;HAVE_STDIO_H;HAVE_STRING_H;HAVE_MALLOC_H;QT_DLL;UNICODE;WIN32;QT_THREAD_SUPPORT;USE_OPENSSL;USE_AUDIERE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;CVS_BUILD=1;SIMTAG=\"$(SIMTAG)\";VERSION=\"0.9.5\";PACKAGE=\"SIM\";LTDL_OBJDIR=\"\";LTDL_SHLIB_EXT=\".dll\";"	10	PreprocessorDefinitions="NO_MOC_INCLUDES;HAVE_STDIO_H;HAVE_STRING_H;HAVE_MALLOC_H;QT_DLL;UNICODE;WIN32;QT_THREAD_SUPPORT;ENABLE_OPENSSL;USE_AUDIERE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;CVS_BUILD=1;SIMTAG=\"$(SIMTAG)\";VERSION=\"0.9.5\";PACKAGE=\"SIM\";LTDL_OBJDIR=\"\";LTDL_SHLIB_EXT=\".dll\";"
11	/>	11	/>
12	<Tool	12	<Tool
13	Name="VCLinkerTool"	13	Name="VCLinkerTool"

Return to bug 200684

Lines 449-455 Link Here

(-)trunk.old/plugins/icq/icqdirect.cpp (-8 / +8 lines)
449	{	449	{
450	m_channel = PLUGIN_NULL;	450	m_channel = PLUGIN_NULL;
451	m_state = WaitLogin;	451	m_state = WaitLogin;
452	#ifdef USE_OPENSSL	452	#ifdef ENABLE_OPENSSL
453	m_ssl = NULL;	453	m_ssl = NULL;
454	#endif	454	#endif
455	}	455	}
Lines 460-466 Link Here
460	m_state = None;	460	m_state = None;
461	m_channel = channel;	461	m_channel = channel;
462	m_port = (unsigned short)(data->Port.toULong());	462	m_port = (unsigned short)(data->Port.toULong());
463	#ifdef USE_OPENSSL	463	#ifdef ENABLE_OPENSSL
464	m_ssl = NULL;	464	m_ssl = NULL;
465	#endif	465	#endif
466	}	466	}
Lines 482-495 Link Here
482	m_data->DirectPluginStatus.clear();	482	m_data->DirectPluginStatus.clear();
483	break;	483	break;
484	}	484	}
485	#ifdef USE_OPENSSL	485	#ifdef ENABLE_OPENSSL
486	secureStop(false);	486	secureStop(false);
487	#endif	487	#endif
488	}	488	}
489		489
490	bool DirectClient::isSecure()	490	bool DirectClient::isSecure()
491	{	491	{
492	#ifdef USE_OPENSSL	492	#ifdef ENABLE_OPENSSL
493	return m_ssl && m_ssl->connected();	493	return m_ssl && m_ssl->connected();
494	#else	494	#else
495	return false;	495	return false;
Lines 706-716 Link Here
706	case ICQ_MSGxSECURExOPEN:	706	case ICQ_MSGxSECURExOPEN:
707	case ICQ_MSGxSECURExCLOSE:	707	case ICQ_MSGxSECURExCLOSE:
708	msg_str = QString::null;	708	msg_str = QString::null;
709	#ifdef USE_OPENSSL	709	#ifdef ENABLE_OPENSSL
710	msg_str = "1";	710	msg_str = "1";
711	#endif	711	#endif
712	sendAck(seq, type, msgFlags, msg_str);	712	sendAck(seq, type, msgFlags, msg_str);
713	#ifdef USE_OPENSSL	713	#ifdef ENABLE_OPENSSL
714	if (type == ICQ_MSGxSECURExOPEN){	714	if (type == ICQ_MSGxSECURExOPEN){
715	secureListen();	715	secureListen();
716	}else{	716	}else{
Lines 832-838 Link Here
832	id.id_l = seq;	832	id.id_l = seq;
833	Message *m = m_client->parseMessage(type, m_client->screen(m_data), msg_str, m_socket->readBuffer(), id, 0);	833	Message *m = m_client->parseMessage(type, m_client->screen(m_data), msg_str, m_socket->readBuffer(), id, 0);
834	switch (msg->type()){	834	switch (msg->type()){
835	#ifdef USE_OPENSSL	835	#ifdef ENABLE_OPENSSL
836	case MessageCloseSecure:	836	case MessageCloseSecure:
837	secureStop(true);	837	secureStop(true);
838	break;	838	break;
Lines 1437-1443 Link Here
1437	processMsgQueue();	1437	processMsgQueue();
1438	}	1438	}
1439		1439
1440	#ifdef USE_OPENSSL	1440	#ifdef ENABLE_OPENSSL
1441		1441
1442	class ICQ_SSLClient : public SSLClient	1442	class ICQ_SSLClient : public SSLClient
1443	{	1443	{

Lines 30-42 Link Here

(-)trunk.old/cmake/SimPlugins.cmake (-7 / +7 lines)
30	GET_FILENAME_COMPONENT(plugin ${_cur_dir} NAME_WE)	30	GET_FILENAME_COMPONENT(plugin ${_cur_dir} NAME_WE)
31		31
32	STRING(TOUPPER ${plugin} uc_plugin)	32	STRING(TOUPPER ${plugin} uc_plugin)
33	OPTION(USE_PLUGIN_${uc_plugin} "Use plugin ${plugin}" ON)	33	OPTION(ENABLE_PLUGIN_${uc_plugin} "Enable plugin ${plugin}" ON)
34		34
35	# all plugins starting with _ are not optional!	35	# all plugins starting with _ are not optional!
36	IF(${uc_plugin} MATCHES "^_.*$")	36	IF(${uc_plugin} MATCHES "^_.*$")
37	## prepend	37	## prepend
38	SET(SIM_PLUGINS ${plugin} ${SIM_PLUGINS})	38	SET(SIM_PLUGINS ${plugin} ${SIM_PLUGINS})
39	MARK_AS_ADVANCED(USE_${uc_plugin})	39	MARK_AS_ADVANCED(ENABLE_PLUGIN_${uc_plugin})
40	ELSE(${uc_plugin} MATCHES "^_.*$")	40	ELSE(${uc_plugin} MATCHES "^_.*$")
41	## append	41	## append
42	SET(SIM_PLUGINS ${SIM_PLUGINS} ${plugin})	42	SET(SIM_PLUGINS ${SIM_PLUGINS} ${plugin})
Lines 50-60 Link Here
50	MACRO(SIM_INCLUDE_PLUGINS)	50	MACRO(SIM_INCLUDE_PLUGINS)
51	FOREACH(plugin ${SIM_PLUGINS})	51	FOREACH(plugin ${SIM_PLUGINS})
52	STRING(TOUPPER ${plugin} uc_plugin)	52	STRING(TOUPPER ${plugin} uc_plugin)
53	IF(USE_PLUGIN_${uc_plugin})	53	IF(ENABLE_PLUGIN_${uc_plugin})
54	MESSAGE(STATUS "using plugin " ${plugin})	54	MESSAGE(STATUS "Using plugin " ${plugin})
55	ADD_SUBDIRECTORY(plugins/${plugin})	55	ADD_SUBDIRECTORY(plugins/${plugin})
56	ELSE(USE_PLUGIN_${uc_plugin})	56	ELSE(ENABLE_PLUGIN_${uc_plugin})
57	MESSAGE(STATUS "skipping plugin " ${plugin})	57	MESSAGE(STATUS "Skipping plugin " ${plugin})
58	ENDIF(USE_PLUGIN_${uc_plugin})	58	ENDIF(ENABLE_PLUGIN_${uc_plugin})
59	ENDFOREACH(plugin ${SIM_PLUGINS})	59	ENDFOREACH(plugin ${SIM_PLUGINS})
60	ENDMACRO(SIM_INCLUDE_PLUGINS)	60	ENDMACRO(SIM_INCLUDE_PLUGINS)

Lines 51-70 Link Here

(-)trunk.old/CMakeLists.txt (-5 / +5 lines)
51	IF(NOT WIN32)	51	IF(NOT WIN32)
52	INCLUDE(FindKDE3)	52	INCLUDE(FindKDE3)
53	IF(KDE3_FOUND)	53	IF(KDE3_FOUND)
54	OPTION(USE_KDE3 "Use kde3 integration" YES)	54	OPTION(ENABLE_KDE3 "Use kde3 integration" YES)
55	IF(USE_KDE3)	55	IF(ENABLE_KDE3)
56	INCLUDE_DIRECTORIES(${KDE3_INCLUDE_DIRS})	56	INCLUDE_DIRECTORIES(${KDE3_INCLUDE_DIRS})
57	LINK_DIRECTORIES(${KDE3_LIB_DIR})	57	LINK_DIRECTORIES(${KDE3_LIB_DIR})
58	ENDIF(USE_KDE3)	58	ENDIF(ENABLE_KDE3)
59	ENDIF(KDE3_FOUND)	59	ENDIF(KDE3_FOUND)
60	ENDIF(NOT WIN32)	60	ENDIF(NOT WIN32)
61		61
62	# do config checks	62	# do config checks
63	INCLUDE(ConfigureChecks.cmake)	63	INCLUDE(ConfigureChecks.cmake)
64		64
65	MACRO_BOOL_TO_01(OPENSSL_FOUND USE_OPENSSL)	65	MACRO_BOOL_TO_01(OPENSSL_FOUND ENABLE_OPENSSL)
66	MACRO_BOOL_TO_01(X11_FOUND HAVE_X)	66	MACRO_BOOL_TO_01(X11_FOUND HAVE_X)
67	MACRO_BOOL_TO_01(USE_KDE3 USE_KDE)	67	MACRO_BOOL_TO_01(ENABLE_KDE3 USE_KDE)
68		68
69	# development or release builds	69	# development or release builds
70	OPTION(DEV_BUILD "Build development version" YES)	70	OPTION(DEV_BUILD "Build development version" YES)

Lines 53-59 Link Here

(-)trunk.old/plugins/jabber/httppoll.cpp (-3 / +3 lines)
53	: m_url(url)	53	: m_url(url)
54	{	54	{
55	m_cookie = "0";	55	m_cookie = "0";
56	#ifdef USE_OPENSSL	56	#ifdef ENABLE_OPENSSL
57	/*	57	/*
58	Buffer k;	58	Buffer k;
59	for (unsigned i = 0; i < 48; i++){	59	for (unsigned i = 0; i < 48; i++){
Lines 73-79 Link Here
73		73
74	QString JabberHttpPool::getKey()	74	QString JabberHttpPool::getKey()
75	{	75	{
76	#ifdef USE_OPENSSL	76	#ifdef ENABLE_OPENSSL
77	if (m_key.isEmpty()){	77	if (m_key.isEmpty()){
78	m_key = m_seed;	78	m_key = m_seed;
79	return m_key;	79	return m_key;
Lines 106-112 Link Here
106	return;	106	return;
107	Buffer *packet = new Buffer;	107	Buffer *packet = new Buffer;
108	packet << (const char)m_cookie.local8Bit().data();	108	packet << (const char)m_cookie.local8Bit().data();
109	#ifdef USE_OPENSSL	109	#ifdef ENABLE_OPENSSL
110	packet << ";" << (const char)getKey().local8Bit().data();	110	packet << ";" << (const char)getKey().local8Bit().data();
111	#endif	111	#endif
112	*packet << ",";	112	*packet << ",";

Lines 17-23 Link Here

(-)trunk.old/sim/fetch.cpp (-9 / +9 lines)
17		17
18	#include "simapi.h"	18	#include "simapi.h"
19		19
20	#ifdef USE_OPENSSL	20	#ifdef ENABLE_OPENSSL
21	#include <openssl/ssl.h>	21	#include <openssl/ssl.h>
22	#include <openssl/err.h>	22	#include <openssl/err.h>
23	#include <openssl/bio.h>	23	#include <openssl/bio.h>
Lines 83-89 Link Here
83	Buffer m_data;	83	Buffer m_data;
84	Buffer *m_postData;	84	Buffer *m_postData;
85	enum State{	85	enum State{
86	#ifdef USE_OPENSSL	86	#ifdef ENABLE_OPENSSL
87	SSLConnect,	87	SSLConnect,
88	#endif	88	#endif
89	None,	89	None,
Lines 93-99 Link Here
93	Redirect	93	Redirect
94	};	94	};
95	State m_state;	95	State m_state;
96	#ifdef USE_OPENSSL	96	#ifdef ENABLE_OPENSSL
97	bool m_bHTTPS;	97	bool m_bHTTPS;
98	#endif	98	#endif
99	friend class FetchManager;	99	friend class FetchManager;
Lines 341-347 Link Here
341		341
342	#endif	342	#endif
343		343
344	#ifdef USE_OPENSSL	344	#ifdef ENABLE_OPENSSL
345		345
346	class HTTPSClient : public SSLClient	346	class HTTPSClient : public SSLClient
347	{	347	{
Lines 546-552 Link Here
546	#endif	546	#endif
547	m_received = 0;	547	m_received = 0;
548	m_socket = new ClientSocket(this);	548	m_socket = new ClientSocket(this);
549	#ifdef USE_OPENSSL	549	#ifdef ENABLE_OPENSSL
550	m_bHTTPS = false;	550	m_bHTTPS = false;
551	#endif	551	#endif
552	QString proto, host, user, pass, uri, extra;	552	QString proto, host, user, pass, uri, extra;
Lines 556-569 Link Here
556	return;	556	return;
557	}	557	}
558	if (proto != "http"){	558	if (proto != "http"){
559	#ifdef USE_OPENSSL	559	#ifdef ENABLE_OPENSSL
560	if (proto == "https"){	560	if (proto == "https"){
561	m_bHTTPS = true;	561	m_bHTTPS = true;
562	}else{	562	}else{
563	#endif	563	#endif
564	log(L_WARN, "Unsupported protocol %s", (const char*)m_uri.local8Bit());	564	log(L_WARN, "Unsupported protocol %s", (const char*)m_uri.local8Bit());
565	return;	565	return;
566	#ifdef USE_OPENSSL	566	#ifdef ENABLE_OPENSSL
567	}	567	}
568	#endif	568	#endif
569	}	569	}
Lines 695-701 Link Here
695		695
696	void FetchClientPrivate::connect_ready()	696	void FetchClientPrivate::connect_ready()
697	{	697	{
698	#ifdef USE_OPENSSL	698	#ifdef ENABLE_OPENSSL
699	if ((m_state == None) & m_bHTTPS){	699	if ((m_state == None) & m_bHTTPS){
700	m_socket->setRaw(true);	700	m_socket->setRaw(true);
701	m_socket->readBuffer().init(0);	701	m_socket->readBuffer().init(0);
Lines 826-832 Link Here
826	}	826	}
827	switch (m_state){	827	switch (m_state){
828	case None:	828	case None:
829	#ifdef USE_OPENSSL	829	#ifdef ENABLE_OPENSSL
830	case SSLConnect:	830	case SSLConnect:
831	#endif	831	#endif
832	if (getToken(line, ' ').left(5) != "HTTP/"){	832	if (getToken(line, ' ').left(5) != "HTTP/"){