add missing comments on #endifs

[ckermit.git] / debian / patches / 060_disable_sslv3.patch

diff --git a/debian/patches/060_disable_sslv3.patch b/debian/patches/060_disable_sslv3.patch
index 596031a..8864229 100644 (file)
--- a/debian/patches/060_disable_sslv3.patch
+++ b/debian/patches/060_disable_sslv3.patch
@@ -1,3 +1,8 @@
+Description: Add DISABLE_SSLV3 compile-time option
+ Needed to link with Debian's openssl, which has ssl3_{client,server}_method() disabled.
+Author: Ian Beckwith <ianb@erislabs.net>
+Forwarded: fdc@columbia.edu
+Last-Update: 2015-12-14
 Index: ckermit/ck_ssl.c
 ===================================================================
 --- ckermit.orig/ck_ssl.c
@@ -11,7 +16,7 @@ Index: ckermit/ck_ssl.c
              }
              if ( !ssl_ctx ) {
                  debug(F110,"ssl_tn_init","SSLv3_client_method failed",0);
-+#endif
++#endif /* DISABLE_SSLV3 */
                  last_ssl_mode = -1;
                  return(0);
              }
@@ -40,7 +45,7 @@ Index: ckermit/ck_ssl.c
              }
              if ( !ssl_ctx ) {
                  debug(F110,"ssl_tn_init","SSLv3_server_method failed",0);
-+#endif
++#endif /* DISABLE_SSLV3 */
                  last_ssl_mode = -1;
                  return(0);
              }
@@ -52,14 +57,14 @@ Index: ckermit/ck_ssl.c
 +        SSL_CTX_set_options(ssl_ctx,SSL_OP_ALL|SSL_OP_NO_SSLv2
 +#ifdef DISABLE_SSLV3
 +                                    |SSL_OP_NO_SSLv3
-+#endif
++#endif /* DISABLE_SSLV3 */
 +            );
          SSL_CTX_set_options(tls_ctx,
 -                 SSL_OP_NO_SSLv2|SSL_OP_SINGLE_DH_USE|SSL_OP_EPHEMERAL_RSA);
 +                 SSL_OP_NO_SSLv2|SSL_OP_SINGLE_DH_USE|SSL_OP_EPHEMERAL_RSA
 +#ifdef DISABLE_SSLV3
 +                 |SSL_OP_NO_SSLv3
-+#endif
++#endif /* DISABLE_SSLV3 */
 +            );
  
          SSL_CTX_set_info_callback(ssl_ctx,ssl_client_info_callback);
@@ -72,7 +77,7 @@ Index: ckermit/ck_ssl.c
 +            SSL_OP_NO_SSLv2|SSL_OP_SINGLE_DH_USE|SSL_OP_EPHEMERAL_RSA
 +#ifdef DISABLE_SSLV3
 +            |SSL_OP_NO_SSLv3
-+#endif
++#endif /* DISABLE_SSLV3 */
 +        );
  
      SSL_CTX_set_info_callback(tls_http_ctx,ssl_client_info_callback);
@@ -99,7 +104,7 @@ Index: ckermit/ckcftp.c
                              SSL_OP_SINGLE_DH_USE|SSL_OP_EPHEMERAL_RSA
 +#ifdef DISABLE_SSLV3
 +                            |SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3
-+#endif
++#endif /* DISABLE_SSLV3 */
                              );
      } else {
          ssl_ftp_ctx = SSL_CTX_new(client_method);
@@ -109,7 +114,7 @@ Index: ckermit/ckcftp.c
                              SSL_OP_SINGLE_DH_USE|SSL_OP_EPHEMERAL_RSA
 +#ifdef DISABLE_SSLV3
 +                            |SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3
-+#endif
++#endif /* DISABLE_SSLV3 */
                              );
      }
      SSL_CTX_set_default_passwd_cb(ssl_ftp_ctx,