From 923d20614939d0479bc7dea84cabfbb994bc75f6 Mon Sep 17 00:00:00 2001 From: Conrad Meyer Date: Fri, 17 Aug 2018 01:04:02 +0000 Subject: [PATCH] arm: Define crypto option on platforms that include IPsec Missed in r337940. (It's not like there are any crypto files IPsec doesn't pull in, so it is unclear what not defining the crypto option was supposed to achieve.) Reported by: np@ --- sys/arm/conf/std.armv6 | 1 + sys/arm/conf/std.armv7 | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/arm/conf/std.armv6 b/sys/arm/conf/std.armv6 index 9d9eade06cc..b20204e6477 100644 --- a/sys/arm/conf/std.armv6 +++ b/sys/arm/conf/std.armv6 @@ -9,6 +9,7 @@ options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options TCP_HHOOK # hhook(9) framework for TCP +device crypto # IPSec && !crypto is nonsensical options IPSEC # IP (v4/v6) security options SCTP # Stream Control Transmission Protocol options FFS # Berkeley Fast Filesystem diff --git a/sys/arm/conf/std.armv7 b/sys/arm/conf/std.armv7 index daa499026fd..4034189ce27 100644 --- a/sys/arm/conf/std.armv7 +++ b/sys/arm/conf/std.armv7 @@ -9,6 +9,7 @@ options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options TCP_HHOOK # hhook(9) framework for TCP +device crypto # IPSec && !crypto is nonsensical options IPSEC # IP (v4/v6) security options SCTP # Stream Control Transmission Protocol options FFS # Berkeley Fast Filesystem