From owner-svn-ports-all@freebsd.org Tue Jul 28 06:29:13 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8E54D37E497; Tue, 28 Jul 2020 06:29:13 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BG6G13CgJz3fg2; Tue, 28 Jul 2020 06:29:13 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 527CDAB3F; Tue, 28 Jul 2020 06:29:13 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06S6TD1i070033; Tue, 28 Jul 2020 06:29:13 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06S6TDpQ070032; Tue, 28 Jul 2020 06:29:13 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202007280629.06S6TDpQ070032@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Tue, 28 Jul 2020 06:29:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r543578 - in head/sysutils/rsyncrypto: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/sysutils/rsyncrypto: . files X-SVN-Commit-Revision: 543578 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jul 2020 06:29:13 -0000 Author: danfe Date: Tue Jul 28 06:29:12 2020 New Revision: 543578 URL: https://svnweb.freebsd.org/changeset/ports/543578 Log: Allow to build against pre-1.1.0 versions of OpenSSL which are still used in FreeBSD 11.x and would be supported until September 30, 2021. PR: 248168 Added: head/sysutils/rsyncrypto/files/ head/sysutils/rsyncrypto/files/patch-crypto.cpp (contents, props changed) Modified: head/sysutils/rsyncrypto/Makefile Modified: head/sysutils/rsyncrypto/Makefile ============================================================================== --- head/sysutils/rsyncrypto/Makefile Tue Jul 28 06:22:37 2020 (r543577) +++ head/sysutils/rsyncrypto/Makefile Tue Jul 28 06:29:12 2020 (r543578) @@ -25,6 +25,10 @@ PORTDOCS= AUTHORS ChangeLog NEWS README OPTIONS_DEFINE= DOCS +post-patch: +# Inhibit the check for RSA_get0_factors() to support older OpenSSL versions + @${REINPLACE_CMD} -e '/RSA_get0_factors/,+49d' ${WRKSRC}/configure + post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} Added: head/sysutils/rsyncrypto/files/patch-crypto.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rsyncrypto/files/patch-crypto.cpp Tue Jul 28 06:29:12 2020 (r543578) @@ -0,0 +1,16 @@ +--- crypto.cpp.orig 2016-11-11 20:23:00 UTC ++++ crypto.cpp +@@ -155,9 +155,13 @@ std::unique_ptr decrypt_header( file_t fromfd, RS + unsigned char *buff=filemap.get_uc()+sizeof(HEADER_ENCRYPTION_VERSION); + auto_array decrypted(new unsigned char[headsize]); + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ if( (prv->p==nullptr || prv->q==nullptr) ) { ++#else + const BIGNUM *p, *q; + RSA_get0_factors(prv, &p, &q); + if( (p==nullptr || q==nullptr) ) { ++#endif + // This is not a private key! + throw rscerror("Neither AES session key nor RSA private key present - cannot decrypt using only public key"); + }