diff --git a/vpn-daemons/openvpn/ChangeLog b/vpn-daemons/openvpn/ChangeLog index cdece36093..11e5b596af 100644 --- a/vpn-daemons/openvpn/ChangeLog +++ b/vpn-daemons/openvpn/ChangeLog @@ -1,3 +1,21 @@ +2008-09-30 Dan Williams + + * properties/nm-openvpn-dialog.glade + - Fix the User and CA certificate entries in Password TLS mode, they + were swapped with their labels (rh #464765) + - Move private key password entries below private key chooser + - Rename "Certificate Password" to "Private key password" since that's + what they actually are + + * properties/auth-helpers.c + - (fill_password): s/cert_password/priv_key_password/s + - (fill_vpn_passwords): fix up for corrected widget names; fix mis-filling + of pw_tls secret widgets where passwords were reversed + - (auth_widget_save_secrets): fix up for corrected widget names + + * src/nm-openvpn-service.c + - s/certpass/priv_key_pass/s becuase that's what it is + 2008-09-29 Dan Williams Patch from Robert Buchholz diff --git a/vpn-daemons/openvpn/properties/auth-helpers.c b/vpn-daemons/openvpn/properties/auth-helpers.c index fbb30affcd..47bf88073f 100644 --- a/vpn-daemons/openvpn/properties/auth-helpers.c +++ b/vpn-daemons/openvpn/properties/auth-helpers.c @@ -51,7 +51,7 @@ static GtkWidget * fill_password (GladeXML *xml, const char *widget_name, NMConnection *connection, - gboolean cert_password) + gboolean priv_key_password) { GtkWidget *widget; GtkWidget *show_passwords; @@ -76,7 +76,7 @@ fill_password (GladeXML *xml, const char *tmp; tmp = g_hash_table_lookup (s_vpn->secrets, - cert_password ? NM_OPENVPN_KEY_CERTPASS : NM_OPENVPN_KEY_PASSWORD); + priv_key_password ? NM_OPENVPN_KEY_CERTPASS : NM_OPENVPN_KEY_PASSWORD); if (tmp) password = gnome_keyring_memory_strdup (tmp); } @@ -86,7 +86,7 @@ fill_password (GladeXML *xml, s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION)); password = keyring_helpers_lookup_secret (s_con->uuid, - cert_password ? NM_OPENVPN_KEY_CERTPASS : NM_OPENVPN_KEY_PASSWORD, + priv_key_password ? NM_OPENVPN_KEY_CERTPASS : NM_OPENVPN_KEY_PASSWORD, &unused); } @@ -109,15 +109,15 @@ fill_vpn_passwords (GladeXML *xml, GtkWidget *w = NULL; if (!strcmp (contype, NM_OPENVPN_CONTYPE_TLS)) - w = fill_password (xml, "tls_cert_password_entry", connection, TRUE); + w = fill_password (xml, "tls_private_key_password_entry", connection, TRUE); else if (!strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD)) w = fill_password (xml, "pw_password_entry", connection, FALSE); else if (!strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) { GtkWidget *w2 = NULL; - w = fill_password (xml, "pw_tls_password_entry", connection, TRUE); + w = fill_password (xml, "pw_tls_password_entry", connection, FALSE); - w2 = fill_password (xml, "pw_tls_cert_password_entry", connection, FALSE); + w2 = fill_password (xml, "pw_tls_private_key_password_entry", connection, TRUE); if (w2) { gtk_size_group_add_widget (group, w2); g_signal_connect (w2, "changed", G_CALLBACK (changed_cb), user_data); @@ -558,12 +558,12 @@ auth_widget_save_secrets (GladeXML *xml, gboolean ret; if (!strcmp (contype, NM_OPENVPN_CONTYPE_TLS)) - ret = save_secret (xml, "tls_cert_password_entry", uuid, name, NM_OPENVPN_KEY_CERTPASS); + ret = save_secret (xml, "tls_private_key_password_entry", uuid, name, NM_OPENVPN_KEY_CERTPASS); else if (!strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD)) ret = save_secret (xml, "pw_password_entry", uuid, name, NM_OPENVPN_KEY_PASSWORD); else if (!strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) { ret = save_secret (xml, "pw_tls_password_entry", uuid, name, NM_OPENVPN_KEY_PASSWORD); - ret = save_secret (xml, "pw_tls_cert_password_entry", uuid, name, NM_OPENVPN_KEY_CERTPASS); + ret = save_secret (xml, "pw_tls_private_key_password_entry", uuid, name, NM_OPENVPN_KEY_CERTPASS); } else if (!strcmp (contype, NM_OPENVPN_CONTYPE_STATIC_KEY)) /* No secrets here */ ret = TRUE; diff --git a/vpn-daemons/openvpn/properties/nm-openvpn-dialog.glade b/vpn-daemons/openvpn/properties/nm-openvpn-dialog.glade index 971a3e364f..80c0ba44e2 100644 --- a/vpn-daemons/openvpn/properties/nm-openvpn-dialog.glade +++ b/vpn-daemons/openvpn/properties/nm-openvpn-dialog.glade @@ -1,2033 +1,1134 @@ - - - + + + - - - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - 12 - True - False - 16 - - - - True - False - 6 - - - - True - <b>General</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - 1 - 2 - False - 6 - 6 - - - - True - 1 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - True - True - True - 0 - - True - False - - - - - 1 - 2 - 0 - 1 - - - - - - - True - _Gateway: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - gateway_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - - - - - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - <b>Authentication</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - 3 - 2 - False - 6 - 6 - - - - True - 1 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - - False - True - - - - - 1 - 2 - 0 - 1 - - - - - - True - Type: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - - - - - - - - True - False - False - GTK_POS_TOP - False - False - - - - True - 4 - 2 - False - 6 - 6 - - - - True - 1 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - Select A File - GTK_FILE_CHOOSER_ACTION_OPEN - True - False - False - -1 - - - - - 1 - 2 - 0 - 1 - - - - - - - True - User Certificate: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - - - - - - - True - Private Key: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - - - - - - - True - CA Certificate: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - - - - - - - True - 1 - 0.5 - 0.019999999553 - 1 - 0 - 0 - 0 - 0 - - - - True - Select A File - GTK_FILE_CHOOSER_ACTION_OPEN - True - False - False - -1 - - - - - 1 - 2 - 3 - 4 - - - - - - - True - 1 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - Select A File - GTK_FILE_CHOOSER_ACTION_OPEN - True - False - False - -1 - - - - - 1 - 2 - 2 - 3 - - - - - - - True - Certificate Password: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - - - - - - - True - 1 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - True - True - False - 0 - - True - False - - - - - 1 - 2 - 1 - 2 - - - - - - False - True - - - - - - True - page 1 - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - 3 - 2 - False - 6 - 6 - - - - True - 1 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - True - True - True - 0 - - True - False - - - - - 1 - 2 - 0 - 1 - - - - - - - True - User name: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - - - - - - - True - CA Certificate: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - Password: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - 1 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - Select A File - GTK_FILE_CHOOSER_ACTION_OPEN - True - False - False - -1 - - - - - 1 - 2 - 2 - 3 - - - - - - - True - 1 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - True - True - False - 0 - - True - False - - - - - 1 - 2 - 1 - 2 - - - - - - False - True - - - - - - True - page 2 - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - 6 - 2 - False - 6 - 6 - - - - True - 1 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - True - True - True - 0 - - True - False - - - - - 1 - 2 - 0 - 1 - - - - - - - True - User name: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - - - - - - - True - User Certificate: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - - - - - - - True - CA Certificate: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - - - - - - - True - 1 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - Select A File - GTK_FILE_CHOOSER_ACTION_OPEN - True - False - False - -1 - - - - - 1 - 2 - 3 - 4 - - - - - - - True - 1 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - Select A File - GTK_FILE_CHOOSER_ACTION_OPEN - True - False - False - -1 - - - - - 1 - 2 - 2 - 3 - - - - - - - True - 1 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - True - True - False - 0 - - True - False - - - - - 1 - 2 - 1 - 2 - - - - - - - True - Private Key: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 5 - 6 - - - - - - - True - 1 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - Select A File - GTK_FILE_CHOOSER_ACTION_OPEN - True - False - False - -1 - - - - - 1 - 2 - 5 - 6 - - - - - - - True - Certificate Password: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 4 - 5 - - - - - - - True - 1 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - True - True - False - 0 - - True - False - - - - - 1 - 2 - 4 - 5 - - - - - - - True - Password: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - - - - - - False - True - - - - - - True - page 3 - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - 4 - 2 - False - 6 - 6 - - - - True - 1 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - <i>If key direction is used, it must be the opposite of that used on the VPN peer. For example, if the peer uses '1', this connection must use '0'. If you are unsure what value to use, contact your system administrator.</i> - False - True - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - - - 1 - 2 - 2 - 3 - - - - - - - True - 1 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - - False - True - - - - - 1 - 2 - 1 - 2 - - - - - - - True - 1 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - Select A File - GTK_FILE_CHOOSER_ACTION_OPEN - True - False - False - -1 - - - - - 1 - 2 - 0 - 1 - - - - - - - True - Static Key: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - - - - - - - True - Key Direction: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - - - - - - - True - Local IP Address: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - - - - - - True - 1 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - True - True - True - 0 - - True - False - - - - - 1 - 2 - 3 - 4 - - - - - - False - True - - - - - - True - page 4 - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - 0 - 2 - 1 - 2 - - - - - - True - True - Show passwords - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - 2 - 2 - 3 - fill - - - - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - 1 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - False - 6 - - - - True - gtk-preferences - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Ad_vanced... - True - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - GTK_PACK_END - - - - - - - - 5 - OpenVPN Advanced Options - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ON_PARENT - False - True - True - stock-preferences - True - False - True - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - False - - - - True - False - 2 - - - - True - GTK_BUTTONBOX_END - - - - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - True - True - True - GTK_POS_TOP - False - False - - - - 12 - True - False - 6 - - - - True - False - 6 - - - - True - True - Use custom gateway p_ort: - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - True - - - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1194 1 65535 1 10 10 - - - 0 - False - False - - - - - 0 - False - True - - - - - - True - True - Use L_ZO data compression - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - True - - - - - - True - True - Use a _TCP connection - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - True - - - - - - True - True - Use a TA_P device - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - True - - - - - False - True - - - - - - True - General - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 12 - True - 3 - 2 - False - 6 - 12 - - - - True - 3 - 2 - False - 6 - 12 - - - - True - Key File: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - - - - - - True - - False - True - - - 1 - 2 - 1 - 2 - - - - - - True - Select A File - GTK_FILE_CHOOSER_ACTION_OPEN - True - False - False - -1 - - - 1 - 2 - 0 - 1 - - - - - - True - 1 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - <i>If key direction is used, it must be the opposite of that used on the VPN peer. For example, if the peer uses '1', this connection must use '0'. If you are unsure what value to use, contact your system administrator.</i> - False - True - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - - - 1 - 2 - 2 - 3 - - - - - - - True - Key Direction: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - - - - - 1 - 2 - 2 - 3 - - - - - - True - True - Use additional TLS authentication - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - 2 - 1 - 2 - - - - - - True - Cipher: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - - - - - - - True - - False - True - - - 1 - 2 - 0 - 1 - - - - - - False - True - - - - - - True - Certificates (TLS) - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - 0 - False - False - - - - - - + + window1 + + + True + 12 + 16 + + + True + 6 + + + True + 0 + <b>General</b> + True + + + False + False + + + + + True + 12 + + + True + 1 + 2 + 6 + 6 + + + True + 1 + 0 + + + True + True + + + + + 1 + 2 + + + + + + True + 0 + _Gateway: + True + gateway_entry + + + + + + + + + + + 1 + + + + + False + + + + + True + 6 + + + True + 0 + <b>Authentication</b> + True + + + False + False + + + + + True + 12 + + + True + 3 + 2 + 6 + 6 + + + True + 1 + 0 + + + True + + + + + + 1 + 2 + + + + + True + 0 + Type: + + + + + + + + + True + False + False + + + True + 4 + 2 + 6 + 6 + + + True + 1 + 0 + + + True + + + + + 1 + 2 + + + + + + True + 0 + User Certificate: + + + + + + + + True + 0 + CA Certificate: + + + 1 + 2 + + + + + + True + 1 + 0 + + + True + + + + + 1 + 2 + 1 + 2 + + + + + + True + 0 + Private Key: + + + 2 + 3 + + + + + + True + 1 + 0.019999999552965164 + + + True + + + + + 1 + 2 + 2 + 3 + + + + + + True + 0 + Private Key Password: + + + 3 + 4 + + + + + + True + 1 + 0 + + + True + True + False + + + + + 1 + 2 + 3 + 4 + + + + + + + + True + page 1 + + + tab + False + + + + + True + 3 + 2 + 6 + 6 + + + True + 1 + 0 + + + True + True + + + + + 1 + 2 + + + + + + True + 0 + User name: + + + + + + + + True + 0 + CA Certificate: + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + Password: + + + 1 + 2 + GTK_FILL + + + + + + True + 1 + 0 + + + True + + + + + 1 + 2 + 2 + 3 + + + + + + True + 1 + 0 + + + True + True + False + + + + + 1 + 2 + 1 + 2 + + + + + + 1 + + + + + True + page 2 + + + tab + 1 + False + + + + + True + 6 + 2 + 6 + 6 + + + True + 1 + 0 + + + True + True + + + + + 1 + 2 + + + + + + True + 0 + User name: + + + + + + + + True + 0 + CA Certificate: + + + 3 + 4 + + + + + + True + 0 + User Certificate: + + + 2 + 3 + + + + + + True + 1 + 0 + + + True + + + + + 1 + 2 + 3 + 4 + + + + + + True + 1 + 0 + + + True + + + + + 1 + 2 + 2 + 3 + + + + + + True + 1 + 0 + + + True + True + False + + + + + 1 + 2 + 1 + 2 + + + + + + True + 0 + Password: + + + 1 + 2 + + + + + + True + 0 + Private Key: + + + 4 + 5 + + + + + + True + 1 + 0 + + + True + + + + + 1 + 2 + 4 + 5 + + + + + + True + 0 + Private Key Password: + + + 5 + 6 + + + + + + True + 1 + 0 + + + True + True + False + + + + + 1 + 2 + 5 + 6 + + + + + + 2 + + + + + True + page 3 + + + tab + 2 + False + + + + + True + 4 + 2 + 6 + 6 + + + + + + True + 1 + 0 + + + True + 0 + <i>If key direction is used, it must be the opposite of that used on the VPN peer. For example, if the peer uses '1', this connection must use '0'. If you are unsure what value to use, contact your system administrator.</i> + True + True + + + + + 1 + 2 + 2 + 3 + + + + + + True + 1 + 0 + + + True + + + + + + 1 + 2 + 1 + 2 + + + + + + True + 1 + 0 + + + True + + + + + 1 + 2 + + + + + + True + 0 + Static Key: + + + + + + + + True + 0 + Key Direction: + + + 1 + 2 + + + + + + True + Local IP Address: + + + 3 + 4 + + + + + True + 1 + 0 + + + True + True + + + + + 1 + 2 + 3 + 4 + + + + + + 3 + + + + + True + page 4 + + + tab + 3 + False + + + + + 2 + 1 + 2 + + + + + True + True + Show passwords + True + 0 + True + + + 2 + 2 + 3 + GTK_FILL + + + + + + + + 1 + + + + + False + False + 1 + + + + + True + 1 + 0 + + + True + True + 0 + + + True + 6 + + + True + gtk-preferences + + + False + False + + + + + True + Ad_vanced... + True + True + + + False + False + 1 + + + + + + + + + False + False + GTK_PACK_END + 2 + + + + + + + 5 + OpenVPN Advanced Options + GTK_WIN_POS_CENTER_ON_PARENT + True + stock-preferences + GDK_WINDOW_TYPE_HINT_DIALOG + True + False + + + True + 2 + + + True + True + + + True + 12 + 6 + + + True + 6 + + + True + True + Use custom gateway p_ort: + True + 0 + True + + + False + + + + + True + True + 1194 1 65535 1 10 10 + 1 + True + + + False + False + 1 + + + + + False + + + + + True + True + Use L_ZO data compression + True + 0 + True + + + False + 1 + + + + + True + True + Use a _TCP connection + True + 0 + True + + + False + 2 + + + + + True + True + Use a TA_P device + True + 0 + True + + + False + 3 + + + + + + + True + General + + + tab + False + + + + + True + 12 + 3 + 2 + 12 + 6 + + + + + + True + 3 + 2 + 12 + 6 + + + + + + True + 0 + Key File: + + + + + True + + + + 1 + 2 + 1 + 2 + + + + + True + + + 1 + 2 + + + + + True + 1 + 0 + + + True + 0 + <i>If key direction is used, it must be the opposite of that used on the VPN peer. For example, if the peer uses '1', this connection must use '0'. If you are unsure what value to use, contact your system administrator.</i> + True + True + + + + + 1 + 2 + 2 + 3 + + + + + + True + 0 + Key Direction: + + + 1 + 2 + + + + + 1 + 2 + 2 + 3 + + + + + True + True + Use additional TLS authentication + True + 0 + True + + + 2 + 1 + 2 + + + + + True + 0 + Cipher: + + + + + + + + True + + + + 1 + 2 + + + + + + 1 + + + + + True + Certificates (TLS) + + + tab + 1 + False + + + + + False + False + 1 + + + + + True + GTK_BUTTONBOX_END + + + True + True + gtk-cancel + True + -6 + + + + + True + True + gtk-ok + True + -5 + + + 1 + + + + + False + GTK_PACK_END + + + + + diff --git a/vpn-daemons/openvpn/src/nm-openvpn-service.c b/vpn-daemons/openvpn/src/nm-openvpn-service.c index e65e2775e9..977a2191a8 100644 --- a/vpn-daemons/openvpn/src/nm-openvpn-service.c +++ b/vpn-daemons/openvpn/src/nm-openvpn-service.c @@ -62,7 +62,7 @@ G_DEFINE_TYPE (NMOpenvpnPlugin, nm_openvpn_plugin, NM_TYPE_VPN_PLUGIN) typedef struct { char *username; char *password; - char *certpass; + char *priv_key_pass; GIOChannel *socket_channel; guint socket_channel_eventid; } NMOpenvpnPluginIOData; @@ -298,11 +298,11 @@ handle_management_socket (NMVPNPlugin *plugin, } else nm_warning ("Auth requested but one of username or password is missing"); } else if (!strcmp (auth, "Private Key")) { - if (io_data->certpass) { + if (io_data->priv_key_pass) { char *qpass; /* Quote strings passed back to openvpn */ - qpass = ovpn_quote_string (io_data->certpass); + qpass = ovpn_quote_string (io_data->priv_key_pass); buf = g_strdup_printf ("password \"%s\" \"%s\"\n", auth, qpass); memset (qpass, 0, strlen (qpass)); g_free (qpass); @@ -312,7 +312,7 @@ handle_management_socket (NMVPNPlugin *plugin, g_io_channel_flush (source, NULL); g_free (buf); } else - nm_warning ("Certificate password requested but certpass == NULL"); + nm_warning ("Certificate password requested but private key password == NULL"); } else { nm_warning ("No clue what to send for username/password request for '%s'", auth); if (out_failure) @@ -815,7 +815,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, io_data->password = tmp ? g_strdup (tmp) : NULL; tmp = g_hash_table_lookup (secrets, NM_OPENVPN_KEY_CERTPASS); - io_data->certpass = tmp ? g_strdup (tmp) : NULL; + io_data->priv_key_pass = tmp ? g_strdup (tmp) : NULL; priv->io_data = io_data; @@ -904,7 +904,7 @@ real_need_secrets (NMVPNPlugin *plugin, connection_type = get_connection_type (s_vpn->data); if (!strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) { - /* Will require a password and maybe certificate password */ + /* Will require a password and maybe private key password */ if (!g_hash_table_lookup (s_vpn->secrets, NM_OPENVPN_KEY_CERTPASS)) need_secrets = TRUE; @@ -915,7 +915,7 @@ real_need_secrets (NMVPNPlugin *plugin, if (!g_hash_table_lookup (s_vpn->secrets, NM_OPENVPN_KEY_PASSWORD)) need_secrets = TRUE; } else if (!strcmp (connection_type, NM_OPENVPN_CONTYPE_TLS)) { - /* May require certificate password */ + /* May require private key password */ if (!g_hash_table_lookup (s_vpn->secrets, NM_OPENVPN_KEY_CERTPASS)) need_secrets = TRUE; }