Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F103814145
D16775.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
4 KB
Referenced Files
None
Subscribers
None
D16775.diff
View Options
Index: head/sys/amd64/conf/GENERIC
===================================================================
--- head/sys/amd64/conf/GENERIC
+++ head/sys/amd64/conf/GENERIC
@@ -314,6 +314,7 @@
device wpi # Intel 3945ABG wireless NICs.
# Pseudo devices.
+device crypto # core crypto support
device loop # Network loopback
device random # Entropy device
device padlock_rng # VIA Padlock RNG
@@ -376,6 +377,3 @@
# Netmap provides direct access to TX/RX rings on supported NICs
device netmap # netmap(4) support
-
-# The crypto framework is required by IPSEC
-device crypto # Required by IPSEC
Index: head/sys/arm/conf/std.armv6
===================================================================
--- head/sys/arm/conf/std.armv6
+++ head/sys/arm/conf/std.armv6
@@ -9,7 +9,7 @@
options INET # InterNETworking
options INET6 # IPv6 communications protocols
options TCP_HHOOK # hhook(9) framework for TCP
-device crypto # IPSec && !crypto is nonsensical
+device crypto # core crypto support
options IPSEC # IP (v4/v6) security
options SCTP # Stream Control Transmission Protocol
options FFS # Berkeley Fast Filesystem
Index: head/sys/arm/conf/std.armv7
===================================================================
--- head/sys/arm/conf/std.armv7
+++ head/sys/arm/conf/std.armv7
@@ -9,7 +9,7 @@
options INET # InterNETworking
options INET6 # IPv6 communications protocols
options TCP_HHOOK # hhook(9) framework for TCP
-device crypto # IPSec && !crypto is nonsensical
+device crypto # core crypto support
options IPSEC # IP (v4/v6) security
options SCTP # Stream Control Transmission Protocol
options FFS # Berkeley Fast Filesystem
Index: head/sys/arm64/conf/GENERIC
===================================================================
--- head/sys/arm64/conf/GENERIC
+++ head/sys/arm64/conf/GENERIC
@@ -237,6 +237,7 @@
device vt_efifb
# Pseudo devices.
+device crypto # core crypto support
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -266,6 +267,3 @@
options FDT
device acpi
-
-# The crypto framework is required by IPSEC
-device crypto # Required by IPSEC
Index: head/sys/i386/conf/GENERIC
===================================================================
--- head/sys/i386/conf/GENERIC
+++ head/sys/i386/conf/GENERIC
@@ -318,6 +318,7 @@
device wpi # Intel 3945ABG wireless NICs.
# Pseudo devices.
+device crypto # core crypto support
device loop # Network loopback
device random # Entropy device
device padlock_rng # VIA Padlock RNG
@@ -377,6 +378,3 @@
# VMware support
device vmx # VMware VMXNET3 Ethernet
-
-# The crypto framework is required by IPSEC
-device crypto # Required by IPSEC
Index: head/sys/powerpc/conf/GENERIC
===================================================================
--- head/sys/powerpc/conf/GENERIC
+++ head/sys/powerpc/conf/GENERIC
@@ -160,6 +160,7 @@
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
# Pseudo devices.
+device crypto # core crypto support
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -225,6 +226,3 @@
device snd_ai2s # Apple I2S audio
device snd_davbus # Apple DAVBUS audio
device snd_uaudio # USB Audio
-
-# The crypto framework is required by IPSEC
-device crypto # Required by IPSEC
Index: head/sys/riscv/conf/GENERIC
===================================================================
--- head/sys/riscv/conf/GENERIC
+++ head/sys/riscv/conf/GENERIC
@@ -36,7 +36,6 @@
options TCP_HHOOK # hhook(9) framework for TCP
options IPSEC # IP (v4/v6) security
options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5
-device crypto # core crypto support (required for IPSEC)
options TCP_OFFLOAD # TCP offload
options SCTP # Stream Control Transmission Protocol
options FFS # Berkeley Fast Filesystem
@@ -121,6 +120,7 @@
options ZSTDIO # zstd-compressed kernel and user dumps
# Pseudo devices.
+device crypto # core crypto support
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
Index: head/sys/sparc64/conf/GENERIC
===================================================================
--- head/sys/sparc64/conf/GENERIC
+++ head/sys/sparc64/conf/GENERIC
@@ -229,6 +229,7 @@
device ath_rate_sample # SampleRate tx rate control for ath
# Pseudo devices.
+device crypto # core crypto support
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -257,6 +258,3 @@
device snd_audiocs # Crystal Semiconductor CS4231
device snd_es137x # Ensoniq AudioPCI ES137x
device snd_t4dwave # Acer Labs M5451
-
-# The crypto framework is required by IPSEC
-device crypto # Required by IPSEC
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Nov 30, 7:11 PM (19 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14948898
Default Alt Text
D16775.diff (4 KB)
Attached To
Mode
D16775: Make 'device crypto' lines more consistent.
Attached
Detach File
Event Timeline
Log In to Comment