shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-05 13:18:17 +03:00
Code Issues Projects Releases Wiki Activity

lib/sign: make ed25519 engine non-public

Browse Source 
Remove unneeded public declaration for ed25519 signing engine.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>
This commit is contained in:
Denis Pynkin 2019-12-04 20:42:52 +00:00
parent 4d0e3a66c5
commit b4050b4a34
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apidoc/ostree-sections.txt
View File

@ -709,7 +709,6 @@ ostree_kernel_args_to_string
<SECTION> <SECTION>
<FILE>ostree-sign</FILE> <FILE>ostree-sign</FILE>
OstreeSign OstreeSign
OstreeSignEd25519
ostree_sign_list_names ostree_sign_list_names
ostree_sign_commit ostree_sign_commit
ostree_sign_commit_verify ostree_sign_commit_verify
@ -725,5 +724,4 @@ ostree_sign_set_sk
ostree_sign_summary ostree_sign_summary
<SUBSECTION Standard> <SUBSECTION Standard>
ostree_sign_get_type ostree_sign_get_type
ostree_sign_ed25519_get_type
</SECTION> </SECTION>

1
src/libostree/libostree-devel.sym
View File

@ -36,7 +36,6 @@ global:
ostree_sign_add_pk; ostree_sign_add_pk;
ostree_sign_set_sk; ostree_sign_set_sk;
ostree_sign_summary; ostree_sign_summary;
ostree_sign_ed25519_get_type;
} LIBOSTREE_2020.1; } LIBOSTREE_2020.1;
/* Stub section for the stable release *after* this development one; don't /* Stub section for the stable release *after* this development one; don't

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

@ -55,7 +55,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (OstreeSignEd25519, g_object_unref)
static void static void
ostree_sign_ed25519_iface_init (OstreeSignInterface *self); 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)); G_IMPLEMENT_INTERFACE (OSTREE_TYPE_SIGN, ostree_sign_ed25519_iface_init));
static void static void
@ -76,13 +76,13 @@ ostree_sign_ed25519_iface_init (OstreeSignInterface *self)
} }
static void static void
ostree_sign_ed25519_class_init (OstreeSignEd25519Class *self) _ostree_sign_ed25519_class_init (OstreeSignEd25519Class *self)
{ {
g_debug ("%s enter", __FUNCTION__); g_debug ("%s enter", __FUNCTION__);
} }
static void static void
ostree_sign_ed25519_init (OstreeSignEd25519 *self) _ostree_sign_ed25519_init (OstreeSignEd25519 *self)
{ {
g_debug ("%s enter", __FUNCTION__); g_debug ("%s enter", __FUNCTION__);
@ -111,7 +111,7 @@ gboolean ostree_sign_ed25519_data (OstreeSign *self,
g_debug ("%s enter", __FUNCTION__); g_debug ("%s enter", __FUNCTION__);
g_return_val_if_fail (OSTREE_IS_SIGN (self), FALSE); 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 #ifdef HAVE_LIBSODIUM
guchar *sig = NULL; guchar *sig = NULL;
@ -163,7 +163,7 @@ gboolean ostree_sign_ed25519_data_verify (OstreeSign *self,
g_return_val_if_fail (data != NULL, FALSE); g_return_val_if_fail (data != NULL, FALSE);
gboolean ret = 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) 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); g_return_val_if_fail (OSTREE_IS_SIGN (self), FALSE);
#ifdef HAVE_LIBSODIUM #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 */ /* Clear secret key */
if (sign->secret_key != NULL) 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); g_return_val_if_fail (OSTREE_IS_SIGN (self), FALSE);
#ifdef HAVE_LIBSODIUM #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); 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); g_return_val_if_fail (OSTREE_IS_SIGN (self), FALSE);
#ifdef HAVE_LIBSODIUM #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; g_autofree char * hex = NULL;
gpointer key = NULL; gpointer key = NULL;
@ -446,7 +446,7 @@ _ed25519_add_revoked (OstreeSign *self,
g_debug ("%s enter", __FUNCTION__); g_debug ("%s enter", __FUNCTION__);
g_return_val_if_fail (OSTREE_IS_SIGN (self), FALSE); 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; g_autofree char * hex = NULL;
gpointer key = NULL; gpointer key = NULL;

9
src/libostree/ostree-sign-ed25519.h
View File

@ -30,17 +30,16 @@
G_BEGIN_DECLS 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 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
typedef struct _OstreeSignEd25519 OstreeSignEd25519; typedef struct _OstreeSignEd25519 OstreeSignEd25519;
typedef struct { GObjectClass parent_class; } OstreeSignEd25519Class; 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 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 gboolean OSTREE_IS_SIGN_ED25519 (gpointer ptr) { return G_TYPE_CHECK_INSTANCE_TYPE (ptr, _ostree_sign_ed25519_get_type ()); }
G_GNUC_END_IGNORE_DEPRECATIONS G_GNUC_END_IGNORE_DEPRECATIONS