packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2134 from d4s/wip/d4s/fix_abort_on_verify 

Fix abort on verify
This commit is contained in:
OpenShift Merge Robot 2020-06-17 15:44:27 -04:00 committed by GitHub
parent b2dde24f00 ede93dc2ef
commit 1f7f5a1db0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libostree/ostree-sign-ed25519.c
View File

@ -415,12 +415,12 @@ gboolean ostree_sign_ed25519_add_pk (OstreeSign *self,
return glnx_throw (error, "Unknown ed25519 public key type"); return glnx_throw (error, "Unknown ed25519 public key type");
} }
g_autofree char *hex = g_malloc0 (crypto_sign_PUBLICKEYBYTES*2 + 1);
g_debug ("Read ed25519 public key = %s", sodium_bin2hex (hex, crypto_sign_PUBLICKEYBYTES*2+1, key, n_elements));
if (n_elements != crypto_sign_PUBLICKEYBYTES) if (n_elements != crypto_sign_PUBLICKEYBYTES)
return glnx_throw (error, "Incorrect ed25519 public key"); return glnx_throw (error, "Incorrect ed25519 public key");
g_autofree char *hex = g_malloc0 (crypto_sign_PUBLICKEYBYTES*2 + 1);
g_debug ("Read ed25519 public key = %s", sodium_bin2hex (hex, crypto_sign_PUBLICKEYBYTES*2+1, key, n_elements));
if (g_list_find_custom (sign->public_keys, key, _compare_ed25519_keys) == NULL) if (g_list_find_custom (sign->public_keys, key, _compare_ed25519_keys) == NULL)
{ {
gpointer newkey = g_memdup (key, n_elements); gpointer newkey = g_memdup (key, n_elements);
@ -449,14 +449,14 @@ _ed25519_add_revoked (OstreeSign *self,
gsize n_elements = 0; gsize n_elements = 0;
gpointer key = g_base64_decode (rk_ascii, &n_elements); gpointer key = g_base64_decode (rk_ascii, &n_elements);
g_autofree char * hex = g_malloc0 (crypto_sign_PUBLICKEYBYTES*2 + 1);
g_debug ("Read ed25519 revoked key = %s", sodium_bin2hex (hex, crypto_sign_PUBLICKEYBYTES*2+1, key, n_elements));
if (n_elements != crypto_sign_PUBLICKEYBYTES) if (n_elements != crypto_sign_PUBLICKEYBYTES)
{ {
return glnx_throw (error, "Incorrect ed25519 revoked key"); return glnx_throw (error, "Incorrect ed25519 revoked key");
} }
g_autofree char * hex = g_malloc0 (crypto_sign_PUBLICKEYBYTES*2 + 1);
g_debug ("Read ed25519 revoked key = %s", sodium_bin2hex (hex, crypto_sign_PUBLICKEYBYTES*2+1, key, n_elements));
if (g_list_find_custom (sign->revoked_keys, key, _compare_ed25519_keys) == NULL) if (g_list_find_custom (sign->revoked_keys, key, _compare_ed25519_keys) == NULL)
{ {
gpointer newkey = g_memdup (key, n_elements); gpointer newkey = g_memdup (key, n_elements);
@ -546,6 +546,8 @@ _load_pk_from_file (OstreeSign *self,
return glnx_throw (error, return glnx_throw (error,
"signature: ed25519: no valid keys in file '%s'", "signature: ed25519: no valid keys in file '%s'",
filename); filename);
else
return FALSE;
} }
return TRUE; return TRUE;