diff options
| author |  Fabio Bas | 2010-08-13 10:48:56 +0000 |
|---|---|---|
| committer | Fabio Bas | 2010-08-13 10:48:56 +0000 |
| commit | 80c0d45bb037de66439df11930a29fd34d4ecab5 (patch) | |
| tree | 43118eabba03d5076cf76b9a6f534662bb4101fd /src/modules | |
| parent | implemented $certificate() to get info from local cert (ticket #866) (diff) | |
| download | KVIrc-80c0d45bb037de66439df11930a29fd34d4ecab5.tar.gz KVIrc-80c0d45bb037de66439df11930a29fd34d4ecab5.tar.bz2 KVIrc-80c0d45bb037de66439df11930a29fd34d4ecab5.zip | |
Changed kvissl initialization so that we can initialize ssl also from outside the kvissl class
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4863 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/str/libkvistr.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp index 84eaf7a0e..87b71d5b3 100644 --- a/src/modules/str/libkvistr.cpp +++ b/src/modules/str/libkvistr.cpp @@ -40,7 +40,7 @@ #if defined( COMPILE_SSL_SUPPORT ) && !defined( COMPILE_NO_EMBEDDED_CODE ) // The current implementation - #include <openssl/ssl.h> + #include <kvi_ssl.h> #include <openssl/evp.h> #include <openssl/pem.h> #elif defined(COMPILE_NO_EMBEDDED_CODE) @@ -2229,15 +2229,12 @@ static bool str_kvs_fnc_evpSign(KviKvsModuleFunctionCall * c) #if defined(COMPILE_SSL_SUPPORT) && !defined(COMPILE_NO_EMBEDDED_CODE) + KviSSL::globalSSLInit(); EVP_MD_CTX md_ctx; EVP_PKEY * pKey = 0; unsigned int len = 0; unsigned char *sig = 0; - //FIXME do we need a mutex here? - SSL_library_init(); - SSL_load_error_strings(); - if(szCert.isEmpty()) { //use default cert @@ -2364,10 +2361,7 @@ static bool str_kvs_fnc_evpVerify(KviKvsModuleFunctionCall * c) #if defined(COMPILE_SSL_SUPPORT) && !defined(COMPILE_NO_EMBEDDED_CODE) - //FIXME do we need a mutex here? - SSL_library_init(); - SSL_load_error_strings(); - + KviSSL::globalSSLInit(); szSign = QByteArray::fromBase64(szSignB64); const char * message = szMessage.data(); |