security/titus: Update to 0.4

Additional fixes, final release

MFH:		2020Q4

4 files changed, 8 insertions, 69 deletions

diff --git a/security/titus/Makefile b/security/titus/Makefile
index 1a54c754db72..1b87ea898dc0 100644
--- a/security/titus/Makefile
+++ b/security/titus/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	titus
-PORTVERSION=	0.3
-PORTREVISION=	6
+PORTVERSION=	0.4
+PORTREVISION=	0
 CATEGORIES=	security
 
 MAINTAINER=	feld@FreeBSD.org
@@ -11,6 +11,9 @@ COMMENT=	TLS/SSL proxy server
 
 LICENSE=	MIT
 
+DEPRECATED=	Development has officially ceased
+EXPIRATION_DATE=	2021-02-01
+
 USES=		compiler:c++11-lang ssl
 USE_RC_SUBR=	titus
 
diff --git a/security/titus/distinfo b/security/titus/distinfo
index 4d6e3d5b1f07..3c905d993279 100644
--- a/security/titus/distinfo
+++ b/security/titus/distinfo
@@ -1,2 +1,3 @@
-SHA256 (AGWA-titus-0.3_GH0.tar.gz) = 2b10e4a4e4df2b577465813b748e5d5f05e4e96cd5b48d64e3a148ab80c275bf
-SIZE (AGWA-titus-0.3_GH0.tar.gz) = 29521
+TIMESTAMP = 1603898157
+SHA256 (AGWA-titus-0.4_GH0.tar.gz) = c2dce504fc0c860fce648e6de4e783724a42ece7d47a20a4d8a2964adbb3c07d
+SIZE (AGWA-titus-0.4_GH0.tar.gz) = 29343
diff --git a/security/titus/files/patch-dh.cpp b/security/titus/files/patch-dh.cpp
deleted file mode 100644
index 4b373f50bea3..000000000000
--- a/security/titus/files/patch-dh.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- dh.cpp.orig	2015-11-28 22:51:00 UTC
-+++ dh.cpp
-@@ -148,11 +148,7 @@ openssl_unique_ptr<DH> make_dh (const unsigned char* p
- 		throw Openssl_error(ERR_get_error());
- 	}
- 
--	if ((dh->p = BN_bin2bn(prime, prime_len, NULL)) == NULL) {
--		throw Openssl_error(ERR_get_error());
--	}
--
--	if ((dh->g = BN_bin2bn(generator, generator_len, NULL)) == NULL) {
-+	if (!DH_set0_pqg(dh.get(), BN_bin2bn(prime, prime_len, NULL), NULL, BN_bin2bn(generator, generator_len, NULL))) {
- 		throw Openssl_error(ERR_get_error());
- 	}
- 
diff --git a/security/titus/files/patch-rsa__client.cpp b/security/titus/files/patch-rsa__client.cpp
deleted file mode 100644
index 5d14a7b98870..000000000000
--- a/security/titus/files/patch-rsa__client.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
---- rsa_client.cpp.orig	2015-11-28 22:51:00 UTC
-+++ rsa_client.cpp
-@@ -85,7 +85,7 @@ int	Rsa_client::rsa_private_encrypt (int flen, const u
- int	Rsa_client::rsa_finish (RSA* rsa)
- {
- 	delete reinterpret_cast<Rsa_client_data*>(RSA_get_app_data(rsa));
--	if (const auto default_finish = RSA_get_default_method()->finish) {
-+	if (const auto default_finish = RSA_meth_get_finish(RSA_get_default_method())) {
- 		return (*default_finish)(rsa);
- 	} else {
- 		return 1;
-@@ -94,14 +94,14 @@ int	Rsa_client::rsa_finish (RSA* rsa)
- 
- const RSA_METHOD*	Rsa_client::get_rsa_method ()
- {
--	static RSA_METHOD ops;
--	if (!ops.rsa_priv_enc) {
--		ops = *RSA_get_default_method();
--		ops.rsa_priv_enc = rsa_private_encrypt;
--		ops.rsa_priv_dec = rsa_private_decrypt;
--		ops.finish = rsa_finish;
-+	static RSA_METHOD* ops = NULL;
-+	if (ops == NULL) {
-+		ops = RSA_meth_dup(RSA_get_default_method());
-+		RSA_meth_set_priv_enc(ops, rsa_private_encrypt);
-+		RSA_meth_set_priv_dec(ops, rsa_private_decrypt);
-+		RSA_meth_set_finish(ops, rsa_finish);
- 	}
--	return &ops;
-+	return ops;
- }
- 
- openssl_unique_ptr<EVP_PKEY>	Rsa_client::load_private_key (uintptr_t key_id, RSA* public_rsa)
-@@ -111,12 +111,10 @@ openssl_unique_ptr<EVP_PKEY>	Rsa_client::load_private_
- 		throw Openssl_error(ERR_get_error());
- 	}
- 
--	rsa->n = BN_dup(public_rsa->n);
--	if (!rsa->n) {
--		throw Openssl_error(ERR_get_error());
--	}
--	rsa->e = BN_dup(public_rsa->e);
--	if (!rsa->e) {
-+	const BIGNUM* n;
-+	const BIGNUM* e;
-+	RSA_get0_key(public_rsa, &n, &e, NULL);
-+	if (!RSA_set0_key(rsa.get(), BN_dup(n), BN_dup(e), NULL)) {
- 		throw Openssl_error(ERR_get_error());
- 	}
-