cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r553502

Browse Source 
security/titus: Support OpenSSL 1.1.0+

Backported patch fixes builds on FreeBSD 12 and 13

Approved by:	ports-secteam (blanket)
This commit is contained in:
Mark Felder 2020-10-27 22:09:43 +00:00
parent 6840b9833b
commit b97da18e65
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q4/; revision=553503
3 changed files with 66 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
security/titus/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= titus
PORTVERSION= 0.3
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= security
MAINTAINER= feld@FreeBSD.org
@ -26,11 +26,6 @@ LDFLAGS+= -L${OPENSSLLIB}
.include <bsd.port.pre.mk>
.if ${SSL_DEFAULT} == base
BROKEN_FreeBSD_12= member access into incomplete type 'dh_st'
BROKEN_FreeBSD_13= member access into incomplete type 'dh_st'
.endif
post-patch:
${REINPLACE_CMD} 's|/var/lib/titus/empty|/var/empty|' ${WRKSRC}/titus.conf.example

15
security/titus/files/patch-dh.cpp Normal file
View File

@ -0,0 +1,15 @@
--- 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());
}

50
security/titus/files/patch-rsa__client.cpp Normal file
View File

@ -0,0 +1,50 @@
--- 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());
}