diff options
| author | Yauheni Kaliuta <yauheni.kaliuta@redhat.com> | 2017-04-11 15:15:03 +0300 |
|---|---|---|
| committer | Lucas De Marchi <lucas.demarchi@intel.com> | 2017-04-11 09:04:28 -0700 |
| commit | e5b6a658eab9f1fa6405e2ac98930723b7f2bbfd (patch) | |
| tree | 6976f005407753110ebd2a387310580a35cafbb8 | |
| parent | abcd0bf8ec6623b26cddee3c2a9175b786957600 (diff) | |
| download | kmod-e5b6a658eab9f1fa6405e2ac98930723b7f2bbfd.tar.gz kmod-e5b6a658eab9f1fa6405e2ac98930723b7f2bbfd.tar.bz2 kmod-e5b6a658eab9f1fa6405e2ac98930723b7f2bbfd.zip | |
libkmod: modinfo: implement signature output
Signature was ignored from the modinfo. Implement its parsing
from the module data and add its output to the modinfo utility.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
| -rw-r--r-- | libkmod/libkmod-internal.h | 2 | ||||
| -rw-r--r-- | libkmod/libkmod-module.c | 9 | ||||
| -rw-r--r-- | libkmod/libkmod-signature.c | 6 |
3 files changed, 16 insertions, 1 deletions
diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h index 4d9db6b..346579c 100644 --- a/libkmod/libkmod-internal.h +++ b/libkmod/libkmod-internal.h @@ -186,5 +186,7 @@ struct kmod_signature_info { const char *key_id; size_t key_id_len; const char *algo, *hash_algo, *id_type; + const char *sig; + size_t sig_len; }; bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signature_info *sig_info) _must_check_ __attribute__((nonnull(1, 2))); diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c index 9e155f0..0a3ef11 100644 --- a/libkmod/libkmod-module.c +++ b/libkmod/libkmod-module.c @@ -2344,6 +2344,15 @@ KMOD_EXPORT int kmod_module_get_info(const struct kmod_module *mod, struct kmod_ * Omit sig_info.algo for now, as these * are currently constant. */ + n = kmod_module_info_append_hex(list, "signature", + strlen("signature"), + sig_info.sig, + sig_info.sig_len); + + if (n == NULL) + goto list_error; + count++; + } ret = count; diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c index ef5fe6e..1f3e26d 100644 --- a/libkmod/libkmod-signature.c +++ b/libkmod/libkmod-signature.c @@ -134,7 +134,11 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat size < (int64_t)(modsig->signer_len + modsig->key_id_len + sig_len)) return false; - size -= modsig->key_id_len + sig_len; + size -= sig_len; + sig_info->sig = mem + size; + sig_info->sig_len = sig_len; + + size -= modsig->key_id_len; sig_info->key_id = mem + size; sig_info->key_id_len = modsig->key_id_len; |