Changeset 09636af

Timestamp:

02/17/2023 08:39:49 PM (15 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal

Children:

dbd73d6

Parents:

62a96197 (diff), 8cf92e14 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

File:

• general/sysutils/bluez.xml (modified) (2 diffs)

general/sysutils/bluez.xml

@@ -103 +103 @@
       If you are building this package to use bluetooth devices (rather than as a
       build dependency), enable the following options in the kernel configuration,
-      also the options below the next paragraph if you intend to run the tests,
-      and recompile the kernel if necessary:
+      also the options in the <quote>Cryptographic API</quote> section if
+      you intend to run the tests, and recompile the kernel if necessary:
     </para>
 
 <screen><literal>General Setup ---&gt;
-  [*] Configure standard kernel features (expert users)               [CONFIG_EXPERT]
-    [*] Enable timerfd() system call               [CONFIG_TIMERFD]
-    [*] Enable eventfd() system call               [CONFIG_EVENTFD]
+  [ /*] Configure standard kernel features (expert users)   [CONFIG_EXPERT]
+    (Note: if CONFIG_EXPERT is disabled, the following options will be
+           hidden and enabled implicitly.  We DO NOT recommend to enable
+           CONFIG_EXPERT unless you are really an expert user.)
+    [*] Enable timerfd() system call                        [CONFIG_TIMERFD]
+    [*] Enable eventfd() system call                        [CONFIG_EVENTFD]
 
 [*] Networking support ---&gt;                [CONFIG_NET]
-  &lt;*/M&gt; Bluetooth subsystem support ---&gt;    [CONFIG_BT]
+  &lt;*/M&gt; Bluetooth subsystem support ---&gt;   [CONFIG_BT]
     &lt;*/M&gt; RFCOMM protocol support          [CONFIG_BT_RFCOMM]
     [*]   RFCOMM TTY support               [CONFIG_BT_RFCOMM_TTY]
@@ -123 +126 @@
           (Select the appropriate drivers for your Bluetooth hardware)
 
-   &lt;*/M&gt; RF switch subsystem support ----   [CONFIG_RFKILL]
+   &lt;*/M&gt; RF switch subsystem support ----  [CONFIG_RFKILL]
 
 -*- Cryptographic API ---&gt;
-   &lt;*/M*&gt; User-space cryptographic algorithm configuration         [CONFIG_CRYPTO_USER]
-   &lt;*/M*&gt; User-space interface for hash algorithms                 [CONFIG_CRYPTO_USER_API_HASH]
-   &lt;*/M*&gt; User-space interface for symmetric key cipher algorithms [CONFIG_CRYPTO_USER_API_SKCIPHER]
-   &lt;*/M*&gt; MD5 digest algorithm                                     [CONFIG_CRYPTO_MD5]
-   &lt;*/M*&gt; SHA1 digest algorithm                                    [CONFIG_CRYPTO_SHA1]
-
-Security Options ---&gt;
-  &lt;*/M*&gt; Diffie-Hellman operations on retained keys [CONFIG_KEY_DH_OPERATIONS]</literal></screen>
+   Crypto core or helper --- &gt;
+      &lt;*/M&gt; User-space cryptographic algorithm configuration   [CONFIG_CRYPTO_USER]
+   Block ciphers ---&gt;
+      &lt;*/M&gt; AES (Advanced Encryption Standard)                 [CONFIG_CRYPTO_AES]
+   AEAD (authenticated encryption with associated data) ciphers ---&gt;
+      &lt;*/M&gt; CCM (Counter with Cipher Block Chaining-MAC)       [CONFIG_CRYPTO_CCM]
+   Hashes, digests, and MACs ---&gt;
+      &lt;*/M&gt; CMAC (Cipher-based MAC)                            [CONFIG_CRYPTO_CMAC]
+   Userspace interface ---&gt;
+      &lt;*/M&gt; Hash algorithms                                    [CONFIG_CRYPTO_USER_API_HASH]
+      &lt;*/M&gt; Symmetric key cipher algorithms                    [CONFIG_CRYPTO_USER_API_SKCIPHER]
+      &lt;*/M&gt; AEAD cipher algorithms                             [CONFIG_CRYPTO_USER_API_AEAD]</literal></screen>
 
 <!--