Control: tags -1 + patch The attached patch fixes the build with openssl 1.1.
It is low risk; it just adds accessors in two cases, and wraps some very old code in an existing #ifndef. Chris.
>From c9e2fc0bf1255ef138c7bb6f01d31be6b50304d6 Mon Sep 17 00:00:00 2001 From: "Chris West (Faux)" <[email protected]> Date: Tue, 25 Jul 2017 12:07:16 +0000 Subject: [PATCH] libssl 1.1 support --- webcit-904-dfsg/crypto.c | 8 +++++--- webcit-904-dfsg/debian/control | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/webcit-904-dfsg/crypto.c b/webcit-904-dfsg/crypto.c index 6925dfa..d1e21c3 100644 --- a/webcit-904-dfsg/crypto.c +++ b/webcit-904-dfsg/crypto.c @@ -65,9 +65,11 @@ void init_ssl(void) char buf[SIZ]; int rv = 0; +#ifndef OPENSSL_NO_EGD 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"); @@ -333,8 +335,8 @@ void init_ssl(void) 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); @@ -444,7 +446,7 @@ int starttls(int sock) { 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)), diff --git a/webcit-904-dfsg/debian/control b/webcit-904-dfsg/debian/control index f328cfe..575e490 100644 --- a/webcit-904-dfsg/debian/control +++ b/webcit-904-dfsg/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Debian Citadel Team <[email protected]> Uploaders: Wilfried Goesgens <[email protected]>, Michael Meskes <[email protected]>, Alexander Wirt <[email protected]> Build-Depends: debhelper (>= 9), po-debconf, quilt, libical-dev (>= 2.0.0), - gettext, locales, libcitadel-dev (>= 904), autotools-dev, libssl1.0-dev, + gettext, locales, libcitadel-dev (>= 904), autotools-dev, libssl-dev, libexpat1-dev, libmarkdown2-dev, zlib1g-dev Standards-Version: 3.9.8 Vcs-Git: git://anonscm.debian.org/pkg-citadel/webcit.git -- 2.13.3
