* Enable SSL/TLS in the client

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 9160389b299469a2247129379c0b76e60525d140..dd40585e50b0e120eb9eec6bf35808ee65615bda 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 590.44  2002/01/06 11:11:31  error
+ * Enable SSL/TLS in the client
+
  Revision 590.43  2002/01/06 10:49:55  error
  * Add some #includes I apparently somehow missed
 
@@ -3092,4 +3095,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
-

diff --git a/citadel/citadel.c b/citadel/citadel.c
index ce8c2889a2bff8b3e5f44115cee96c96471507bc..6eb959a2f4b43dad038404a305ff418604550a52 100644 (file)
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -47,6 +47,7 @@
 #include "citadel_decls.h"
 #include "tools.h"
 #include "acconfig.h"
+#include "client_crypto.h"
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"
 #endif
@@ -977,14 +978,18 @@ int main(int argc, char **argv)
              strncpy(nonce, sptr, NONCE_SIZE);
           }
        }
-       
+
        get_serv_info(telnet_client_host);
 
+       if (!starttls()) {
+               printf("Session will not be encrypted.\n");
+       }
+       
        look_for_ansi();
        cls(0);
        color(7);
 
-       printf("%-23s\n%s\n%s\n", serv_info.serv_software, serv_info.serv_humannode,
+       printf("%-24s\n%s\n%s\n", serv_info.serv_software, serv_info.serv_humannode,
               serv_info.serv_bbs_city);
        screenwidth = 80;       /* default screen dimensions */
        screenheight = 24;