From owner-svn-src-user@freebsd.org Tue Oct 30 01:39:23 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8C1F410F357A for ; Tue, 30 Oct 2018 01:39:23 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 40DE76A173; Tue, 30 Oct 2018 01:39:23 +0000 (UTC) (envelope-from cperciva@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 2273516ABF; Tue, 30 Oct 2018 01:39:23 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9U1dNRX084637; Tue, 30 Oct 2018 01:39:23 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9U1dMnA084635; Tue, 30 Oct 2018 01:39:22 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <201810300139.w9U1dMnA084635@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Tue, 30 Oct 2018 01:39:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r339903 - user/cperciva/freebsd-update-mirror X-SVN-Group: user X-SVN-Commit-Author: cperciva X-SVN-Commit-Paths: user/cperciva/freebsd-update-mirror X-SVN-Commit-Revision: 339903 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2018 01:39:23 -0000 Author: cperciva Date: Tue Oct 30 01:39:22 2018 New Revision: 339903 URL: https://svnweb.freebsd.org/changeset/base/339903 Log: Unbreak FreeBSD Update mirroring code for OpenSSL 1.1 The default key derivation algorithm for "openssl enc" changed. Force it back to the pre-1.1 default to regain backwards compatibility; we use strong keys so this is safe. Modified: user/cperciva/freebsd-update-mirror/umirror-package.sh user/cperciva/freebsd-update-mirror/umirror.sh Modified: user/cperciva/freebsd-update-mirror/umirror-package.sh ============================================================================== --- user/cperciva/freebsd-update-mirror/umirror-package.sh Tue Oct 30 00:47:40 2018 (r339902) +++ user/cperciva/freebsd-update-mirror/umirror-package.sh Tue Oct 30 01:39:22 2018 (r339903) @@ -43,7 +43,7 @@ dd if=/dev/urandom bs=1k count=1 2>/dev/null | echo >> "${PRIVDIR}/key-${ID}" # Create an encrypted tarball -openssl enc -aes-256-cbc -pass "file:${PRIVDIR}/key-${ID}" \ +openssl enc -aes-256-cbc -pass "file:${PRIVDIR}/key-${ID}" -md md5 \ < "${PRIVDIR}/dec-${ID}" > "${PRIVDIR}/tar-${ID}" # Add line to flist Modified: user/cperciva/freebsd-update-mirror/umirror.sh ============================================================================== --- user/cperciva/freebsd-update-mirror/umirror.sh Tue Oct 30 00:47:40 2018 (r339902) +++ user/cperciva/freebsd-update-mirror/umirror.sh Tue Oct 30 01:39:22 2018 (r339903) @@ -131,7 +131,7 @@ while read ID FHASH FDECHASH; do # Attempt to decrypt the file if ! [ -r "${PRIVDIR}/dec-${ID}" ]; then if ! openssl enc -aes-256-cbc -d \ - -pass "file:${PRIVDIR}/key-${ID}" \ + -pass "file:${PRIVDIR}/key-${ID}" -md md5 \ < "${PRIVDIR}/tar-${ID}" > "${PRIVDIR}/dec-${ID}"; then echo "Decrypting tar-${ID} failed" exit 1