Applied patch sent by Chris West to fix Debian bug 859789

(compatibility with libssl)

diff --git a/webcit/crypto.c b/webcit/crypto.c
index 427b4d93e7268dadb52c5f97e25b746e30a4f809..6e350aee4f66ff151d7120110aae1a449c347355 100644 (file)
--- a/webcit/crypto.c
+++ b/webcit/crypto.c
@@ -65,9 +65,11 @@ void init_ssl(void)
        char buf[SIZ];
        int rv = 0;
 
        char buf[SIZ];
        int rv = 0;
 

+#ifndef OPENSSL_NO_EGD

        if (!access("/var/run/egd-pool", F_OK)) {
                RAND_egd("/var/run/egd-pool");
        }
        if (!access("/var/run/egd-pool", F_OK)) {
                RAND_egd("/var/run/egd-pool");
        }

+#endif

 
        if (!RAND_status()) {
                syslog(LOG_WARNING, "PRNG not adequately seeded, won't do SSL/TLS\n");
 
        if (!RAND_status()) {
                syslog(LOG_WARNING, "PRNG not adequately seeded, won't do SSL/TLS\n");


@@ -333,8 +335,8 @@ void init_ssl(void)
                                if (cer = X509_new(), cer != NULL) {
 
                                        ASN1_INTEGER_set(X509_get_serialNumber(cer), 0);
                                if (cer = X509_new(), cer != NULL) {
 
                                        ASN1_INTEGER_set(X509_get_serialNumber(cer), 0);

-                                       X509_set_issuer_name(cer, req->req_info->subject);
-                                       X509_set_subject_name(cer, req->req_info->subject);
+                                       X509_set_issuer_name(cer, X509_REQ_get_subject_name(req));
+                                       X509_set_subject_name(cer, X509_REQ_get_subject_name(req));

                                        X509_gmtime_adj(X509_get_notBefore(cer), 0);
                                        X509_gmtime_adj(X509_get_notAfter(cer),(long)60*60*24*SIGN_DAYS);
 
                                        X509_gmtime_adj(X509_get_notBefore(cer), 0);
                                        X509_gmtime_adj(X509_get_notAfter(cer),(long)60*60*24*SIGN_DAYS);
 


@@ -444,7 +446,7 @@ int starttls(int sock) {
        else {
                syslog(LOG_INFO, "SSL_accept success\n");
        }
        else {
                syslog(LOG_INFO, "SSL_accept success\n");
        }

-       /*r = */BIO_set_close(newssl->rbio, BIO_NOCLOSE);
+       /*r = */BIO_set_close(SSL_get_rbio(newssl), BIO_NOCLOSE);

        bits = SSL_CIPHER_get_bits(SSL_get_current_cipher(newssl), &alg_bits);
        syslog(LOG_INFO, "SSL/TLS using %s on %s (%d of %d bits)\n",
                SSL_CIPHER_get_name(SSL_get_current_cipher(newssl)),
        bits = SSL_CIPHER_get_bits(SSL_get_current_cipher(newssl), &alg_bits);
        syslog(LOG_INFO, "SSL/TLS using %s on %s (%d of %d bits)\n",
                SSL_CIPHER_get_name(SSL_get_current_cipher(newssl)),

diff --git a/webcit/debian/control b/webcit/debian/control
index 51855800ddf853355a5f60e46e1ccfa904494fb7..e5cf4ed4e210b1a3a441f653a39c45ed3675bdf6 100644 (file)
--- a/webcit/debian/control
+++ b/webcit/debian/control
@@ -12,9 +12,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, debconf, tinymce, citadel-common, o
 Suggests: citadel-server, apache2 | apache, localepurge, gnome-icon-theme
 Recommends: shared-mime-info
 Description: web-based frontend to Citadel groupware server
 Suggests: citadel-server, apache2 | apache, localepurge, gnome-icon-theme
 Recommends: shared-mime-info
 Description: web-based frontend to Citadel groupware server

- WebCit is a web-based, AJAX-enabled frontend to the Citadel groupware system.
- It is an attractive web middleware layer that allows user-friendly access.
+ WebCit is a web-based, dynamic web frontend to the Citadel groupware system.
+ It is an attractive web applicagtion that allows user-friendly access.

  By combining WebCit and Citadel, you can have a versatile online environment
  with many users concurrently accessing the same system using the user
  interface of their choice (text, web, or downloaded client software).
  By combining WebCit and Citadel, you can have a versatile online environment
  with many users concurrently accessing the same system using the user
  interface of their choice (text, web, or downloaded client software).

-