Reference:https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-4.3p2-askpass-grab-info.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-5.1p1-askpass-progress.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-5.8p2-sigpipe.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-5.9p1-ipv6man.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-6.3p1-ctr-evp-fast.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-6.4p1-fromto-remote.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-6.6.1p1-log-in-chroot.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-6.6.1p1-scp-non-existing-directory.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-6.6.1p1-selinux-contexts.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-6.6p1-allow-ip-opts.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-6.6p1-force_krb.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-6.6p1-GSSAPIEnablek5users.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-6.6p1-keycat.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-6.6p1-keyperm.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-6.6p1-kuserok.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-6.6p1-privsep-selinux.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-6.7p1-coverity.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-6.7p1-sftp-force-permission.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-6.8p1-sshdT-output.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-7.1p2-audit-race-condition.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-7.2p2-k5login_directory.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-7.2p2-s390-closefrom.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-7.2p2-x11.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-7.3p1-x11-max-displays.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-7.4p1-systemd.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-7.5p1-sandbox.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-7.6p1-audit.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-7.6p1-cleanup-selinux.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-7.7p1-fips.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-7.7p1-gssapi-new-unique.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-7.7p1.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-7.8p1-role-mls.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-7.8p1-scp-ipv6.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-7.8p1-UsePAM-warning.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-8.0p1-crypto-policies.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-8.0p1-gssapi-keyex.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-8.0p1-keygen-strip-doseol.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-8.0p1-openssl-evp.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-8.0p1-openssl-kdf.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-8.0p1-pkcs11-uri.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-8.0p1-preserve-pam-errors.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-8.2p1-visibility.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-8.2p1-x11-without-ipv6.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/openssh-8.7p1-scp-kill-switch.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/pam_ssh_agent_auth-0.10.2-compat.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/pam_ssh_agent_auth-0.10.2-dereference.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/pam_ssh_agent_auth-0.10.3-seteuid.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/pam_ssh_agent_auth-0.9.2-visibility.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/pam_ssh_agent_auth-0.9.3-agent_structure.patch https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/pam_ssh_agent_auth-0.9.3-build.patch
85 lines
2.8 KiB
Diff
85 lines
2.8 KiB
Diff
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
|
|
Reference:https://src.fedoraproject.org/rpms/openssh/blob/rawhide/f/backport-openssh-5.1p1-askpass-progress.patch
|
|
@@ -53,6 +53,7 @@
|
|
#include <unistd.h>
|
|
|
|
#include <X11/Xlib.h>
|
|
+#include <glib.h>
|
|
#include <gtk/gtk.h>
|
|
#include <gdk/gdkx.h>
|
|
#include <gdk/gdkkeysyms.h>
|
|
@@ -81,14 +82,25 @@ ok_dialog(GtkWidget *entry, gpointer dia
|
|
return 1;
|
|
}
|
|
|
|
+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
|
|
passphrase_dialog(char *message, int prompt_type)
|
|
{
|
|
const char *failed;
|
|
char *passphrase, *local;
|
|
int result, grab_tries, grab_server, grab_pointer;
|
|
int buttons, default_response;
|
|
- GtkWidget *parent_window, *dialog, *entry;
|
|
+ GtkWidget *parent_window, *dialog, *entry, *progress, *hbox;
|
|
GdkGrabStatus status;
|
|
GdkColor fg, bg;
|
|
int fg_set = 0, bg_set = 0;
|
|
@@ -104,14 +116,19 @@ passphrase_dialog(char *message)
|
|
gtk_widget_modify_bg(dialog, GTK_STATE_NORMAL, &bg);
|
|
|
|
if (prompt_type == PROMPT_ENTRY || prompt_type == PROMPT_NONE) {
|
|
+ hbox = gtk_hbox_new(FALSE, 0);
|
|
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE,
|
|
+ FALSE, 0);
|
|
+ gtk_widget_show(hbox);
|
|
+
|
|
entry = gtk_entry_new();
|
|
if (fg_set)
|
|
gtk_widget_modify_fg(entry, GTK_STATE_NORMAL, &fg);
|
|
if (bg_set)
|
|
gtk_widget_modify_bg(entry, GTK_STATE_NORMAL, &bg);
|
|
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);
|
|
if (prompt_type == PROMPT_ENTRY) {
|
|
@@ -130,6 +145,22 @@ passphrase_dialog(char *message)
|
|
g_signal_connect(G_OBJECT(entry), "key_press_event",
|
|
G_CALLBACK(check_none), dialog);
|
|
}
|
|
+
|
|
+ hbox = gtk_hbox_new(FALSE, 0);
|
|
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),
|
|
+ hbox, FALSE, FALSE, 8);
|
|
+ gtk_widget_show(hbox);
|
|
+
|
|
+ progress = gtk_progress_bar_new();
|
|
+
|
|
+ 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);
|
|
+
|
|
}
|
|
|
|
/* Grab focus */
|