From b4050b4a34721f1302ade2f6a82a1148a243b46c Mon Sep 17 00:00:00 2001 From: Denis Pynkin Date: Wed, 4 Dec 2019 20:42:52 +0000 Subject: [PATCH] lib/sign: make ed25519 engine non-public Remove unneeded public declaration for ed25519 signing engine. Signed-off-by: Denis Pynkin --- apidoc/ostree-sections.txt | 2 -- src/libostree/libostree-devel.sym | 1 - src/libostree/ostree-sign-ed25519.c | 18 +++++++++--------- src/libostree/ostree-sign-ed25519.h | 9 ++++----- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/apidoc/ostree-sections.txt b/apidoc/ostree-sections.txt index e61b46c3..4dcdc482 100644 --- a/apidoc/ostree-sections.txt +++ b/apidoc/ostree-sections.txt @@ -709,7 +709,6 @@ ostree_kernel_args_to_string
ostree-sign OstreeSign -OstreeSignEd25519 ostree_sign_list_names ostree_sign_commit ostree_sign_commit_verify @@ -725,5 +724,4 @@ ostree_sign_set_sk ostree_sign_summary ostree_sign_get_type -ostree_sign_ed25519_get_type
diff --git a/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym index 730eac3e..4348ab8d 100644 --- a/src/libostree/libostree-devel.sym +++ b/src/libostree/libostree-devel.sym @@ -36,7 +36,6 @@ global: ostree_sign_add_pk; ostree_sign_set_sk; ostree_sign_summary; - ostree_sign_ed25519_get_type; } LIBOSTREE_2020.1; /* Stub section for the stable release *after* this development one; don't diff --git a/src/libostree/ostree-sign-ed25519.c b/src/libostree/ostree-sign-ed25519.c index 2d5bdb16..d28a5c32 100644 --- a/src/libostree/ostree-sign-ed25519.c +++ b/src/libostree/ostree-sign-ed25519.c @@ -55,7 +55,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (OstreeSignEd25519, g_object_unref) static void ostree_sign_ed25519_iface_init (OstreeSignInterface *self); -G_DEFINE_TYPE_WITH_CODE (OstreeSignEd25519, ostree_sign_ed25519, G_TYPE_OBJECT, +G_DEFINE_TYPE_WITH_CODE (OstreeSignEd25519, _ostree_sign_ed25519, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (OSTREE_TYPE_SIGN, ostree_sign_ed25519_iface_init)); static void @@ -76,13 +76,13 @@ ostree_sign_ed25519_iface_init (OstreeSignInterface *self) } static void -ostree_sign_ed25519_class_init (OstreeSignEd25519Class *self) +_ostree_sign_ed25519_class_init (OstreeSignEd25519Class *self) { g_debug ("%s enter", __FUNCTION__); } static void -ostree_sign_ed25519_init (OstreeSignEd25519 *self) +_ostree_sign_ed25519_init (OstreeSignEd25519 *self) { g_debug ("%s enter", __FUNCTION__); @@ -111,7 +111,7 @@ gboolean ostree_sign_ed25519_data (OstreeSign *self, g_debug ("%s enter", __FUNCTION__); g_return_val_if_fail (OSTREE_IS_SIGN (self), FALSE); - OstreeSignEd25519 *sign = ostree_sign_ed25519_get_instance_private(OSTREE_SIGN_ED25519(self)); + OstreeSignEd25519 *sign = _ostree_sign_ed25519_get_instance_private(OSTREE_SIGN_ED25519(self)); #ifdef HAVE_LIBSODIUM guchar *sig = NULL; @@ -163,7 +163,7 @@ gboolean ostree_sign_ed25519_data_verify (OstreeSign *self, g_return_val_if_fail (data != NULL, FALSE); gboolean ret = FALSE; - OstreeSignEd25519 *sign = ostree_sign_ed25519_get_instance_private(OSTREE_SIGN_ED25519(self)); + OstreeSignEd25519 *sign = _ostree_sign_ed25519_get_instance_private(OSTREE_SIGN_ED25519(self)); if (signatures == NULL) { @@ -284,7 +284,7 @@ gboolean ostree_sign_ed25519_clear_keys (OstreeSign *self, g_return_val_if_fail (OSTREE_IS_SIGN (self), FALSE); #ifdef HAVE_LIBSODIUM - OstreeSignEd25519 *sign = ostree_sign_ed25519_get_instance_private(OSTREE_SIGN_ED25519(self)); + OstreeSignEd25519 *sign = _ostree_sign_ed25519_get_instance_private(OSTREE_SIGN_ED25519(self)); /* Clear secret key */ if (sign->secret_key != NULL) @@ -326,7 +326,7 @@ gboolean ostree_sign_ed25519_set_sk (OstreeSign *self, g_return_val_if_fail (OSTREE_IS_SIGN (self), FALSE); #ifdef HAVE_LIBSODIUM - OstreeSignEd25519 *sign = ostree_sign_ed25519_get_instance_private(OSTREE_SIGN_ED25519(self)); + OstreeSignEd25519 *sign = _ostree_sign_ed25519_get_instance_private(OSTREE_SIGN_ED25519(self)); ostree_sign_ed25519_clear_keys (self, error); @@ -391,7 +391,7 @@ gboolean ostree_sign_ed25519_add_pk (OstreeSign *self, g_return_val_if_fail (OSTREE_IS_SIGN (self), FALSE); #ifdef HAVE_LIBSODIUM - OstreeSignEd25519 *sign = ostree_sign_ed25519_get_instance_private(OSTREE_SIGN_ED25519(self)); + OstreeSignEd25519 *sign = _ostree_sign_ed25519_get_instance_private(OSTREE_SIGN_ED25519(self)); g_autofree char * hex = NULL; gpointer key = NULL; @@ -446,7 +446,7 @@ _ed25519_add_revoked (OstreeSign *self, g_debug ("%s enter", __FUNCTION__); g_return_val_if_fail (OSTREE_IS_SIGN (self), FALSE); - OstreeSignEd25519 *sign = ostree_sign_ed25519_get_instance_private(OSTREE_SIGN_ED25519(self)); + OstreeSignEd25519 *sign = _ostree_sign_ed25519_get_instance_private(OSTREE_SIGN_ED25519(self)); g_autofree char * hex = NULL; gpointer key = NULL; diff --git a/src/libostree/ostree-sign-ed25519.h b/src/libostree/ostree-sign-ed25519.h index 6e5dd665..76c7e14d 100644 --- a/src/libostree/ostree-sign-ed25519.h +++ b/src/libostree/ostree-sign-ed25519.h @@ -30,17 +30,16 @@ G_BEGIN_DECLS -#define OSTREE_TYPE_SIGN_ED25519 (ostree_sign_ed25519_get_type ()) +#define OSTREE_TYPE_SIGN_ED25519 (_ostree_sign_ed25519_get_type ()) -_OSTREE_PUBLIC -GType ostree_sign_ed25519_get_type (void); +GType _ostree_sign_ed25519_get_type (void); G_GNUC_BEGIN_IGNORE_DEPRECATIONS typedef struct _OstreeSignEd25519 OstreeSignEd25519; typedef struct { GObjectClass parent_class; } OstreeSignEd25519Class; -static inline OstreeSignEd25519 *OSTREE_SIGN_ED25519 (gpointer ptr) { return G_TYPE_CHECK_INSTANCE_CAST (ptr, ostree_sign_ed25519_get_type (), OstreeSignEd25519); } -static inline gboolean OSTREE_IS_SIGN_ED25519 (gpointer ptr) { return G_TYPE_CHECK_INSTANCE_TYPE (ptr, ostree_sign_ed25519_get_type ()); } +static inline OstreeSignEd25519 *OSTREE_SIGN_ED25519 (gpointer ptr) { return G_TYPE_CHECK_INSTANCE_CAST (ptr, _ostree_sign_ed25519_get_type (), OstreeSignEd25519); } +static inline gboolean OSTREE_IS_SIGN_ED25519 (gpointer ptr) { return G_TYPE_CHECK_INSTANCE_TYPE (ptr, _ostree_sign_ed25519_get_type ()); } G_GNUC_END_IGNORE_DEPRECATIONS