rpms/openssh
7
0
Fork 1
Code Issues Pull Requests Releases Activity
eb546ec1a7
openssh/openssh-5.1p1-askpass-progress.patch

79 lines
2.5 KiB
Diff
Raw Normal View History

rebase to openssh-7.4p1-1 * Drop unaccepted (unapplying) coverity patches * Drop server support for SSH1 (server) * Workaround #2641 for systemd * UseLogin is gone * Drop upstream commit 28652bca * Tighten seccomp filter (cache credentials before entering sandbox) (#1395288)
2017-01-02 14:42:13 +00:00
diff -up openssh-7.4p1/contrib/gnome-ssh-askpass2.c.progress openssh-7.4p1/contrib/gnome-ssh-askpass2.c
--- openssh-7.4p1/contrib/gnome-ssh-askpass2.c.progress 2016-12-19 05:59:41.000000000 +0100
+++ openssh-7.4p1/contrib/gnome-ssh-askpass2.c 2016-12-23 13:31:16.545211926 +0100
- drop x11-ssh-askpass from the package - drop old build_6x ifs from spec file - improve gnome-ssh-askpass so it doesn't reveal number of passphrase characters to person looking at the display - less hackish fix for the __USE_GNU problem
2005-11-22 16:48:57 +00:00
@@ -53,6 +53,7 @@
#include <string.h>
#include <unistd.h>
#include <X11/Xlib.h>
+#include <glib.h>
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
openssh-8.2p1-1 + 0.10.3-9
2020-02-17 10:57:13 +00:00
@@ -81,14 +82,25 @@ ok_dialog(GtkWidget *entry, gpointer dia
- drop x11-ssh-askpass from the package - drop old build_6x ifs from spec file - improve gnome-ssh-askpass so it doesn't reveal number of passphrase characters to person looking at the display - less hackish fix for the __USE_GNU problem
2005-11-22 16:48:57 +00:00
gtk_dialog_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
}
+static void
+move_progress(GtkWidget *entry, gpointer progress)
+{
+ gdouble step;
+ g_return_if_fail(GTK_IS_PROGRESS_BAR(progress));
+
+ step = g_random_double_range(0.03, 0.1);
+ gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(progress), step);
+ gtk_progress_bar_pulse(GTK_PROGRESS_BAR(progress));
+}
+
static int
openssh-8.2p1-1 + 0.10.3-9
2020-02-17 10:57:13 +00:00
passphrase_dialog(char *message, int prompt_type)
- drop x11-ssh-askpass from the package - drop old build_6x ifs from spec file - improve gnome-ssh-askpass so it doesn't reveal number of passphrase characters to person looking at the display - less hackish fix for the __USE_GNU problem
2005-11-22 16:48:57 +00:00
{
const char *failed;
char *passphrase, *local;
int result, grab_tries, grab_server, grab_pointer;
openssh-8.2p1-1 + 0.10.3-9
2020-02-17 10:57:13 +00:00
int buttons, default_response;
rebase to openssh-7.4p1-1 * Drop unaccepted (unapplying) coverity patches * Drop server support for SSH1 (server) * Workaround #2641 for systemd * UseLogin is gone * Drop upstream commit 28652bca * Tighten seccomp filter (cache credentials before entering sandbox) (#1395288)
2017-01-02 14:42:13 +00:00
- GtkWidget *parent_window, *dialog, *entry;
+ GtkWidget *parent_window, *dialog, *entry, *progress, *hbox;
- drop x11-ssh-askpass from the package - drop old build_6x ifs from spec file - improve gnome-ssh-askpass so it doesn't reveal number of passphrase characters to person looking at the display - less hackish fix for the __USE_GNU problem
2005-11-22 16:48:57 +00:00
GdkGrabStatus status;
grab_server = (getenv("GNOME_SSH_ASKPASS_GRAB_SERVER") != NULL);
openssh-8.2p1-1 + 0.10.3-9
2020-02-17 10:57:13 +00:00
@@ -104,16 +116,37 @@ passphrase_dialog(char *message)
gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE);
- drop x11-ssh-askpass from the package - drop old build_6x ifs from spec file - improve gnome-ssh-askpass so it doesn't reveal number of passphrase characters to person looking at the display - less hackish fix for the __USE_GNU problem
2005-11-22 16:48:57 +00:00
openssh-8.2p1-1 + 0.10.3-9
2020-02-17 10:57:13 +00:00
if (prompt_type == PROMPT_ENTRY) {
+ hbox = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE,
+ FALSE, 0);
+ gtk_widget_show(hbox);
- drop x11-ssh-askpass from the package - drop old build_6x ifs from spec file - improve gnome-ssh-askpass so it doesn't reveal number of passphrase characters to person looking at the display - less hackish fix for the __USE_GNU problem
2005-11-22 16:48:57 +00:00
+
openssh-8.2p1-1 + 0.10.3-9
2020-02-17 10:57:13 +00:00
entry = gtk_entry_new();
gtk_box_pack_start(
- GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
- entry, FALSE, FALSE, 0);
+ GTK_BOX(hbox), entry,
+ TRUE, FALSE, 0);
+ gtk_entry_set_width_chars(GTK_ENTRY(entry), 2);
gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
gtk_widget_grab_focus(entry);
gtk_widget_show(entry);
/* Make <enter> close dialog */
g_signal_connect(G_OBJECT(entry), "activate",
G_CALLBACK(ok_dialog), dialog);
+
+ hbox = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE,
- hopefully make the askpass dialog less confusing (#174765)
2005-12-20 14:44:46 +00:00
+ FALSE, 8);
openssh-8.2p1-1 + 0.10.3-9
2020-02-17 10:57:13 +00:00
+ gtk_widget_show(hbox);
- hopefully make the askpass dialog less confusing (#174765)
2005-12-20 14:44:46 +00:00
+
openssh-8.2p1-1 + 0.10.3-9
2020-02-17 10:57:13 +00:00
+ progress = gtk_progress_bar_new();
- drop x11-ssh-askpass from the package - drop old build_6x ifs from spec file - improve gnome-ssh-askpass so it doesn't reveal number of passphrase characters to person looking at the display - less hackish fix for the __USE_GNU problem
2005-11-22 16:48:57 +00:00
+
openssh-8.2p1-1 + 0.10.3-9
2020-02-17 10:57:13 +00:00
+ gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), "Passphrase length hidden intentionally");
+ gtk_box_pack_start(GTK_BOX(hbox), progress, TRUE,
+ TRUE, 5);
+ gtk_widget_show(progress);
+ g_signal_connect(G_OBJECT(entry), "changed",
+ G_CALLBACK(move_progress), progress);
+
}
- drop x11-ssh-askpass from the package - drop old build_6x ifs from spec file - improve gnome-ssh-askpass so it doesn't reveal number of passphrase characters to person looking at the display - less hackish fix for the __USE_GNU problem
2005-11-22 16:48:57 +00:00
openssh-8.2p1-1 + 0.10.3-9
2020-02-17 10:57:13 +00:00
/* Grab focus */
Reference in New Issue Copy Permalink