Allow user to set signature's keyid using `--keyid' option. Keyid should correspond to SKID in certificate. When keyid is calculated using SHA-1 in libimaevm it may mismatch keyid extracted by the kernel from SKID of certificate (the way public key is presented to the kernel), thus making signatures not verifiable. This may happen when certificate is using non SHA-1 SKID (see rfc7093) or just 'unique number' (see rfc5280 4.2.1.2). As a last resort user may specify arbitrary keyid using the new option. Certificate filename could be used instead of the hex number with `--keyid-from-cert' option. And, third option is to read keyid from the cert appended to the key file. These commits create backward incompatible ABI change for libimaevm, thus soname should be incremented on release. Changes from v6: - Applied changes requested by Mimi Zohar (intermediate variable for if, annotation update, new option '--keyid-from-cert' instead of '@'). Added more comments for questioned cases. - Read_keyid functions are reworked in hopefully more understandable way (two new static functions: extract_keyid and read_cert). - Test for key+cert case added. Changes from v5: - ima_read_keyid renamed to imaevm_read_keyid and its return value inverted to match other API functions. Suggested by Stefan Berger - Rebased over next-testing. Noticed by Mimi Zohar. Changes from v4: - ima_read_keyid() API changed. As suggested by Stefan Berger. Changes from v3: - ima_read_keyid() is improved to better support both use cases. Changes from v2: - Add ima_read_keyid() function to libemaevm and use it in both evmctl (for --keyid) and sign_hash_v2() (for concatenated PEMs). Suggested by Stefan Berger. - Autodetect PEM by openssl reading it instead of magic string. Suggested by Stefan Berger. - Trivial change: s/unsigned long int/unsigned long/ for keyid type. Changes from v1: - Extract keyid from cert associated to key file. - Use sizeof instead of constant. Changes since rfc version: - `imaevm_params.keyid' now stored as native integer (instead of network order). Suggested by Stefan Berger. - Added support for `--keyid=@filename'. Vitaly Chikunov (3): ima-evm-utils: Allow manual setting keyid for signing ima-evm-utils: Allow manual setting keyid from a cert file ima-evm-utils: Read keyid from the cert appended to the key file README | 6 +++ src/evmctl.c | 34 ++++++++++++ src/imaevm.h | 2 + src/libimaevm.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++-- tests/gen-keys.sh | 25 +++++++-- tests/sign_verify.test | 3 ++ 6 files changed, 204 insertions(+), 7 deletions(-) -- 2.11.0
