removed a bunch of blank comment lines

[citadel.git] / webcit / crypto.c

diff --git a/webcit/crypto.c b/webcit/crypto.c
index 2e8b3aac1c5c5200ea49df0d481bc7e2c47f9374..8792a341e0780c3515dcfe201e2ca41f32c8b444 100644 (file)
--- a/webcit/crypto.c
+++ b/webcit/crypto.c
@@ -1,19 +1,13 @@
 /*
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-2012 by the citadel.org team
  *
  * This program is open source software.  You can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
+ * modify it under the terms of the GNU General Public License, version 3.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include "sysdep.h"
@@ -58,7 +52,7 @@ void shutdown_ssl(void)
  */
 void init_ssl(void)
 {
-       SSL_METHOD *ssl_method;
+       const SSL_METHOD *ssl_method;
        RSA *rsa=NULL;
        X509_REQ *req = NULL;
        X509 *cer = NULL;
@@ -391,7 +385,7 @@ void init_ssl(void)
  * starts SSL/TLS encryption for the current session.
  */
 int starttls(int sock) {
-       int retval, bits, alg_bits, r;
+       int retval, bits, alg_bits;/*r; */
        SSL *newssl;
 
        pthread_setspecific(ThreadSSL, NULL);
@@ -448,7 +442,7 @@ int starttls(int sock) {
        else {
                syslog(15, "SSL_accept success\n");
        }
-       r = BIO_set_close(newssl->rbio, BIO_NOCLOSE);
+       /*r = */BIO_set_close(newssl->rbio, BIO_NOCLOSE);
        bits = SSL_CIPHER_get_bits(SSL_get_current_cipher(newssl), &alg_bits);
        syslog(15, "SSL/TLS using %s on %s (%d of %d bits)\n",
                SSL_CIPHER_get_name(SSL_get_current_cipher(newssl)),
@@ -470,13 +464,13 @@ int starttls(int sock) {
  */
 void endtls(void)
 {
-       SSL_CTX *ctx = NULL;
+       /*SSL_CTX *ctx;*/
 
        if (THREADSSL == NULL) return;
 
        syslog(15, "Ending SSL/TLS\n");
        SSL_shutdown(THREADSSL);
-       ctx = SSL_get_SSL_CTX(THREADSSL);
+       /*ctx = */SSL_get_SSL_CTX(THREADSSL);
 
        /* I don't think this is needed, and it crashes the server anyway
         *