svn commit: r465848 - in head/net/bird-devel: . files

[Olivier Cochard]

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;