X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-sys%2Fevtloop.c;h=11546b22be1644cb47a97fb5cbf38157f9b0b141;hp=4dd3d45afab7897870afa2773c519eb04f6c7cdb;hb=f3076bd918cea51487a5b28dff9c69578f50b25e;hpb=0b38190e1f839237d104c1094cd34fb2388c81df

diff --git a/lib-sys/evtloop.c b/lib-sys/evtloop.c
index 4dd3d45..11546b2 100644
--- a/lib-sys/evtloop.c
+++ b/lib-sys/evtloop.c
@@ -93,10 +93,9 @@ int el_job_release(job_t *w, el_status reason)
     return -1;
 }
 
-static int el_job_connecting_ssl(job_t *w)
+static int el_job_tlsing(job_t *w, int starttls)
 {
     int err = gnutls_handshake(w->session);
-
     if (err < 0 && !gnutls_error_is_fatal(err)) {
         int wr = gnutls_record_get_direction(w->session);
         return el_job_setemode(w, wr ? EL_WRITING : EL_READING);
@@ -107,15 +106,27 @@ static int el_job_connecting_ssl(job_t *w)
 #if 0
     if (!tls_check_certificate (conn))
         return -1;
+#endif
 
     /* set Security Strength Factor (SSF) for SASL */
     /* NB: gnutls_cipher_get_key_size() returns key length in bytes */
-    conn->ssf = gnutls_cipher_get_key_size(gnutls_cipher_get(w->session)) * 8;
-#endif
+    w->ssf   = gnutls_cipher_get_key_size(gnutls_cipher_get(w->session)) * 8;
     w->state = EL_LLP_READY;
+    if (starttls)
+        return el_job_setemode(w, w->mode);
     return w->m->on_event(w, EL_EVT_RUNNING);
 }
 
+static int el_job_starttlsing(job_t *w)
+{
+    return el_job_tlsing(w, true);
+}
+
+static int el_job_connecting_ssl(job_t *w)
+{
+    return el_job_tlsing(w, false);
+}
+
 static int el_job_connecting(job_t *w)
 {
     int err = 0;
@@ -132,7 +143,7 @@ static int el_job_connecting(job_t *w)
     return w->m->on_event(w, EL_EVT_RUNNING);
 }
 
-static int tls_negociate(job_t *w)
+static int tls_negotiate(job_t *w)
 {
     static int protocol_priority[] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 };
 
@@ -182,7 +193,7 @@ int el_job_connect(job_t *w, struct sockaddr *addr, socklen_t len,
         goto error;
 
     w->fd  = sock;
-    if (ssl && tls_negociate(w) < 0)
+    if (ssl && tls_negotiate(w) < 0)
         goto error;
 
     w->llp = &el_job_connecting;
@@ -193,6 +204,15 @@ int el_job_connect(job_t *w, struct sockaddr *addr, socklen_t len,
     return el_job_release(w, EL_ERROR);
 }
 
+int el_job_starttls(job_t *w)
+{
+    if (tls_negotiate(w) < 0)
+        return el_job_release(w, EL_RDHUP);
+    w->state = EL_LLP_INIT;
+    w->llp   = &el_job_starttlsing;
+    return w->llp(w);
+}
+
 ssize_t el_job_read(job_t *w, buffer_t *buf)
 {
     ssize_t nr;