client/red_channel: DEBUG: allow no SSL usage (useful for valgrind)server_multi_client.v4

1 files changed, 25 insertions, 15 deletions

diff --git a/client/red_channel.cpp b/client/red_channel.cpp
index f4cdf529..12971022 100644
--- a/client/red_channel.cpp
+++ b/client/red_channel.cpp
@@ -170,23 +170,33 @@ void RedChannelBase::link(uint32_t connection_id, const std::string& password,
     if (bioKey != NULL) {
         BIO_write(bioKey, reply->pub_key, SPICE_TICKET_PUBKEY_BYTES);
         pubkey = d2i_PUBKEY_bio(bioKey, NULL);
-        rsa = pubkey->pkey.rsa;
-        nRSASize = RSA_size(rsa);
-        AutoArray<unsigned char> bufEncrypted(new unsigned char[nRSASize]);
-
-        /*
-                The use of RSA encryption limit the potential maximum password length.
-                for RSA_PKCS1_OAEP_PADDING it is RSA_size(rsa) - 41.
-        */
-        if (RSA_public_encrypt(password.length() + 1, (unsigned char *)password.c_str(),
-                               (uint8_t *)bufEncrypted.get(),
-                               rsa, RSA_PKCS1_OAEP_PADDING) > 0) {
-            send((uint8_t*)bufEncrypted.get(), nRSASize);
+        if (pubkey == NULL) {
+#ifdef ALLOW_NO_SSL
+            /* silly games vs valgrind */
+            nRSASize = 128;
+            uint8_t buf[128] = {0};
+            send(buf, nRSASize);
+#else
+            THROW_ERR(SPICEC_ERROR_CODE_CONNECT_FAILED, "connect error - failed to get pubkey from server link message");
+#endif
         } else {
-            THROW("could not encrypt password");
+            rsa = pubkey->pkey.rsa;
+            nRSASize = RSA_size(rsa);
+            AutoArray<unsigned char> bufEncrypted(new unsigned char[nRSASize]);
+
+            /*
+                    The use of RSA encryption limit the potential maximum password length.
+                    for RSA_PKCS1_OAEP_PADDING it is RSA_size(rsa) - 41.
+            */
+            if (RSA_public_encrypt(password.length() + 1, (unsigned char *)password.c_str(),
+                                   (uint8_t *)bufEncrypted.get(),
+                                   rsa, RSA_PKCS1_OAEP_PADDING) > 0) {
+                send((uint8_t*)bufEncrypted.get(), nRSASize);
+            } else {
+                THROW("could not encrypt password");
+            }
+            memset(bufEncrypted.get(), 0, nRSASize);
         }
-
-        memset(bufEncrypted.get(), 0, nRSASize);
     } else {
         THROW("Could not initiate BIO");
     }