From 77bca82458b8b43a7949e13735befb05d8c68458 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Feb 24 2021 16:21:35 +0000 Subject: Apply patch libimaevm-keydesc-import.patch patch_name: libimaevm-keydesc-import.patch present_in_specfile: true --- diff --git a/compat/src/libimaevm.c b/compat/src/libimaevm.c index 39582f2..ce0f745 100644 --- a/compat/src/libimaevm.c +++ b/compat/src/libimaevm.c @@ -674,12 +674,11 @@ void calc_keyid_v1(uint8_t *keyid, char *str, const unsigned char *pkey, int len memcpy(keyid, sha1 + 12, 8); log_debug("keyid: "); log_debug_dump(keyid, 8); + id = __be64_to_cpup((__be64 *) keyid); + sprintf(str, "%llX", (unsigned long long)id); - if (params.verbose > LOG_INFO) { - id = __be64_to_cpup((__be64 *) keyid); - sprintf(str, "%llX", (unsigned long long)id); + if (params.verbose > LOG_INFO) log_info("keyid-v1: %s\n", str); - } } void calc_keyid_v2(uint32_t *keyid, char *str, RSA *key) @@ -696,11 +695,10 @@ void calc_keyid_v2(uint32_t *keyid, char *str, RSA *key) memcpy(keyid, sha1 + 16, 4); log_debug("keyid: "); log_debug_dump(keyid, 4); + sprintf(str, "%x", __be32_to_cpup(keyid)); - if (params.verbose > LOG_INFO) { - sprintf(str, "%x", __be32_to_cpup(keyid)); + if (params.verbose > LOG_INFO) log_info("keyid: %s\n", str); - } free(pkey); }