* Genericized the Citadel API for TLS-enabling protocols

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 3cf7224dcd790a244be60c6e9aba690933c98ecd..7dbc0fe0a0648a75811762bf1019ff081c65704a 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 614.35  2004/02/16 20:55:47  ajc
+ * Genericized the Citadel API for TLS-enabling protocols
+
  Revision 614.34  2004/02/16 18:16:39  error
  * Remove some unnecessary and possibly hazardous debugging code leftover
    from debugging IMAP STARTTLS
@@ -19,7 +22,6 @@
  Revision 614.30  2004/02/15 06:06:49  ajc
  * More work on IMAP TLS.  Still not working correctly.  :(  Added in
    support for server-side certificates.  Now instead of failing it hangs.
- VS: ----------------------------------------------------------------------
 
  Revision 614.29  2004/02/14 04:41:55  ajc
  * STARTTLS attempt #2.  Still disabled because it's broken.
@@ -5345,4 +5347,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/serv_crypto.c b/citadel/serv_crypto.c
index af5cf0885d6dd41660e38b4ca32f8e79a0bb7cb5..3462e0ae4ec6cc93747c2fcd0002fcc4571326bc 100644 (file)
--- a/citadel/serv_crypto.c
+++ b/citadel/serv_crypto.c
@@ -292,33 +292,34 @@ int client_read_ssl(char *buf, int bytes, int timeout)
 
 
 /*
- * cmd_stls() starts SSL/TLS encryption for the current session
+ * CtdlStartTLS() starts SSL/TLS encryption for the current session.  It
+ * must be supplied with pre-generated strings for responses of "ok," "no
+ * support for TLS," and "error" so that we can use this in any protocol.
  */
-void cmd_stls(char *params)
-{
+void CtdlStartTLS(char *ok_response, char *nosup_response,
+                       char *error_response) {
+
        int retval, bits, alg_bits;
 
        if (!ssl_ctx) {
-               cprintf("%d No SSL_CTX available\n", ERROR + CMD_NOT_SUPPORTED);
+               cprintf("%s", nosup_response);
                return;
        }
        if (!(CC->ssl = SSL_new(ssl_ctx))) {
                lprintf(2, "SSL_new failed: %s\n",
-                               ERR_reason_error_string(ERR_peek_error()));
-               cprintf("%d SSL_new: %s\n", ERROR + INTERNAL_ERROR,
                                ERR_reason_error_string(ERR_get_error()));
+               cprintf("%s", error_response);
                return;
        }
        if (!(SSL_set_fd(CC->ssl, CC->client_socket))) {
                lprintf(2, "SSL_set_fd failed: %s\n",
-                       ERR_reason_error_string(ERR_peek_error()));
+                       ERR_reason_error_string(ERR_get_error()));
                SSL_free(CC->ssl);
                CC->ssl = NULL;
-               cprintf("%d SSL_set_fd: %s\n", ERROR + INTERNAL_ERROR,
-                               ERR_reason_error_string(ERR_get_error()));
+               cprintf("%s", error_response);
                return;
        }
-       cprintf("%d \n", CIT_OK);
+       cprintf("%s", ok_response);
        retval = SSL_accept(CC->ssl);
        if (retval < 1) {
                /*
@@ -347,6 +348,29 @@ void cmd_stls(char *params)
 }
 
 
+/*
+ * cmd_stls() starts SSL/TLS encryption for the current session
+ */
+void cmd_stls(char *params)
+{
+       char ok_response[SIZ];
+       char nosup_response[SIZ];
+       char error_response[SIZ];
+
+       sprintf(ok_response,
+               "%d Begin TLS negotiation now\n",
+               CIT_OK);
+       sprintf(nosup_response,
+               "%d TLS not supported here\n",
+               ERROR + CMD_NOT_SUPPORTED);
+       sprintf(error_response,
+               "%d TLS negotiation error\n",
+               ERROR + INTERNAL_ERROR);
+
+       CtdlStartTLS(ok_response, nosup_response, error_response);
+}
+
+
 /*
  * cmd_gtls() returns status info about the TLS connection
  */

diff --git a/citadel/serv_crypto.h b/citadel/serv_crypto.h
index 13c3cfbbf64482493d3ab48d7a3e59b03d90765c..d833d40d1612451c8bf543ccdbb9bc52b0c63e46 100644 (file)
--- a/citadel/serv_crypto.h
+++ b/citadel/serv_crypto.h
@@ -14,7 +14,7 @@ void cmd_stls(char *params);
 void cmd_gtls(char *params);
 void endtls(void);
 void ssl_lock(int mode, int n, const char *file, int line);
-
+void CtdlStartTLS(char *ok_response, char *nosup_response, char *error_response);
 extern SSL_CTX *ssl_ctx;  
 
 #endif