[network-manager-applet: 4/6] all: Remove most of wireless-security
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet: 4/6] all: Remove most of wireless-security
- Date: Wed, 18 Nov 2020 15:46:00 +0000 (UTC)
commit 3eb6da6b9f706c3cd8fc4d2e0ddbd07d3918656d
Author: Andrew Zaborowski <andrew zaborowski intel com>
Date: Sat Nov 7 04:50:47 2020 +0100
all: Remove most of wireless-security
Since only two utilities are now used from wireless-security, go ahead
and remove everything else.
.gitignore | 4 +-
Makefile.am | 67 +---
po/POTFILES.in | 23 --
src/ap-menu-item.c | 8 +-
src/connection-editor/meson.build | 3 +-
src/meson.build | 3 +-
src/wireless-security/eap-method-fast.c | 438 ---------------------
src/wireless-security/eap-method-fast.h | 22 --
src/wireless-security/eap-method-fast.ui | 183 ---------
src/wireless-security/eap-method-leap.c | 250 ------------
src/wireless-security/eap-method-leap.h | 21 -
src/wireless-security/eap-method-leap.ui | 99 -----
src/wireless-security/eap-method-peap.c | 486 -----------------------
src/wireless-security/eap-method-peap.h | 22 --
src/wireless-security/eap-method-peap.ui | 215 -----------
src/wireless-security/eap-method-simple.c | 474 -----------------------
src/wireless-security/eap-method-simple.h | 51 ---
src/wireless-security/eap-method-simple.ui | 158 --------
src/wireless-security/eap-method-tls.c | 497 ------------------------
src/wireless-security/eap-method-tls.h | 22 --
src/wireless-security/eap-method-tls.ui | 106 -----
src/wireless-security/eap-method-ttls.c | 521 -------------------------
src/wireless-security/eap-method-ttls.h | 22 --
src/wireless-security/eap-method-ttls.ui | 165 --------
src/wireless-security/eap-method.c | 325 ----------------
src/wireless-security/eap-method.h | 92 -----
src/wireless-security/helpers.c | 39 --
src/wireless-security/helpers.h | 21 -
src/wireless-security/meson.build | 37 --
src/wireless-security/wireless-security.c | 594 -----------------------------
src/wireless-security/wireless-security.h | 137 -------
src/wireless-security/ws-dynamic-wep.c | 119 ------
src/wireless-security/ws-dynamic-wep.h | 18 -
src/wireless-security/ws-dynamic-wep.ui | 87 -----
src/wireless-security/ws-leap.c | 206 ----------
src/wireless-security/ws-leap.h | 16 -
src/wireless-security/ws-leap.ui | 100 -----
src/wireless-security/ws-sae.c | 202 ----------
src/wireless-security/ws-sae.h | 16 -
src/wireless-security/ws-sae.ui | 98 -----
src/wireless-security/ws-wep-key.c | 354 -----------------
src/wireless-security/ws-wep-key.h | 19 -
src/wireless-security/ws-wep-key.ui | 172 ---------
src/wireless-security/ws-wpa-eap.c | 121 ------
src/wireless-security/ws-wpa-eap.h | 19 -
src/wireless-security/ws-wpa-eap.ui | 87 -----
src/wireless-security/ws-wpa-psk.c | 219 -----------
src/wireless-security/ws-wpa-psk.h | 16 -
src/wireless-security/ws-wpa-psk.ui | 98 -----
src/wireless-security/ws.gresource.xml | 17 -
50 files changed, 11 insertions(+), 7078 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ba1fd2151..18600d7d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -124,8 +124,6 @@ src/nm-applet
src/applet-dbus-bindings.h
src/applet-resources.c
src/applet-resources.h
-src/wireless-security/ws-resources.c
-src/wireless-security/ws-resources.h
man/*.1
/test-driver
@@ -156,3 +154,5 @@ libnma.types
# up.
/org.gnome.nm-applet.gschema.xml
/org.gnome.nm-applet.gschema.valid
+src/wireless-security/ws-resources.c
+src/wireless-security/ws-resources.h
diff --git a/Makefile.am b/Makefile.am
index c77c3d2e3..01f4dd927 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -199,69 +199,19 @@ EXTRA_DIST += src/utils/meson.build
###############################################################################
-src/wireless-security/ws-resources.h: src/wireless-security/ws.gresource.xml
- $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/wireless-security
--generate-header --internal
-
-src/wireless-security/ws-resources.c: src/wireless-security/ws.gresource.xml $(shell
$(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/src/wireless-security --generate-dependencies
$(srcdir)/src/wireless-security/ws.gresource.xml)
- $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/wireless-security
--generate-source --internal
-
-CLEANFILES += \
- $(wireless_security_h_gen) \
- $(wireless_security_c_gen)
-
-wireless_security_h_gen = \
- src/wireless-security/ws-resources.h
-
-wireless_security_c_gen = \
- src/wireless-security/ws-resources.c
-
wireless_security_c_real = \
- src/wireless-security/wireless-security.h \
- src/wireless-security/wireless-security.c \
- src/wireless-security/ws-sae.h \
- src/wireless-security/ws-sae.c \
- src/wireless-security/ws-wep-key.h \
- src/wireless-security/ws-wep-key.c \
- src/wireless-security/ws-wpa-psk.h \
- src/wireless-security/ws-wpa-psk.c \
- src/wireless-security/ws-leap.h \
- src/wireless-security/ws-leap.c \
- src/wireless-security/ws-wpa-eap.h \
- src/wireless-security/ws-wpa-eap.c \
- src/wireless-security/ws-dynamic-wep.h \
- src/wireless-security/ws-dynamic-wep.c \
src/wireless-security/eap-method.h \
- src/wireless-security/eap-method.c \
- src/wireless-security/eap-method-tls.h \
- src/wireless-security/eap-method-tls.c \
- src/wireless-security/eap-method-leap.h \
- src/wireless-security/eap-method-leap.c \
- src/wireless-security/eap-method-fast.h \
- src/wireless-security/eap-method-fast.c \
- src/wireless-security/eap-method-ttls.h \
- src/wireless-security/eap-method-ttls.c \
- src/wireless-security/eap-method-peap.h \
- src/wireless-security/eap-method-peap.c \
- src/wireless-security/eap-method-simple.h \
- src/wireless-security/eap-method-simple.c \
- src/wireless-security/helpers.h \
- src/wireless-security/helpers.c
-
+ src/wireless-security/eap-method.c
noinst_LTLIBRARIES += src/wireless-security/libwireless-security-libnm.la
src_wireless_security_libwireless_security_libnm_la_SOURCES = \
$(wireless_security_c_real)
-nodist_src_wireless_security_libwireless_security_libnm_la_SOURCES = \
- $(wireless_security_c_gen)
-
src_wireless_security_libwireless_security_libnm_la_CPPFLAGS = \
$(dflt_cppflags) \
"-I$(srcdir)/shared" \
- "-I$(srcdir)/src/utils" \
$(GTK3_CFLAGS) \
- $(LIBNMA_CFLAGS) \
$(LIBNM_CFLAGS)
src_wireless_security_libwireless_security_libnm_la_LIBADD = \
@@ -269,22 +219,7 @@ src_wireless_security_libwireless_security_libnm_la_LIBADD = \
$(GTK3_LIBS) \
$(LIBNM_LIBS)
-$(src_wireless_security_libwireless_security_libnm_la_OBJECTS): $(wireless_security_h_gen)
-
EXTRA_DIST += \
- src/wireless-security/eap-method-fast.ui \
- src/wireless-security/eap-method-leap.ui \
- src/wireless-security/eap-method-peap.ui \
- src/wireless-security/eap-method-simple.ui \
- src/wireless-security/eap-method-tls.ui \
- src/wireless-security/eap-method-ttls.ui \
- src/wireless-security/ws-dynamic-wep.ui \
- src/wireless-security/ws-leap.ui \
- src/wireless-security/ws-sae.ui \
- src/wireless-security/ws-wep-key.ui \
- src/wireless-security/ws-wpa-eap.ui \
- src/wireless-security/ws-wpa-psk.ui \
- src/wireless-security/ws.gresource.xml \
src/wireless-security/meson.build
###############################################################################
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6c35264db..a5521ae03 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -85,27 +85,4 @@ src/main.c
src/mb-menu-item.c
src/mobile-helpers.c
src/utils/utils.c
-src/wireless-security/eap-method-fast.c
-src/wireless-security/eap-method-fast.ui
-src/wireless-security/eap-method-leap.c
-src/wireless-security/eap-method-leap.ui
-src/wireless-security/eap-method-peap.c
-src/wireless-security/eap-method-peap.ui
-src/wireless-security/eap-method-simple.c
-src/wireless-security/eap-method-simple.ui
-src/wireless-security/eap-method-tls.c
-src/wireless-security/eap-method-tls.ui
-src/wireless-security/eap-method-ttls.c
-src/wireless-security/eap-method-ttls.ui
src/wireless-security/eap-method.c
-src/wireless-security/wireless-security.c
-src/wireless-security/ws-dynamic-wep.ui
-src/wireless-security/ws-leap.c
-src/wireless-security/ws-leap.ui
-src/wireless-security/ws-sae.c
-src/wireless-security/ws-sae.ui
-src/wireless-security/ws-wep-key.c
-src/wireless-security/ws-wep-key.ui
-src/wireless-security/ws-wpa-eap.ui
-src/wireless-security/ws-wpa-psk.c
-src/wireless-security/ws-wpa-psk.ui
diff --git a/src/ap-menu-item.c b/src/ap-menu-item.c
index c15829581..8e957e925 100644
--- a/src/ap-menu-item.c
+++ b/src/ap-menu-item.c
@@ -18,9 +18,6 @@
#include "nm-access-point.h"
#include "mobile-helpers.h"
-/* Only to get the NMU_SEC_SAE compat constant. */
-#include "wireless-security.h"
-
G_DEFINE_TYPE (NMNetworkMenuItem, nm_network_menu_item, GTK_TYPE_MENU_ITEM);
#define NM_NETWORK_MENU_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_NETWORK_MENU_ITEM,
NMNetworkMenuItemPrivate))
@@ -297,7 +294,10 @@ nm_network_menu_item_new (NMAccessPoint *ap,
#if NM_CHECK_VERSION(1,24,0)
&& !nm_utils_security_valid (NMU_SEC_OWE, dev_caps, TRUE, priv->is_adhoc, ap_flags, ap_wpa,
ap_rsn)
#endif
- && !nm_utils_security_valid (NMU_SEC_SAE, dev_caps, TRUE, priv->is_adhoc, ap_flags, ap_wpa,
ap_rsn)) {
+#if NM_CHECK_VERSION(1,22,0)
+ && !nm_utils_security_valid (NMU_SEC_SAE, dev_caps, TRUE, priv->is_adhoc, ap_flags, ap_wpa,
ap_rsn)
+#endif
+ ) {
gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
}
diff --git a/src/connection-editor/meson.build b/src/connection-editor/meson.build
index f36e07097..48e598d88 100644
--- a/src/connection-editor/meson.build
+++ b/src/connection-editor/meson.build
@@ -88,7 +88,8 @@ deps = [
gtk_dep,
libnm_dep,
libnma_dep,
- m_dep
+ m_dep,
+ libutils_libnm_dep
]
cflags = [
diff --git a/src/meson.build b/src/meson.build
index a394068c0..2d910bb28 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -47,7 +47,8 @@ deps = [
libnma_dep,
libnotify_dep,
libsecret_dep,
- m_dep
+ m_dep,
+ libutils_libnm_dep
]
cflags = [
diff --git a/src/wireless-security/eap-method.c b/src/wireless-security/eap-method.c
index b7c1a82e3..b874072b3 100644
--- a/src/wireless-security/eap-method.c
+++ b/src/wireless-security/eap-method.c
@@ -9,245 +9,12 @@
#include "nm-default.h"
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
#include "eap-method.h"
-#include "nm-utils.h"
-#include "utils.h"
-#include "helpers.h"
-
-G_DEFINE_BOXED_TYPE (EAPMethod, eap_method, eap_method_ref, eap_method_unref)
-
-GtkWidget *
-eap_method_get_widget (EAPMethod *method)
-{
- g_return_val_if_fail (method != NULL, NULL);
-
- return method->ui_widget;
-}
-
-gboolean
-eap_method_validate (EAPMethod *method, GError **error)
-{
- gboolean result;
-
- g_return_val_if_fail (method != NULL, FALSE);
-
- g_assert (method->validate);
- result = (*(method->validate)) (method, error);
- if (!result && error && !*error)
- g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("undefined error in 802.1X
security (wpa-eap)"));
- return result;
-}
-
-void
-eap_method_add_to_size_group (EAPMethod *method, GtkSizeGroup *group)
-{
- g_return_if_fail (method != NULL);
- g_return_if_fail (group != NULL);
-
- g_assert (method->add_to_size_group);
- return (*(method->add_to_size_group)) (method, group);
-}
-
-void
-eap_method_fill_connection (EAPMethod *method,
- NMConnection *connection)
-{
- g_return_if_fail (method != NULL);
- g_return_if_fail (connection != NULL);
-
- g_assert (method->fill_connection);
- return (*(method->fill_connection)) (method, connection);
-}
-
-void
-eap_method_update_secrets (EAPMethod *method, NMConnection *connection)
-{
- g_return_if_fail (method != NULL);
- g_return_if_fail (connection != NULL);
-
- if (method->update_secrets)
- method->update_secrets (method, connection);
-}
-
-void
-eap_method_phase2_update_secrets_helper (EAPMethod *method,
- NMConnection *connection,
- const char *combo_name,
- guint32 column)
-{
- GtkWidget *combo;
- GtkTreeIter iter;
- GtkTreeModel *model;
-
- g_return_if_fail (method != NULL);
- g_return_if_fail (connection != NULL);
- g_return_if_fail (combo_name != NULL);
-
- combo = GTK_WIDGET (gtk_builder_get_object (method->builder, combo_name));
- g_assert (combo);
-
- /* Let each EAP phase2 method try to update its secrets */
- model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
- if (gtk_tree_model_get_iter_first (model, &iter)) {
- do {
- EAPMethod *eap = NULL;
-
- gtk_tree_model_get (model, &iter, column, &eap, -1);
- if (eap) {
- eap_method_update_secrets (eap, connection);
- eap_method_unref (eap);
- }
- } while (gtk_tree_model_iter_next (model, &iter));
- }
-}
-
-EAPMethod *
-eap_method_init (gsize obj_size,
- EMValidateFunc validate,
- EMAddToSizeGroupFunc add_to_size_group,
- EMFillConnectionFunc fill_connection,
- EMUpdateSecretsFunc update_secrets,
- EMDestroyFunc destroy,
- const char *ui_resource,
- const char *ui_widget_name,
- const char *default_field,
- gboolean phase2)
-{
- EAPMethod *method;
- GError *error = NULL;
-
- g_return_val_if_fail (obj_size > 0, NULL);
- g_return_val_if_fail (ui_resource != NULL, NULL);
- g_return_val_if_fail (ui_widget_name != NULL, NULL);
-
- method = g_slice_alloc0 (obj_size);
- g_assert (method);
-
- method->refcount = 1;
- method->obj_size = obj_size;
- method->validate = validate;
- method->add_to_size_group = add_to_size_group;
- method->fill_connection = fill_connection;
- method->update_secrets = update_secrets;
- method->default_field = default_field;
- method->phase2 = phase2;
-
- method->builder = gtk_builder_new ();
- if (!gtk_builder_add_from_resource (method->builder, ui_resource, &error)) {
- g_warning ("Couldn't load UI builder resource %s: %s",
- ui_resource, error->message);
- eap_method_unref (method);
- return NULL;
- }
-
- method->ui_widget = GTK_WIDGET (gtk_builder_get_object (method->builder, ui_widget_name));
- if (!method->ui_widget) {
- g_warning ("Couldn't load UI widget '%s' from UI file %s",
- ui_widget_name, ui_resource);
- eap_method_unref (method);
- return NULL;
- }
- g_object_ref_sink (method->ui_widget);
-
- method->destroy = destroy;
-
- return method;
-}
-
-
-EAPMethod *
-eap_method_ref (EAPMethod *method)
-{
- g_return_val_if_fail (method != NULL, NULL);
- g_return_val_if_fail (method->refcount > 0, NULL);
-
- method->refcount++;
- return method;
-}
-
-void
-eap_method_unref (EAPMethod *method)
-{
- g_return_if_fail (method != NULL);
- g_return_if_fail (method->refcount > 0);
-
- method->refcount--;
- if (method->refcount == 0) {
- if (method->destroy)
- method->destroy (method);
-
- if (method->builder)
- g_object_unref (method->builder);
- if (method->ui_widget)
- g_object_unref (method->ui_widget);
-
- g_slice_free1 (method->obj_size, method);
- }
-}
/* Used as both GSettings keys and GObject data tags */
#define IGNORE_CA_CERT_TAG "ignore-ca-cert"
#define IGNORE_PHASE2_CA_CERT_TAG "ignore-phase2-ca-cert"
-/**
- * eap_method_ca_cert_ignore_set:
- * @method: the #EAPMethod object
- * @connection: the #NMConnection
- * @filename: the certificate file, if any
- * @ca_cert_error: %TRUE if an error was encountered loading the given CA
- * certificate, %FALSE if not or if a CA certificate is not present
- *
- * Updates the connection's CA cert ignore value to %TRUE if the "CA certificate
- * not required" checkbox is checked. If @ca_cert_error is %TRUE, then the
- * connection's CA cert ignore value will always be set to %FALSE, because it
- * means that the user selected an invalid certificate (thus he does not want to
- * ignore the CA cert)..
- */
-void
-eap_method_ca_cert_ignore_set (EAPMethod *method,
- NMConnection *connection,
- const char *filename,
- gboolean ca_cert_error)
-{
- NMSetting8021x *s_8021x;
- gboolean ignore;
-
- s_8021x = nm_connection_get_setting_802_1x (connection);
- if (s_8021x) {
- ignore = !ca_cert_error && filename == NULL;
- g_object_set_data (G_OBJECT (s_8021x),
- method->phase2 ? IGNORE_PHASE2_CA_CERT_TAG : IGNORE_CA_CERT_TAG,
- GUINT_TO_POINTER (ignore));
- }
-}
-
-/**
- * eap_method_ca_cert_ignore_get:
- * @method: the #EAPMethod object
- * @connection: the #NMConnection
- *
- * Returns: %TRUE if a missing CA certificate can be ignored, %FALSE if a CA
- * certificate should be required for the connection to be valid.
- */
-gboolean
-eap_method_ca_cert_ignore_get (EAPMethod *method, NMConnection *connection)
-{
- NMSetting8021x *s_8021x;
-
- s_8021x = nm_connection_get_setting_802_1x (connection);
- if (s_8021x) {
- return !!g_object_get_data (G_OBJECT (s_8021x),
- method->phase2 ? IGNORE_PHASE2_CA_CERT_TAG : IGNORE_CA_CERT_TAG);
- }
- return FALSE;
-}
-
static GSettings *
_get_ca_ignore_settings (NMConnection *connection)
{
@@ -333,95 +100,3 @@ eap_method_ca_cert_ignore_load (NMConnection *connection)
GUINT_TO_POINTER (phase2_ignore));
g_object_unref (settings);
}
-
-GError *
-eap_method_ca_cert_validate_cb (NMACertChooser *cert_chooser, gpointer user_data)
-{
- NMSetting8021xCKScheme scheme;
- NMSetting8021xCKFormat format = NM_SETTING_802_1X_CK_FORMAT_UNKNOWN;
- gs_unref_object NMSetting8021x *setting = NULL;
- gs_free char *value = NULL;
- GError *local = NULL;
-
- setting = (NMSetting8021x *) nm_setting_802_1x_new ();
-
- value = nma_cert_chooser_get_cert (cert_chooser, &scheme);
- if (!value) {
- return g_error_new_literal (NMA_ERROR, NMA_ERROR_GENERIC,
- _("no CA certificate selected"));
- }
- if (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH) {
- if (!g_file_test (value, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) {
- return g_error_new_literal (NMA_ERROR, NMA_ERROR_GENERIC,
- _("selected CA certificate file does not exist"));
- }
- }
-
- if (!nm_setting_802_1x_set_ca_cert (setting, value, scheme, &format, &local))
- return local;
-
- return NULL;
-}
-
-void
-eap_method_setup_cert_chooser (NMACertChooser *cert_chooser,
- NMSetting8021x *s_8021x,
- NMSetting8021xCKScheme (*cert_scheme_func) (NMSetting8021x *setting),
- const char *(*cert_path_func) (NMSetting8021x *setting),
- const char *(*cert_uri_func) (NMSetting8021x *setting),
- const char *(*cert_password_func) (NMSetting8021x *setting),
- NMSetting8021xCKScheme (*key_scheme_func) (NMSetting8021x *setting),
- const char *(*key_path_func) (NMSetting8021x *setting),
- const char *(*key_uri_func) (NMSetting8021x *setting),
- const char *(*key_password_func) (NMSetting8021x *setting))
-{
- NMSetting8021xCKScheme scheme = NM_SETTING_802_1X_CK_SCHEME_UNKNOWN;
- const char *value = NULL;
- const char *password = NULL;
-
-
- if (s_8021x && cert_path_func && cert_uri_func && cert_scheme_func) {
- scheme = cert_scheme_func (s_8021x);
- switch (scheme) {
- case NM_SETTING_802_1X_CK_SCHEME_PATH:
- value = cert_path_func (s_8021x);
- break;
- case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
- value = cert_uri_func (s_8021x);
- password = cert_password_func ? cert_password_func (s_8021x) : NULL;
- if (password)
- nma_cert_chooser_set_cert_password (cert_chooser, password);
- break;
- case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
- /* No CA set. */
- break;
- default:
- g_warning ("unhandled certificate scheme %d", scheme);
- }
-
- }
- nma_cert_chooser_set_cert (cert_chooser, value, scheme);
-
- if (s_8021x && key_path_func && key_uri_func && key_scheme_func) {
- scheme = key_scheme_func (s_8021x);
- switch (scheme) {
- case NM_SETTING_802_1X_CK_SCHEME_PATH:
- value = key_path_func (s_8021x);
- break;
- case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
- value = key_uri_func (s_8021x);
- break;
- case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
- /* No certificate set. */
- break;
- default:
- g_warning ("unhandled key scheme %d", scheme);
- }
-
- nma_cert_chooser_set_key (cert_chooser, value, scheme);
- }
-
- password = s_8021x && key_password_func ? key_password_func (s_8021x) : NULL;
- if (password)
- nma_cert_chooser_set_key_password (cert_chooser, key_password_func (s_8021x));
-}
diff --git a/src/wireless-security/eap-method.h b/src/wireless-security/eap-method.h
index ed9e1ac84..3cc9da03b 100644
--- a/src/wireless-security/eap-method.h
+++ b/src/wireless-security/eap-method.h
@@ -9,99 +9,7 @@
#ifndef EAP_METHOD_H
#define EAP_METHOD_H
-typedef struct _EAPMethod EAPMethod;
-
-typedef void (*EMAddToSizeGroupFunc) (EAPMethod *method, GtkSizeGroup *group);
-typedef void (*EMFillConnectionFunc) (EAPMethod *method, NMConnection *connection);
-typedef void (*EMUpdateSecretsFunc) (EAPMethod *method, NMConnection *connection);
-typedef void (*EMDestroyFunc) (EAPMethod *method);
-typedef gboolean (*EMValidateFunc) (EAPMethod *method, GError **error);
-
-struct _EAPMethod {
- guint32 refcount;
- gsize obj_size;
-
- GtkBuilder *builder;
- GtkWidget *ui_widget;
-
- const char *default_field;
-
- gboolean phase2;
- gboolean secrets_only;
-
- EMAddToSizeGroupFunc add_to_size_group;
- EMFillConnectionFunc fill_connection;
- EMUpdateSecretsFunc update_secrets;
- EMValidateFunc validate;
- EMDestroyFunc destroy;
-};
-
-#define EAP_METHOD(x) ((EAPMethod *) x)
-
-
-GtkWidget *eap_method_get_widget (EAPMethod *method);
-
-gboolean eap_method_validate (EAPMethod *method, GError **error);
-
-void eap_method_add_to_size_group (EAPMethod *method, GtkSizeGroup *group);
-
-void eap_method_fill_connection (EAPMethod *method,
- NMConnection *connection);
-
-void eap_method_update_secrets (EAPMethod *method, NMConnection *connection);
-
-EAPMethod *eap_method_ref (EAPMethod *method);
-
-void eap_method_unref (EAPMethod *method);
-
-GType eap_method_get_type (void);
-
-/* Below for internal use only */
-
-#include "nma-cert-chooser.h"
-#include "eap-method-tls.h"
-#include "eap-method-leap.h"
-#include "eap-method-fast.h"
-#include "eap-method-ttls.h"
-#include "eap-method-peap.h"
-#include "eap-method-simple.h"
-
-EAPMethod *eap_method_init (gsize obj_size,
- EMValidateFunc validate,
- EMAddToSizeGroupFunc add_to_size_group,
- EMFillConnectionFunc fill_connection,
- EMUpdateSecretsFunc update_secrets,
- EMDestroyFunc destroy,
- const char *ui_resource,
- const char *ui_widget_name,
- const char *default_field,
- gboolean phase2);
-
-void eap_method_phase2_update_secrets_helper (EAPMethod *method,
- NMConnection *connection,
- const char *combo_name,
- guint32 column);
-
-void eap_method_ca_cert_ignore_set (EAPMethod *method,
- NMConnection *connection,
- const char *filename,
- gboolean ca_cert_error);
-gboolean eap_method_ca_cert_ignore_get (EAPMethod *method, NMConnection *connection);
-
void eap_method_ca_cert_ignore_save (NMConnection *connection);
void eap_method_ca_cert_ignore_load (NMConnection *connection);
-GError *eap_method_ca_cert_validate_cb (NMACertChooser *cert_chooser, gpointer user_data);
-
-void eap_method_setup_cert_chooser (NMACertChooser *cert_chooser,
- NMSetting8021x *s_8021x,
- NMSetting8021xCKScheme (*cert_scheme_func) (NMSetting8021x *setting),
- const char *(*cert_path_func) (NMSetting8021x *setting),
- const char *(*cert_uri_func) (NMSetting8021x *setting),
- const char *(*cert_password_func) (NMSetting8021x *setting),
- NMSetting8021xCKScheme (*key_scheme_func) (NMSetting8021x *setting),
- const char *(*key_path_func) (NMSetting8021x *setting),
- const char *(*key_uri_func) (NMSetting8021x *setting),
- const char *(*key_password_func) (NMSetting8021x *setting));
-
#endif /* EAP_METHOD_H */
diff --git a/src/wireless-security/meson.build b/src/wireless-security/meson.build
index 288f341ea..36acf3b6e 100644
--- a/src/wireless-security/meson.build
+++ b/src/wireless-security/meson.build
@@ -2,41 +2,6 @@ wireless_security_inc = include_directories('.')
sources = files(
'eap-method.c',
- 'eap-method-fast.c',
- 'eap-method-leap.c',
- 'eap-method-peap.c',
- 'eap-method-simple.c',
- 'eap-method-tls.c',
- 'eap-method-ttls.c',
- 'helpers.c',
- 'wireless-security.c',
- 'ws-dynamic-wep.c',
- 'ws-leap.c',
- 'ws-sae.c',
- 'ws-wep-key.c',
- 'ws-wpa-eap.c',
- 'ws-wpa-psk.c'
-)
-
-resource_data = files(
- 'eap-method-fast.ui',
- 'eap-method-leap.ui',
- 'eap-method-peap.ui',
- 'eap-method-simple.ui',
- 'eap-method-tls.ui',
- 'eap-method-ttls.ui',
- 'ws-dynamic-wep.ui',
- 'ws-leap.ui',
- 'ws-sae.ui',
- 'ws-wep-key.ui',
- 'ws-wpa-eap.ui',
- 'ws-wpa-psk.ui'
-)
-
-sources += gnome.compile_resources(
- 'ws-resources',
- 'ws.gresource.xml',
- dependencies: resource_data
)
incs = [
@@ -48,8 +13,6 @@ incs = [
deps = [
gtk_dep,
libnm_dep,
- libnma_dep,
- libutils_libnm_dep
]
libwireless_security_libnm = static_library(
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
