* SSL updates (still disabled)

svn: 162

src/eggdrop.h

@@ -18,7 +18,7 @@
 #  define SSL_INC
 # endif /* ! SSL_INC */
 # undef HAVE_SSL
-/* Disabled for now # define HAVE_SSL 1 */
+/* #define HAVE_SSL 1 */
 #endif /* HAVE_OPENSSL_SSL_H */
 
 

src/mod/server.mod/server.c

@@ -1703,6 +1703,9 @@ static void dcc_chat_hostresolved(int i)
     killsock(dcc[i].sock);
     lostdcc(i);
   } else {
+#ifdef HAVE_SSL
+    ssl_link(dcc[i].sock, CONNECT_SSL);
+#endif /* HAVE_SSL */
     changeover_dcc(i, &DCC_CHAT_PASS, sizeof(struct chat_info));
     dcc[i].status = STAT_ECHO;
     get_user_flagrec(dcc[i].user, &fr, 0);

src/net.c

@@ -898,8 +898,8 @@ int ssl_link(register int sock, int state)
         } else if (state == ACCEPT_SSL) {
           err = SSL_accept(socklist[i].ssl);
         }
-        if ((errs!=SSL_ERROR_WANT_READ)&&(errs!=SSL_ERROR_WANT_WRITE)&& (errs!=SSL_ERROR_WANT_X509_LOOKUP))
-          break; /* anything not one of these is a sufficient condition to break out... */
+//        if ((errs!=SSL_ERROR_WANT_READ)&&(errs!=SSL_ERROR_WANT_WRITE)&& (errs!=SSL_ERROR_WANT_X509_LOOKUP))
+//          break; /* anything not one of these is a sufficient condition to break out... */
       }
       alarm(0);
   }
@@ -1150,7 +1150,7 @@ static int sockread(char *s, int *len)
 	    *len = 0;
 #ifdef HAVE_SSL
 /*            debug0("CALLING SSL_LINK() FROM SOCKREAD");
-            if (!ssl_link(socklist[i].sock))
+//            if (!ssl_link(socklist[i].sock))
               debug0("SSL_LINK FAILED");
             debug0("BACK FROM SSL_LINK()"); */
 #endif /* HAVE_SSL */