From f62ade5f702a8195dac061b52c5f9f2a4b563455 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 1 Jan 2018 17:08:38 -0500 Subject: [PATCH] citserver updated to openssl 1.1 API --- citadel/modules/crypto/serv_crypto.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/citadel/modules/crypto/serv_crypto.c b/citadel/modules/crypto/serv_crypto.c index 5830da909..af81e1982 100644 --- a/citadel/modules/crypto/serv_crypto.c +++ b/citadel/modules/crypto/serv_crypto.c @@ -277,10 +277,9 @@ void init_ssl(void) if (req) { 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); req_pkey = X509_REQ_get_pubkey(req); @@ -605,7 +604,7 @@ void CtdlStartTLS(char *ok_response, char *nosup_response, char *error_response) CC->ssl = NULL; return; } - BIO_set_close(CC->ssl->rbio, BIO_NOCLOSE); + // BIO_set_close(CC->ssl->rbio, BIO_NOCLOSE); not needed anymore in openssl 1.1 ? bits = SSL_CIPHER_get_bits(SSL_get_current_cipher(CC->ssl), &alg_bits); syslog(LOG_INFO, "crypto: SSL/TLS using %s on %s (%d of %d bits)", SSL_CIPHER_get_name(SSL_get_current_cipher(CC->ssl)), -- 2.30.2