From a1ee5eb2aae1f5e78909b36c979fd689ba319bbd Mon Sep 17 00:00:00 2001 From: "Ondrej Zajicek (work)" Date: Fri, 4 Jan 2019 17:03:48 +0100 Subject: [PATCH] BSD: Fix TCP-MD5 code on current FreeBSD kernels Current FreeBSD kernels require SA records for both directions. Thanks to Joseph Mulloy and Andrey V. Elsukov for reporting and solving the issue. --- sysdep/bsd/setkey.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sysdep/bsd/setkey.h b/sysdep/bsd/setkey.h index 3bcd8623..8a1bc9ad 100644 --- a/sysdep/bsd/setkey.h +++ b/sysdep/bsd/setkey.h @@ -160,12 +160,14 @@ sk_set_md5_in_sasp_db(sock *s, ip_addr local, ip_addr remote, struct iface *ifa, 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;