From owner-svn-ports-all@freebsd.org Wed Mar 28 21:22:59 2018 Return-Path: Delivered-To: svn-ports-all@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 3D293F737A2; Wed, 28 Mar 2018 21:22:59 +0000 (UTC) (envelope-from olivier@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 DB11883307; Wed, 28 Mar 2018 21:22:58 +0000 (UTC) (envelope-from olivier@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 D4A76106EA; Wed, 28 Mar 2018 21:22:58 +0000 (UTC) (envelope-from olivier@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2SLMwD7010768; Wed, 28 Mar 2018 21:22:58 GMT (envelope-from olivier@FreeBSD.org) Received: (from olivier@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2SLMwhs010766; Wed, 28 Mar 2018 21:22:58 GMT (envelope-from olivier@FreeBSD.org) Message-Id: <201803282122.w2SLMwhs010766@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olivier set sender to olivier@FreeBSD.org using -f From: Olivier Cochard Date: Wed, 28 Mar 2018 21:22:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465848 - in head/net/bird-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: olivier X-SVN-Commit-Paths: in head/net/bird-devel: . files X-SVN-Commit-Revision: 465848 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.25 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: Wed, 28 Mar 2018 21:22:59 -0000 Author: olivier Date: Wed Mar 28 21:22:58 2018 New Revision: 465848 URL: https://svnweb.freebsd.org/changeset/ports/465848 Log: Forgot to port BGP MD5 patch into -devel branch Added: head/net/bird-devel/files/patch-sysdep_bsd_setkey.h (contents, props changed) Modified: head/net/bird-devel/Makefile Modified: head/net/bird-devel/Makefile ============================================================================== --- head/net/bird-devel/Makefile Wed Mar 28 19:59:36 2018 (r465847) +++ head/net/bird-devel/Makefile Wed Mar 28 21:22:58 2018 (r465848) @@ -3,6 +3,7 @@ PORTNAME= bird DISTVERSION= 2.0.2 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://bird.network.cz/pub/bird/ PKGNAMESUFFIX= -devel Added: head/net/bird-devel/files/patch-sysdep_bsd_setkey.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/bird-devel/files/patch-sysdep_bsd_setkey.h Wed Mar 28 21:22:58 2018 (r465848) @@ -0,0 +1,19 @@ +--- sysdep/bsd/setkey.h.orig 2018-01-16 09:46:07 UTC ++++ sysdep/bsd/setkey.h +@@ -160,12 +160,14 @@ sk_set_md5_in_sasp_db(sock *s, ip_addr local, ip_addr + if (len > TCP_KEYLEN_MAX) + ERR_MSG("The password for TCP MD5 Signature is too long"); + +- if (setkey_md5(&src, &dst, pxlen, passwd, SADB_ADD) < 0) ++ if (setkey_md5(&src, &dst, pxlen, passwd, SADB_ADD) < 0 || ++ setkey_md5(&dst, &src, pxlen, passwd, SADB_ADD) < 0) + ERR_MSG("Cannot add TCP-MD5 password into the IPsec SA/SP database"); + } + else + { +- if (setkey_md5(&src, &dst, pxlen, NULL, SADB_DELETE) < 0) ++ if (setkey_md5(&src, &dst, pxlen, NULL, SADB_DELETE) < 0 || ++ setkey_md5(&dst, &src, pxlen, NULL, SADB_DELETE) < 0) + ERR_MSG("Cannot delete TCP-MD5 password from the IPsec SA/SP database"); + } + return 0;