Changeset 788 for trunk/src

Timestamp:

Oct 10, 2010, 9:22:38 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

network: Added OpenSSL support (closes #167).

Location:

trunk/src/network/ssl

Files:

• qsslsocket_openssl.cpp (modified) (4 diffs)
• qsslsocket_openssl_symbols.cpp (modified) (3 diffs)
• ssl.pri (modified) (1 diff)

trunk/src/network/ssl/qsslsocket_openssl.cpp

@@ -188 +188 @@
         else if (protoString == QLatin1String("TLSv1"))
             ciph.d->protocol = QSsl::TlsV1;
-        
+
         if (descriptionList.at(2).startsWith(QLatin1String("Kx=")))
             ciph.d->keyExchangeMethod = descriptionList.at(2).mid(3);
@@ -341 +341 @@
     if (configuration.peerVerifyDepth != 0)
         q_SSL_CTX_set_verify_depth(ctx, configuration.peerVerifyDepth);
-    
+
     // Create and initialize SSL session
     if (!(ssl = q_SSL_new(ctx))) {
@@ -425 +425 @@
             do {
                 if (attempts < 500) {
-#ifdef Q_OS_UNIX
+#if
                     struct timespec ts = {0, 33333333};
                     nanosleep(&ts, 0);
@@ -534 +534 @@
     do {
         transmitting = false;
-        
+
         // If the connection is secure, we can transfer data from the write
         // buffer (in plain text) to the write BIO through SSL_write.

trunk/src/network/ssl/qsslsocket_openssl_symbols.cpp

@@ -262 +262 @@
     if (!(_q_##func = _q_PTR_##func(lib->resolve(#ordinal)))) \
         qWarning("QSslSocket: cannot resolve "#func);
+
+
+
+
+
 #else
 #define RESOLVEFUNC(func) \
@@ -462 +467 @@
     libssl = libcrypto = 0;
     return pair;
-
+# elif defined(Q_OS_OS2)
+    // note: the k* versions of libraries were in use once; support them for
+    // backward compatibility
+    static const char *ssl_dll[] = { "ssl10", "kssl10" };
+    static const char *crypto_dll[] = { "crypto10", "kcrypt10" };
+
+    QLibrary *libssl;
+    for (size_t i = 0; i < sizeof(ssl_dll)/sizeof(ssl_dll[0]); ++i) {
+        libssl = new QLibrary(QLatin1String(ssl_dll[i]));
+        if (libssl->load())
+            break;
+        delete libssl;
+        libssl = 0;
+    }
+    if (!libssl) {
+        return pair;
+    }
+
+    QLibrary *libcrypto;
+    for (size_t i = 0; i < sizeof(crypto_dll)/sizeof(crypto_dll[0]); ++i) {
+        libcrypto = new QLibrary(QLatin1String(crypto_dll[i]));
+        if (libcrypto->load())
+            break;
+        delete libcrypto;
+        libcrypto = 0;
+    }
+    if (!libcrypto) {
+        delete libssl;
+        return pair;
+    }
+
+    pair.first = libssl;
+    pair.second = libcrypto;
+    return pair;
 # else
     // not implemented for this platform yet
@@ -535 +573 @@
     RESOLVEFUNC(sk_free, 2571, libs.second )
     RESOLVEFUNC(sk_num, 2576, libs.second )
-    RESOLVEFUNC(sk_pop_free, 2578, libs.second )    
+    RESOLVEFUNC(sk_pop_free, 2578, libs.second )
     RESOLVEFUNC(sk_value, 2585, libs.second )
     RESOLVEFUNC(SSL_CIPHER_description, 11, libs.first )

trunk/src/network/ssl/ssl.pri

@@ -37 +37 @@
     # Add optional SSL libs
     LIBS_PRIVATE += $$OPENSSL_LIBS
+
+
+
+
+
 }