fixup! libnm: introduce NMDeviceWireguardth/review/pr/162

No public key in the libnm API, as it is also not on D-Bus.

3 files changed, 0 insertions, 41 deletions

diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 6b72eee286..b87a62f3f3 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1386,7 +1386,6 @@ global:
 	nm_device_6lowpan_get_type;
 	nm_device_wireguard_get_fwmark;
 	nm_device_wireguard_get_listen_port;
-	nm_device_wireguard_get_private_key;
 	nm_device_wireguard_get_public_key;
 	nm_device_wireguard_get_type;
 	nm_device_wpan_get_type;
diff --git a/libnm/nm-device-wireguard.c b/libnm/nm-device-wireguard.c
index 94f6b18a06..c3d2bb1614 100644
--- a/libnm/nm-device-wireguard.c
+++ b/libnm/nm-device-wireguard.c
@@ -24,7 +24,6 @@
 #include "nm-object-private.h"
 
 typedef struct {
-	char *private_key;
 	char *public_key;
 	guint listen_port;
 	guint fwmark;
@@ -46,31 +45,12 @@ G_DEFINE_TYPE (NMDeviceWireguard, nm_device_wireguard, NM_TYPE_DEVICE)
 #define NM_DEVICE_WIREGUARD_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_WIREGUARD, NMDeviceWireguardPrivate))
 
 NM_GOBJECT_PROPERTIES_DEFINE_BASE (
-	PROP_PRIVATE_KEY,
 	PROP_PUBLIC_KEY,
 	PROP_LISTEN_PORT,
 	PROP_FWMARK,
 );
 
 /**
- * nm_device_wireguard_get_private_key:
- * @device: a #NMDeviceWireguard
- *
- * Gets the private key for this interface
- *
- * Returns: (transfer-none): pointer to the 32-byte private key in base64 encoding.
- *
- * Since: 1.14
- **/
-const char *
-nm_device_wireguard_get_private_key (NMDeviceWireguard *device)
-{
-	g_return_val_if_fail (NM_IS_DEVICE_WIREGUARD (device), NULL);
-
-	return NM_DEVICE_WIREGUARD_GET_PRIVATE (device)->private_key;
-}
-
-/**
  * nm_device_wireguard_get_public_key:
  * @device: a #NMDeviceWireguard
  *
@@ -138,9 +118,6 @@ get_property (GObject *object,
 	NMDeviceWireguardPrivate *priv = NM_DEVICE_WIREGUARD_GET_PRIVATE (object);
 
 	switch (prop_id) {
-	case PROP_PRIVATE_KEY:
-		g_value_set_string (value, priv->private_key);
-		break;
 	case PROP_PUBLIC_KEY:
 		g_value_set_string (value, priv->public_key);
 		break;
@@ -166,7 +143,6 @@ init_dbus (NMObject *object)
 {
 	NMDeviceWireguardPrivate *priv = NM_DEVICE_WIREGUARD_GET_PRIVATE (object);
 	const NMPropertiesInfo property_info[] = {
-		{ NM_DEVICE_WIREGUARD_PRIVATE_KEY, &priv->private_key },
 		{ NM_DEVICE_WIREGUARD_PUBLIC_KEY,  &priv->public_key },
 		{ NM_DEVICE_WIREGUARD_LISTEN_PORT, &priv->listen_port },
 		{ NM_DEVICE_WIREGUARD_FWMARK,      &priv->fwmark },
@@ -193,19 +169,6 @@ nm_device_wireguard_class_init (NMDeviceWireguardClass *wireguard_class)
 	nm_object_class->init_dbus = init_dbus;
 
 	/**
-	 * NMDeviceWireguard:private_key:
-	 *
-	 * 32-byte private key in base64 encoding.
-	 *
-	 * Since: 1.14
-	 **/
-	obj_properties[PROP_PRIVATE_KEY] =
-	    g_param_spec_string (NM_DEVICE_WIREGUARD_PRIVATE_KEY,
-	                         "", "",
-	                         NULL,
-	                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-
-	/**
 	 * NMDeviceWireguard:public_key:
 	 *
 	 * 32-byte public key in base64 encoding, derived from the
diff --git a/libnm/nm-device-wireguard.h b/libnm/nm-device-wireguard.h
index 64b03298ec..947e4ed57b 100644
--- a/libnm/nm-device-wireguard.h
+++ b/libnm/nm-device-wireguard.h
@@ -37,7 +37,6 @@ G_BEGIN_DECLS
 
 typedef struct _NMDeviceWireguardClass NMDeviceWireguardClass;
 
-#define NM_DEVICE_WIREGUARD_PRIVATE_KEY  "private-key"
 #define NM_DEVICE_WIREGUARD_PUBLIC_KEY   "public-key"
 #define NM_DEVICE_WIREGUARD_LISTEN_PORT  "listen-port"
 #define NM_DEVICE_WIREGUARD_FWMARK       "fwmark"
@@ -46,8 +45,6 @@ NM_AVAILABLE_IN_1_14
 GType nm_device_wireguard_get_type (void);
 
 NM_AVAILABLE_IN_1_14
-const char *nm_device_wireguard_get_private_key (NMDeviceWireguard *device);
-NM_AVAILABLE_IN_1_14
 const char *nm_device_wireguard_get_public_key (NMDeviceWireguard *device);
 NM_AVAILABLE_IN_1_14
 guint16 nm_device_wireguard_get_listen_port (NMDeviceWireguard *device);