dh/ima-evm-utils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use enums for signature versions

Browse Source 
Using enums for fixed values looks cleaner. Also I am planning to use
version field in more places in next patch. So use enums intead of
numbers like 1 and 2.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
This commit is contained in:
Vivek Goyal 2013-07-12 14:52:10 -04:00 committed by Dmitry Kasatkin
parent b49e2251a0
commit 0df73005a3
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/evmctl.c
View File

@ -108,6 +108,11 @@ enum digest_algo {
DIGEST_ALGO_MAX DIGEST_ALGO_MAX
}; };
enum digsig_version {
DIGSIG_VERSION_1 = 1,
DIGSIG_VERSION_2
};
struct pubkey_hdr { struct pubkey_hdr {
uint8_t version; /* key format version */ uint8_t version; /* key format version */
uint32_t timestamp; /* key made, always 0 for now */ uint32_t timestamp; /* key made, always 0 for now */
@ -507,7 +512,7 @@ static int sign_hash_v1(const char *hashalgo, const unsigned char *hash, int siz
return -1; return -1;
/* now create a new hash */ /* now create a new hash */
hdr->version = 1; hdr->version = (uint8_t) DIGSIG_VERSION_1;
hdr->timestamp = time(NULL); hdr->timestamp = time(NULL);
hdr->algo = PUBKEY_ALGO_RSA; hdr->algo = PUBKEY_ALGO_RSA;
hashalgo_idx = get_hash_algo_v1(hashalgo); hashalgo_idx = get_hash_algo_v1(hashalgo);
@ -577,7 +582,7 @@ static int sign_hash_v2(const char *algo, const unsigned char *hash, int size, c
if (!key) if (!key)
return -1; return -1;
hdr->version = 2; hdr->version = (uint8_t) DIGSIG_VERSION_2;
hdr->hash_algo = get_hash_algo(algo); hdr->hash_algo = get_hash_algo(algo);
calc_keyid_v2(&hdr->keyid, name, key); calc_keyid_v2(&hdr->keyid, name, key);