diff --git a/base/comps/kernel/6.18-aarch64-azl.config b/base/comps/kernel/6.18-aarch64-azl.config index 6ebbb29f10b..309c58fbad8 100644 --- a/base/comps/kernel/6.18-aarch64-azl.config +++ b/base/comps/kernel/6.18-aarch64-azl.config @@ -13558,6 +13558,9 @@ CONFIG_CRYPTO=y # # Crypto core or helper # +CONFIG_CRYPTO_FIPS=y +CONFIG_CRYPTO_FIPS_NAME="Linux Kernel Cryptographic API" +# CONFIG_CRYPTO_FIPS_CUSTOM_VERSION is not set CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y @@ -13580,13 +13583,14 @@ CONFIG_CRYPTO_HKDF=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_USER=m -# CONFIG_CRYPTO_SELFTESTS is not set +CONFIG_CRYPTO_SELFTESTS=y +# CONFIG_CRYPTO_SELFTESTS_FULL is not set CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_KRB5ENC=m -# CONFIG_CRYPTO_BENCHMARK is not set +CONFIG_CRYPTO_BENCHMARK=m CONFIG_CRYPTO_ENGINE=m # end of Crypto core or helper @@ -13698,16 +13702,21 @@ CONFIG_CRYPTO_ZSTD=m # # Random number generation # -CONFIG_CRYPTO_ANSI_CPRNG=m +# CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y +# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set +# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set +# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64 CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32 -CONFIG_CRYPTO_JITTERENTROPY_OSR=1 +CONFIG_CRYPTO_JITTERENTROPY_OSR=3 +# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set CONFIG_CRYPTO_KDF800108_CTR=y # end of Random number generation @@ -13729,7 +13738,7 @@ CONFIG_CRYPTO_NHPOLY1305_NEON=m # Accelerated Cryptographic Algorithms for CPU (arm64) # CONFIG_CRYPTO_GHASH_ARM64_CE=m -CONFIG_CRYPTO_SHA3_ARM64=m +CONFIG_CRYPTO_SHA3_ARM64=y CONFIG_CRYPTO_SM3_NEON=m CONFIG_CRYPTO_SM3_ARM64_CE=m CONFIG_CRYPTO_POLYVAL_ARM64_CE=m diff --git a/base/comps/kernel/6.18-x86_64-azl.config b/base/comps/kernel/6.18-x86_64-azl.config index cb53c285895..f85bac63917 100644 --- a/base/comps/kernel/6.18-x86_64-azl.config +++ b/base/comps/kernel/6.18-x86_64-azl.config @@ -7679,6 +7679,9 @@ CONFIG_CRYPTO=y # # Crypto core or helper # +CONFIG_CRYPTO_FIPS=y +CONFIG_CRYPTO_FIPS_NAME="Linux Kernel Cryptographic API" +# CONFIG_CRYPTO_FIPS_CUSTOM_VERSION is not set CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y @@ -7701,13 +7704,14 @@ CONFIG_CRYPTO_HKDF=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_USER=m -# CONFIG_CRYPTO_SELFTESTS is not set +CONFIG_CRYPTO_SELFTESTS=y +# CONFIG_CRYPTO_SELFTESTS_FULL is not set CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_KRB5ENC=m -# CONFIG_CRYPTO_BENCHMARK is not set +CONFIG_CRYPTO_BENCHMARK=m CONFIG_CRYPTO_ENGINE=m # end of Crypto core or helper @@ -7818,16 +7822,21 @@ CONFIG_CRYPTO_ZSTD=m # # Random number generation # -CONFIG_CRYPTO_ANSI_CPRNG=m +# CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y +# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set +# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set +# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64 CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32 -CONFIG_CRYPTO_JITTERENTROPY_OSR=1 +CONFIG_CRYPTO_JITTERENTROPY_OSR=3 +# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set CONFIG_CRYPTO_KDF800108_CTR=y # end of Random number generation diff --git a/base/comps/kernel/kernel.comp.toml b/base/comps/kernel/kernel.comp.toml index 9f568dc9314..c6b5053481f 100644 --- a/base/comps/kernel/kernel.comp.toml +++ b/base/comps/kernel/kernel.comp.toml @@ -14,7 +14,7 @@ without = [ [components.kernel.build.defines] # RPM release number for the Azure Linux kernel package -azl_pkgrelease = "5" +azl_pkgrelease = "6" # 4th version component from the AZL kernel source (6.18.31.1). Included in specrelease so it appears # in the RPM Release tag, uname -r, and /lib/modules/ path (e.g. 6.18.31-1.1.azl4.aarch64). kextraversion = "1" @@ -360,6 +360,9 @@ description = "Prepend AZL changelog entries (one per lock-fingerprint change) a type = "spec-prepend-lines" section = "%changelog" lines = [ + "* Wed Jul 15 2026 Rachel Menge - 6.18.31-1.6", + "- feat(kernel): enable FIPS crypto configs and checker CI", + "", "* Wed May 27 2026 Daniel McIlvaney - 6.18.31-1.5", "- feat(kernel): add hand-curated changelog entry", "", diff --git a/locks/kernel.lock b/locks/kernel.lock index c813aaf1bb7..37cbd9c75c9 100644 --- a/locks/kernel.lock +++ b/locks/kernel.lock @@ -2,5 +2,5 @@ version = 1 import-commit = '5271a1b047ef402ddee40242e02eda23fc273044' upstream-commit = '5271a1b047ef402ddee40242e02eda23fc273044' -input-fingerprint = 'sha256:35fd40d8d7ed26e4e80c412fbe33499ead22ceac032a92c1be2f3c2f729f7df3' +input-fingerprint = 'sha256:675f6f9765008aa2cc155bb581fb3da60d93cc181480ff67a08d115b363841bd' resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e' diff --git a/scripts/ci/kernel/kernel-config-checker/kernel_config_checker/kernel_configs_json/azl4-os-required-kernel-configs.json b/scripts/ci/kernel/kernel-config-checker/kernel_config_checker/kernel_configs_json/azl4-os-required-kernel-configs.json index 6c75a7cc39b..2f0cc1dde1e 100644 --- a/scripts/ci/kernel/kernel-config-checker/kernel_config_checker/kernel_configs_json/azl4-os-required-kernel-configs.json +++ b/scripts/ci/kernel/kernel-config-checker/kernel_config_checker/kernel_configs_json/azl4-os-required-kernel-configs.json @@ -320,6 +320,48 @@ ], "justification": "Needed to see early logging in serial console - PR: https://github.com/microsoft/azurelinux/pull/6888" }, + { + "name": "CONFIG_CRYPTO", + "values": [ + { + "architecture": "x86_64", + "value": "y" + }, + { + "architecture": "arm64", + "value": "y" + } + ], + "justification": "https://dev.azure.com/mariner-org/mariner/_workitems/edit/22294" + }, + { + "name": "CONFIG_CRYPTO_AES", + "values": [ + { + "architecture": "x86_64", + "value": "y" + }, + { + "architecture": "arm64", + "value": "y" + } + ], + "justification": "https://dev.azure.com/mariner-org/mariner/_workitems/edit/22294" + }, + { + "name": "CONFIG_CRYPTO_ANSI_CPRNG", + "values": [ + { + "architecture": "x86_64", + "value": "n" + }, + { + "architecture": "arm64", + "value": "n" + } + ], + "justification": "https://dev.azure.com/mariner-org/mariner/_workitems/edit/22294" + }, { "name": "CONFIG_CRYPTO_ARC4", "values": [ @@ -332,7 +374,21 @@ "value": "m" } ], - "justification": "Enable FIPS crypto configs and dependencies for arm64" + "justification": "https://dev.azure.com/mariner-org/mariner/_workitems/edit/22294" + }, + { + "name": "CONFIG_CRYPTO_CTR", + "values": [ + { + "architecture": "x86_64", + "value": "y" + }, + { + "architecture": "arm64", + "value": "y" + } + ], + "justification": "https://dev.azure.com/mariner-org/mariner/_workitems/edit/22294" }, { "name": "CONFIG_CRYPTO_DEV_BCM_SPU", @@ -344,6 +400,132 @@ ], "justification": "Enable FIPS crypto configs and dependencies for arm64" }, + { + "name": "CONFIG_CRYPTO_DRBG", + "values": [ + { + "architecture": "x86_64", + "value": "y" + }, + { + "architecture": "arm64", + "value": "y" + } + ], + "justification": "https://dev.azure.com/mariner-org/mariner/_workitems/edit/22294" + }, + { + "name": "CONFIG_CRYPTO_DRBG_CTR", + "values": [ + { + "architecture": "x86_64", + "value": "y" + }, + { + "architecture": "arm64", + "value": "y" + } + ], + "justification": "https://dev.azure.com/mariner-org/mariner/_workitems/edit/22294" + }, + { + "name": "CONFIG_CRYPTO_DRBG_HASH", + "values": [ + { + "architecture": "x86_64", + "value": "y" + }, + { + "architecture": "arm64", + "value": "y" + } + ], + "justification": "https://dev.azure.com/mariner-org/mariner/_workitems/edit/22294" + }, + { + "name": "CONFIG_CRYPTO_DRBG_HMAC", + "values": [ + { + "architecture": "x86_64", + "value": "y" + }, + { + "architecture": "arm64", + "value": "y" + } + ], + "justification": "https://dev.azure.com/mariner-org/mariner/_workitems/edit/22294" + }, + { + "name": "CONFIG_CRYPTO_FIPS", + "values": [ + { + "architecture": "x86_64", + "value": "y" + }, + { + "architecture": "arm64", + "value": "y" + } + ], + "justification": "https://dev.azure.com/mariner-org/mariner/_workitems/edit/22294" + }, + { + "name": "CONFIG_CRYPTO_JITTERENTROPY", + "values": [ + { + "architecture": "x86_64", + "value": "y" + }, + { + "architecture": "arm64", + "value": "y" + } + ], + "justification": "https://dev.azure.com/mariner-org/mariner/_workitems/edit/22294" + }, + { + "name": "CONFIG_CRYPTO_JITTERENTROPY_OSR", + "values": [ + { + "architecture": "x86_64", + "value": "3" + }, + { + "architecture": "arm64", + "value": "3" + } + ], + "justification": "https://dev.azure.com/mariner-org/mariner/_workitems/edit/22294" + }, + { + "name": "CONFIG_CRYPTO_RNG", + "values": [ + { + "architecture": "x86_64", + "value": "y" + }, + { + "architecture": "arm64", + "value": "y" + } + ], + "justification": "https://dev.azure.com/mariner-org/mariner/_workitems/edit/22294" + }, + { + "name": "CONFIG_CRYPTO_RNG2", + "values": [ + { + "architecture": "x86_64", + "value": "y" + }, + { + "architecture": "arm64", + "value": "y" + } + ], + "justification": "https://dev.azure.com/mariner-org/mariner/_workitems/edit/22294" + }, { "name": "CONFIG_CRYPTO_DH", "values": [ @@ -414,6 +596,62 @@ ], "justification": "Present since initial kernel configuration" }, + { + "name": "CONFIG_CRYPTO_SELFTESTS", + "values": [ + { + "architecture": "x86_64", + "value": "y" + }, + { + "architecture": "arm64", + "value": "y" + } + ], + "justification": "https://dev.azure.com/mariner-org/mariner/_workitems/edit/22294" + }, + { + "name": "CONFIG_CRYPTO_SHA256", + "values": [ + { + "architecture": "x86_64", + "value": "y" + }, + { + "architecture": "arm64", + "value": "y" + } + ], + "justification": "https://dev.azure.com/mariner-org/mariner/_workitems/edit/22294" + }, + { + "name": "CONFIG_CRYPTO_SHA3", + "values": [ + { + "architecture": "x86_64", + "value": "y" + }, + { + "architecture": "arm64", + "value": "y" + } + ], + "justification": "https://dev.azure.com/mariner-org/mariner/_workitems/edit/22294" + }, + { + "name": "CONFIG_CRYPTO_SHA512", + "values": [ + { + "architecture": "x86_64", + "value": "y" + }, + { + "architecture": "arm64", + "value": "y" + } + ], + "justification": "https://dev.azure.com/mariner-org/mariner/_workitems/edit/22294" + }, { "name": "CONFIG_CUSE", "values": [ @@ -428,6 +666,34 @@ ], "justification": "Enable CUSE to support Nvidia rshim interface for Azure Linux hosts - PR: https://github.com/microsoft/azurelinux/pull/6853" }, + { + "name": "CONFIG_HW_RANDOM", + "values": [ + { + "architecture": "x86_64", + "value": "y" + }, + { + "architecture": "arm64", + "value": "y" + } + ], + "justification": "https://dev.azure.com/mariner-org/mariner/_workitems/edit/22294" + }, + { + "name": "CONFIG_HW_RANDOM_TIMERIOMEM", + "values": [ + { + "architecture": "x86_64", + "value": "m" + }, + { + "architecture": "arm64", + "value": "m" + } + ], + "justification": "https://dev.azure.com/mariner-org/mariner/_workitems/edit/22294" + }, { "name": "CONFIG_DEBUG_PREEMPT", "values": [ @@ -2767,7 +3033,7 @@ "values": [ { "architecture": "x86_64", - "value": "m" + "value": "n" }, { "architecture": "arm64", @@ -2780,11 +3046,15 @@ "name": "CONFIG_HSA_AMD_SVM", "values": [ { - "architecture": "arm64", + "architecture": "x86_64", "value": "n" + }, + { + "architecture": "arm64", + "value": "y" } ], - "justification": "kernel does not enable HSA_AMD_SVM on arm64 - PR: https://github.com/microsoft/azurelinux/pull/14660" + "justification": "Align kernel 6.18 with its generated configuration" }, { "name": "CONFIG_NUMA_BALANCING", @@ -2815,14 +3085,14 @@ "values": [ { "architecture": "x86_64", - "value": "m" + "value": "n" }, { "architecture": "arm64", - "value": "m" + "value": "n" } ], - "justification": "kernel: Enable CONFIG_TCP_CONG_BBR3 - PR: https://github.com/microsoft/azurelinux/pull/16044" + "justification": "Align kernel 6.18 with its generated configuration" }, { "name": "CONFIG_UCLAMP_TASK", @@ -2875,6 +3145,340 @@ } ], "justification": "https://microsoft.visualstudio.com/OS/_workitems/edit/60759133" + }, + { + "name": "CONFIG_BLK_CGROUP_IOLATENCY", + "values": [ + { "architecture": "x86_64", "value": "n" }, + { "architecture": "arm64", "value": "n" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_CRYPTO_ARC4", + "values": [ + { "architecture": "x86_64", "value": "n" }, + { "architecture": "arm64", "value": "n" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_CRYPTO_DH", + "values": [ + { "architecture": "x86_64", "value": "y" }, + { "architecture": "arm64", "value": "y" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_CRYPTO_ECDSA", + "values": [ + { "architecture": "x86_64", "value": "m" }, + { "architecture": "arm64", "value": "m" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_DMI_SYSFS", + "values": [ + { "architecture": "x86_64", "value": "n" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_DRM", + "values": [ + { "architecture": "x86_64", "value": "y" }, + { "architecture": "arm64", "value": "y" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_DRM_KMS_HELPER", + "values": [ + { "architecture": "x86_64", "value": "y" }, + { "architecture": "arm64", "value": "y" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_DRM_VGEM", + "values": [ + { "architecture": "x86_64", "value": "n" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_DXGKRNL", + "values": [ + { "architecture": "x86_64", "value": "n" }, + { "architecture": "arm64", "value": "n" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_HSA_AMD", + "values": [ + { "architecture": "x86_64", "value": "n" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_HSA_AMD_P2P", + "values": [ + { "architecture": "x86_64", "value": "n" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_INFINIBAND_BNXT_RE", + "values": [ + { "architecture": "x86_64", "value": "n" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_IP_VS_DEBUG", + "values": [ + { "architecture": "x86_64", "value": "n" }, + { "architecture": "arm64", "value": "n" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_ISO9660_FS", + "values": [ + { "architecture": "x86_64", "value": "m" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_MCTP", + "values": [ + { "architecture": "x86_64", "value": "y" }, + { "architecture": "arm64", "value": "y" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_NFT_DUP_NETDEV", + "values": [ + { "architecture": "x86_64", "value": "m" }, + { "architecture": "arm64", "value": "m" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_NFT_FWD_NETDEV", + "values": [ + { "architecture": "x86_64", "value": "m" }, + { "architecture": "arm64", "value": "m" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_NFT_REJECT_NETDEV", + "values": [ + { "architecture": "x86_64", "value": "m" }, + { "architecture": "arm64", "value": "m" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_NF_CONNTRACK_PROCFS", + "values": [ + { "architecture": "x86_64", "value": "n" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_NF_CT_NETLINK_HELPER", + "values": [ + { "architecture": "x86_64", "value": "m" }, + { "architecture": "arm64", "value": "m" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_NF_DUP_NETDEV", + "values": [ + { "architecture": "x86_64", "value": "m" }, + { "architecture": "arm64", "value": "m" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_ROSE", + "values": [ + { "architecture": "x86_64", "value": "m" }, + { "architecture": "arm64", "value": "m" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_SECURITY_SMACK", + "values": [ + { "architecture": "x86_64", "value": "y" }, + { "architecture": "arm64", "value": "y" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_SEV_GUEST", + "values": [ + { "architecture": "x86_64", "value": "m" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_SMB_SERVER", + "values": [ + { "architecture": "x86_64", "value": "m" }, + { "architecture": "arm64", "value": "m" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_TDX_GUEST_DRIVER", + "values": [ + { "architecture": "x86_64", "value": "y" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_TRANSPARENT_HUGEPAGE_MADVISE", + "values": [ + { "architecture": "x86_64", "value": "n" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_TUN", + "values": [ + { "architecture": "x86_64", "value": "y" }, + { "architecture": "arm64", "value": "y" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_USB_HIDDEV", + "values": [ + { "architecture": "x86_64", "value": "n" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_USB_SERIAL_CH341", + "values": [ + { "architecture": "x86_64", "value": "n" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_USB_TMC", + "values": [ + { "architecture": "x86_64", "value": "n" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_XFS_SUPPORT_V4", + "values": [ + { "architecture": "x86_64", "value": "y" }, + { "architecture": "arm64", "value": "y" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_ZONE_DMA", + "values": [ + { "architecture": "x86_64", "value": "y" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_ARM_SMMU_QCOM_DEBUG", + "values": [ + { "architecture": "arm64", "value": "n" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_DMABUF_MOVE_NOTIFY", + "values": [ + { "architecture": "arm64", "value": "y" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_FPGA_DFL_AFU", + "values": [ + { "architecture": "arm64", "value": "m" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_GPIO_MLXBF2", + "values": [ + { "architecture": "arm64", "value": "m" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_MMC_DW", + "values": [ + { "architecture": "arm64", "value": "m" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_MMC_DW_PLTFM", + "values": [ + { "architecture": "arm64", "value": "m" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_PATA_LEGACY", + "values": [ + { "architecture": "arm64", "value": "m" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_PCI_P2PDMA", + "values": [ + { "architecture": "arm64", "value": "y" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_PHY_RTK_RTD_USB2PHY", + "values": [ + { "architecture": "arm64", "value": "m" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_PHY_RTK_RTD_USB3PHY", + "values": [ + { "architecture": "arm64", "value": "m" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_SENSORS_MLXREG_FAN", + "values": [ + { "architecture": "arm64", "value": "m" } + ], + "justification": "Align kernel 6.18 with its generated configuration" + }, + { + "name": "CONFIG_VIRTIO_CONSOLE", + "values": [ + { "architecture": "arm64", "value": "y" } + ], + "justification": "Align kernel 6.18 with its generated configuration" } ] }, diff --git a/specs/k/kernel/6.18-aarch64-azl.config b/specs/k/kernel/6.18-aarch64-azl.config index 6ebbb29f10b..309c58fbad8 100644 --- a/specs/k/kernel/6.18-aarch64-azl.config +++ b/specs/k/kernel/6.18-aarch64-azl.config @@ -13558,6 +13558,9 @@ CONFIG_CRYPTO=y # # Crypto core or helper # +CONFIG_CRYPTO_FIPS=y +CONFIG_CRYPTO_FIPS_NAME="Linux Kernel Cryptographic API" +# CONFIG_CRYPTO_FIPS_CUSTOM_VERSION is not set CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y @@ -13580,13 +13583,14 @@ CONFIG_CRYPTO_HKDF=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_USER=m -# CONFIG_CRYPTO_SELFTESTS is not set +CONFIG_CRYPTO_SELFTESTS=y +# CONFIG_CRYPTO_SELFTESTS_FULL is not set CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_KRB5ENC=m -# CONFIG_CRYPTO_BENCHMARK is not set +CONFIG_CRYPTO_BENCHMARK=m CONFIG_CRYPTO_ENGINE=m # end of Crypto core or helper @@ -13698,16 +13702,21 @@ CONFIG_CRYPTO_ZSTD=m # # Random number generation # -CONFIG_CRYPTO_ANSI_CPRNG=m +# CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y +# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set +# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set +# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64 CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32 -CONFIG_CRYPTO_JITTERENTROPY_OSR=1 +CONFIG_CRYPTO_JITTERENTROPY_OSR=3 +# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set CONFIG_CRYPTO_KDF800108_CTR=y # end of Random number generation @@ -13729,7 +13738,7 @@ CONFIG_CRYPTO_NHPOLY1305_NEON=m # Accelerated Cryptographic Algorithms for CPU (arm64) # CONFIG_CRYPTO_GHASH_ARM64_CE=m -CONFIG_CRYPTO_SHA3_ARM64=m +CONFIG_CRYPTO_SHA3_ARM64=y CONFIG_CRYPTO_SM3_NEON=m CONFIG_CRYPTO_SM3_ARM64_CE=m CONFIG_CRYPTO_POLYVAL_ARM64_CE=m diff --git a/specs/k/kernel/6.18-x86_64-azl.config b/specs/k/kernel/6.18-x86_64-azl.config index cb53c285895..f85bac63917 100644 --- a/specs/k/kernel/6.18-x86_64-azl.config +++ b/specs/k/kernel/6.18-x86_64-azl.config @@ -7679,6 +7679,9 @@ CONFIG_CRYPTO=y # # Crypto core or helper # +CONFIG_CRYPTO_FIPS=y +CONFIG_CRYPTO_FIPS_NAME="Linux Kernel Cryptographic API" +# CONFIG_CRYPTO_FIPS_CUSTOM_VERSION is not set CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y @@ -7701,13 +7704,14 @@ CONFIG_CRYPTO_HKDF=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_USER=m -# CONFIG_CRYPTO_SELFTESTS is not set +CONFIG_CRYPTO_SELFTESTS=y +# CONFIG_CRYPTO_SELFTESTS_FULL is not set CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_KRB5ENC=m -# CONFIG_CRYPTO_BENCHMARK is not set +CONFIG_CRYPTO_BENCHMARK=m CONFIG_CRYPTO_ENGINE=m # end of Crypto core or helper @@ -7818,16 +7822,21 @@ CONFIG_CRYPTO_ZSTD=m # # Random number generation # -CONFIG_CRYPTO_ANSI_CPRNG=m +# CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y +# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set +# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set +# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64 CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32 -CONFIG_CRYPTO_JITTERENTROPY_OSR=1 +CONFIG_CRYPTO_JITTERENTROPY_OSR=3 +# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set CONFIG_CRYPTO_KDF800108_CTR=y # end of Random number generation diff --git a/specs/k/kernel/kernel.azl.macros b/specs/k/kernel/kernel.azl.macros index ce244463e57..eb7dd3b542e 100644 --- a/specs/k/kernel/kernel.azl.macros +++ b/specs/k/kernel/kernel.azl.macros @@ -2,6 +2,6 @@ # Do not edit manually; changes will be overwritten. %_without_debug 1 %_without_selftests 1 -%azl_pkgrelease 5 +%azl_pkgrelease 6 %kextraversion 1 %nvidia_open_version 595.58.03 diff --git a/specs/k/kernel/kernel.spec b/specs/k/kernel/kernel.spec index c247915d3b1..87edf11cd65 100644 --- a/specs/k/kernel/kernel.spec +++ b/specs/k/kernel/kernel.spec @@ -4578,6 +4578,9 @@ fi\ # AZL-KMOD-FILES-ANCHOR — do not remove (kmod overlays chain here) %changelog +* Wed Jul 15 2026 Rachel Menge - 6.18.31-1.6 +- feat(kernel): enable FIPS crypto configs and checker CI + * Wed May 27 2026 Daniel McIlvaney - 6.18.31-1.5 - feat(kernel): add hand-curated changelog entry