From e31a7f0ede3a8eaab6ef8ff04e5854688e2c1207 Mon Sep 17 00:00:00 2001 From: Ian Beckwith Date: Mon, 14 Dec 2015 13:16:19 +0000 Subject: [PATCH] add missing comments on #endifs --- ck_ssl.c | 10 +++++----- ckcftp.c | 4 ++-- debian/patches/060_disable_sslv3.patch | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ck_ssl.c b/ck_ssl.c index cc8a4ed..1f09ed0 100644 --- a/ck_ssl.c +++ b/ck_ssl.c @@ -1609,7 +1609,7 @@ ssl_tn_init(mode) int mode; } if ( !ssl_ctx ) { debug(F110,"ssl_tn_init","SSLv3_client_method failed",0); -#endif +#endif /* DISABLE_SSLV3 */ last_ssl_mode = -1; return(0); } @@ -1662,7 +1662,7 @@ ssl_tn_init(mode) int mode; } if ( !ssl_ctx ) { debug(F110,"ssl_tn_init","SSLv3_server_method failed",0); -#endif +#endif /* DISABLE_SSLV3 */ last_ssl_mode = -1; return(0); } @@ -1699,13 +1699,13 @@ ssl_tn_init(mode) int mode; 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 #ifdef DISABLE_SSLV3 |SSL_OP_NO_SSLv3 -#endif +#endif /* DISABLE_SSLV3 */ ); SSL_CTX_set_info_callback(ssl_ctx,ssl_client_info_callback); @@ -2234,7 +2234,7 @@ ssl_http_init(hostname) char * hostname; 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); diff --git a/ckcftp.c b/ckcftp.c index 79139f1..2223abd 100644 --- a/ckcftp.c +++ b/ckcftp.c @@ -10227,7 +10227,7 @@ ssl_auth() { 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); @@ -10238,7 +10238,7 @@ ssl_auth() { 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, diff --git a/debian/patches/060_disable_sslv3.patch b/debian/patches/060_disable_sslv3.patch index 0eb8b0c..8864229 100644 --- a/debian/patches/060_disable_sslv3.patch +++ b/debian/patches/060_disable_sslv3.patch @@ -16,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); } @@ -45,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); } @@ -57,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); @@ -77,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); @@ -104,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); @@ -114,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, -- 2.11.0