Changeset 689 for trunk/sx/compress.c

Timestamp:

19/08/08 12:42:16 (5 months ago)

Author:

smoku

Message:

Do not offer compression if STARTTLS is required and not enabled. Return better error on STARTTLS required failure.

Files:

• trunk/sx/compress.c (modified) (1 diff)

trunk/sx/compress.c

@@ -120 +120 @@
     int ns;
 
-    /* if the session is already compressed, or the app told us not to, then we don't offer anything */
-    if(s->compressed || !(s->flags & SX_COMPRESS_OFFER))
+    /* if the session is already compressed, or the app told us not to,
+         * or STARTTLS is required and stream is not encrypted yet, then we don't offer anything */
+    if(s->compressed || !(s->flags & SX_COMPRESS_OFFER) || ((s->flags & SX_SSL_STARTTLS_REQUIRE) && s->ssf == 0))
         return;