ahill/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-01-26 06:07:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

json-oci: Make FlatpakOciSignature just a simple signature

Browse Source 
FlatpakOciSignature was a Flatpak-specific analog to
the containers/image "simple signatures" - but it wasn't used at
all, and Flatpaks on registry.redhat.io are signed by the
original simple signatures. So modify it correspond to
the original simple signatures.
This commit is contained in:
Owen W. Taylor 2024-10-10 15:51:27 -04:00 committed by Sebastian Wick
parent d13ae21a8e
commit 0f4ad0e925
2 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/flatpak-json-oci-private.h
View File

@ -249,6 +249,10 @@ void flatpak_oci_add_labels_for_commit (GHashTable *labels,
const char *commit,
GVariant *commit_data);
/* FlatpakOciSignature is a "simple signature" as defined:
* https://github.com/containers/image/blob/main/docs/containers-signature.5.md
*/
#define FLATPAK_TYPE_OCI_SIGNATURE flatpak_oci_signature_get_type ()
G_DECLARE_FINAL_TYPE (FlatpakOciSignature, flatpak_oci_signature, FLATPAK, OCI_SIGNATURE, FlatpakJson)
@ -259,7 +263,7 @@ typedef struct
typedef struct
{
char *ref;
char *reference;
} FlatpakOciSignatureCriticalIdentity;
typedef struct
@ -288,9 +292,6 @@ struct _FlatpakOciSignatureClass
FlatpakJsonClass parent_class;
};
FlatpakOciSignature *flatpak_oci_signature_new (const char *digest,
const char *ref);
#define FLATPAK_TYPE_OCI_INDEX_RESPONSE flatpak_oci_index_response_get_type ()
G_DECLARE_FINAL_TYPE (FlatpakOciIndexResponse, flatpak_oci_index_response, FLATPAK, OCI_INDEX_RESPONSE, FlatpakJson)

23
common/flatpak-json-oci.c
View File

@ -956,7 +956,7 @@ flatpak_oci_signature_critical_destroy (FlatpakOciSignatureCritical *self)
{
g_free (self->type);
g_free (self->image.digest);
g_free (self->identity.ref);
g_free (self->identity.reference);
}
static void
@ -982,11 +982,11 @@ flatpak_oci_signature_class_init (FlatpakOciSignatureClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
FlatpakJsonClass *json_class = FLATPAK_JSON_CLASS (klass);
static FlatpakJsonProp image_props[] = {
FLATPAK_JSON_MANDATORY_STRING_PROP (FlatpakOciSignatureCriticalImage, digest, "oci-image-manifest-digest"),
FLATPAK_JSON_MANDATORY_STRING_PROP (FlatpakOciSignatureCriticalImage, digest, "docker-manifest-digest"),
FLATPAK_JSON_LAST_PROP
};
static FlatpakJsonProp identity_props[] = {
FLATPAK_JSON_MANDATORY_STRING_PROP (FlatpakOciSignatureCriticalIdentity, ref, "oci-image-ref"),
FLATPAK_JSON_MANDATORY_STRING_PROP (FlatpakOciSignatureCriticalIdentity, reference, "docker-reference"),
FLATPAK_JSON_LAST_PROP
};
static FlatpakJsonProp critical_props[] = {
@ -1015,23 +1015,6 @@ flatpak_oci_signature_init (FlatpakOciSignature *self)
{
}
FlatpakOciSignature *
flatpak_oci_signature_new (const char *digest, const char *ref)
{
FlatpakOciSignature *signature;
signature = g_object_new (FLATPAK_TYPE_OCI_SIGNATURE, NULL);
/* Some default values */
signature->critical.type = g_strdup (FLATPAK_OCI_SIGNATURE_TYPE_FLATPAK);
signature->critical.image.digest = g_strdup (digest);
signature->critical.identity.ref = g_strdup (ref);
signature->optional.creator = g_strdup ("flatpak " PACKAGE_VERSION);
signature->optional.timestamp = time (NULL);
return signature;
}
G_DEFINE_TYPE (FlatpakOciIndexResponse, flatpak_oci_index_response, FLATPAK_TYPE_JSON);
static void