Begin separating YADIS handling from XRDS parsing

[citadel.git] / webcit / crypto.c

diff --git a/webcit/crypto.c b/webcit/crypto.c
index 9dd62118e32006be4dfefd6dc9d95d4bab6f61e8..61c2366f9ec9ea509355fd02ddb0e559393bd013 100644 (file)
--- a/webcit/crypto.c
+++ b/webcit/crypto.c
@@ -58,7 +58,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 +391,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);
@@ -421,7 +421,7 @@ int starttls(int sock) {
                errval = SSL_get_error(newssl, retval);
                ssl_error_reason = ERR_reason_error_string(ERR_get_error());
                if (ssl_error_reason == NULL) {
-                       syslog(3, "SSL_accept failed: errval=%i, retval=%i %s\n", errval, retval, strerror(errval));
+                       syslog(3, "SSL_accept failed: errval=%ld, retval=%d %s\n", errval, retval, strerror(errval));
                }
                else {
                        syslog(3, "SSL_accept failed: %s\n", ssl_error_reason);
@@ -436,7 +436,7 @@ int starttls(int sock) {
                errval = SSL_get_error(newssl, retval);
                ssl_error_reason = ERR_reason_error_string(ERR_get_error());
                if (ssl_error_reason == NULL) {
-                       syslog(3, "SSL_accept failed: errval=%i, retval=%i (%s)\n", errval, retval, strerror(errval));
+                       syslog(3, "SSL_accept failed: errval=%ld, retval=%d (%s)\n", errval, retval, strerror(errval));
                }
                else {
                        syslog(3, "SSL_accept failed: %s\n", ssl_error_reason);
@@ -448,7 +448,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 +470,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
         *