diff --git a/.abf.yml b/.abf.yml index 805a4fb..317401e 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,16 +1,15 @@ sources: linux-5.4.tar.xz: 98ae49ad49397d5a4dcb3ff9a082223edf7c5bbd patch-5.4.25.xz: 58f37a7fb4f4f0050b291c2f71ea111082d46654 - public_rsa_1.pem: 566af3655617863906dbe38e741d2eabf12ab5fd - public_rsa_2.pem: 7a12031abe1c60c5126e78c1b26197c076aa0574 - public_rsa_3.pem: 0b817d48a087945355999c745af58bcefe02bc91 - public_rsa_4.pem: 5c1a192addb793614e75a0badcc087497a5c0566 - public_rsa_5.pem: b28c90b4d9719c9aebcb4a5da038085d4b66a629 - public_rsa_6.pem: e8cad69248492e9d0f70b5365f981315bad315d0 - public_rsa_7.pem: 8afc073668f0f9dc9290cc42007385b6579ee4cc - public_rsa_8.pem: 55a07fd289922fbaa9fe9632483155159ec45725 - public_rsa_9.pem: 4365ccc0ee5fb7c1676c4ae9dd9e9094ac5a288e - public_rsa_10.pem: 67396ec42b7fb2ebbd22b8520ad198954817928d - public_rsa_11.pem: a48b4006707b3d9c7bb2e0a919ddd703b7be273f - public_rsa_12.pem: 21f68e7b06ed8dbe7a5aff82d668fbe9aa42c205 - + public_key_GOST_1.pem: bb4096b1ba85220f0abf08fb6dc5eb28badc5458 + public_key_GOST_2.pem: 4c7d93df7876e7b12b2f6f5b59e83ca061684939 + public_key_GOST_3.pem: 3b56fcb7ac3c79559144934a5b841fa36c22e4dd + public_key_GOST_4.pem: 3aa3c107b90af2d5f5cadef3497cbfe443eac507 + public_key_GOST_5.pem: 8fc151ff0f0aca126ae1efeb58ca8380e56f37d9 + public_key_GOST_6.pem: 99842ffc8e8b2f71bcaeb6d1dd6406e341727e60 + public_key_RSA_1.pem: 6c70b7a3824ecdb80a9ff55af247bc791de56d9a + public_key_RSA_2.pem: bc5d5316af20d2d13e753629d96d40f75746891d + public_key_RSA_3.pem: 6786a4a279a715c1afb18868a30cf2f6cbcea34d + public_key_RSA_4.pem: 2e55cc43534788fdd1ec2805c46a2afe20c3fda2 + public_key_RSA_5.pem: 096813ab2771d5fcc45647b86a76a68136526005 + public_key_RSA_6.pem: 60a85c71a725c1a585962b50ad11117e2f7e9b86 diff --git a/kernel.spec b/kernel.spec index ac21daf..0bf578e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -11,7 +11,7 @@ %define sublevel 25 # Release number. Increase this before a rebuild. -%define rpmrel 11 +%define rpmrel 12 %define fullrpmrel %{rpmrel} %define rpmtag %{disttag} @@ -188,8 +188,11 @@ Source53: cpupower.path Source80: kernel.rpmlintrc # Additional keys that can be used to sign kernel modules -# Source201..212: public_rsa_1..12.pem -%{expand:%(for i in `seq 1 12`; do echo "Source$((200+${i})): public_rsa_${i}.pem"; done)} +# Generated by https://abf.io/soft/kernel-keys +# Source201..206: public_key_GOST_*.pem +%{expand:%(for i in `seq 1 6`; do echo "Source$((200+${i})): public_key_GOST_${i}.pem"; done)} +# Source207..212: public_key_RSA_*.pem +%{expand:%(for i in `seq 7 12`; do echo "Source$((200+${i})): public_key_RSA_${i}.pem"; done)} #################################################################### @@ -1102,7 +1105,6 @@ sed -i %{src_dir}/scripts/Makefile \ %if %{with additional_keys} # Add additional public RSA keys to the list of trusted keys for kernel modules -# TODO: add GOST keys # Build kernel --without additional_keys if you do not want to trust them cat %{expand:%(for i in `seq 1 12`; do echo "%%SOURCE$((200+${i}))" | tr "\n" " "; done)} \ >> "%{certs_public_keys}"