aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/Makefile7
-rw-r--r--contrib/README8
-rw-r--r--contrib/cygwin/ssh-user-config3
-rw-r--r--contrib/gnome-ssh-askpass4.c249
-rw-r--r--contrib/redhat/openssh.spec17
-rwxr-xr-xcontrib/redhat/sshd.init2
-rw-r--r--contrib/ssh-copy-id15
-rw-r--r--contrib/suse/openssh.spec3
8 files changed, 276 insertions, 28 deletions
diff --git a/contrib/Makefile b/contrib/Makefile
index 45d878bdcf22..1482783a8097 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -1,7 +1,7 @@
PKG_CONFIG = pkg-config
all:
- @echo "Valid targets: gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssk-askpass3"
+ @echo "Valid targets: gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssk-askpass3 gnome-ssh-askpass4"
gnome-ssh-askpass1: gnome-ssh-askpass1.c
$(CC) $(CFLAGS) `gnome-config --cflags gnome gnomeui` \
@@ -18,5 +18,10 @@ gnome-ssh-askpass3: gnome-ssh-askpass3.c
gnome-ssh-askpass3.c -o gnome-ssh-askpass3 \
`$(PKG_CONFIG) --libs gtk+-3.0 x11`
+gnome-ssh-askpass4: gnome-ssh-askpass4.c
+ $(CC) $(CFLAGS) `$(PKG_CONFIG) --cflags gcr-4 gio-2.0` \
+ gnome-ssh-askpass4.c -o gnome-ssh-askpass4 \
+ `$(PKG_CONFIG) --libs gcr-4 gio-2.0`
+
clean:
rm -f *.o gnome-ssh-askpass gnome-ssh-askpass[123]
diff --git a/contrib/README b/contrib/README
index 60e19ba9faa8..614152a123aa 100644
--- a/contrib/README
+++ b/contrib/README
@@ -30,10 +30,12 @@ ssh-copy-id:
Phil Hands' <phil@hands.com> shell script to automate the process of adding
your public key to a remote machine's ~/.ssh/authorized_keys file.
-gnome-ssh-askpass[12]:
+gnome-ssh-askpass[1234]:
-A GNOME and Gtk2 passphrase requesters. Use "make gnome-ssh-askpass1" or
-"make gnome-ssh-askpass2" to build.
+Graphical passhrase requesters. Use "make gnome-ssh-askpass1" to build
+a variant for ancient GNOME desktop, "make gnome-ssh-askpass2"
+for a GTK 2-based one, "make gnome-ssh-askpass3" for a GTK 3-based one,
+or "make gnome-ssh-askpass4" for a version for modern GNOME.
sshd.pam.generic:
diff --git a/contrib/cygwin/ssh-user-config b/contrib/cygwin/ssh-user-config
index 3858722f646d..35802d06ecba 100644
--- a/contrib/cygwin/ssh-user-config
+++ b/contrib/cygwin/ssh-user-config
@@ -246,9 +246,8 @@ done
check_user_homedir
check_user_dot_ssh_dir
create_identity id_rsa rsa "SSH2 RSA"
-create_identity id_dsa dsa "SSH2 DSA"
+create_identity id_ed25519 ed25519 "SSH2 Ed25519"
create_identity id_ecdsa ecdsa "SSH2 ECDSA"
-create_identity identity rsa1 "(deprecated) SSH1 RSA"
fix_authorized_keys_perms
echo
diff --git a/contrib/gnome-ssh-askpass4.c b/contrib/gnome-ssh-askpass4.c
new file mode 100644
index 000000000000..182bce0cc63b
--- /dev/null
+++ b/contrib/gnome-ssh-askpass4.c
@@ -0,0 +1,249 @@
+/*
+ * Copyright (c) 2000-2002 Damien Miller. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* GCR support by Jan Tojnar <jtojnar@gmail.com> */
+
+/*
+ * This is a simple SSH passphrase grabber for GNOME. To use it, set the
+ * environment variable SSH_ASKPASS to point to the location of
+ * gnome-ssh-askpass before calling "ssh-add < /dev/null".
+ */
+
+/*
+ * Known problems:
+ * - This depends on unstable libgcr features
+ * - long key fingerprints may be truncted:
+ * https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6781
+ */
+
+/*
+ * Compile with:
+ *
+ * cc -Wall `pkg-config --cflags gcr-4 gio-2.0` \
+ * gnome-ssh-askpass4.c -o gnome-ssh-askpass \
+ * `pkg-config --libs gcr-4 gio-2.0`
+ *
+ */
+
+#include <stdio.h>
+#include <err.h>
+
+#include <gio/gio.h>
+
+#define GCR_API_SUBJECT_TO_CHANGE 1
+#include <gcr/gcr.h>
+
+typedef enum _PromptType {
+ PROMPT_ENTRY,
+ PROMPT_CONFIRM,
+ PROMPT_NONE,
+} PromptType;
+
+typedef struct _PromptState {
+ GApplication *app;
+ char* message;
+ PromptType type;
+ int exit_status;
+} PromptState;
+
+static PromptState *
+prompt_state_new(GApplication *app, char* message, PromptType type)
+{
+ PromptState *state = g_malloc(sizeof(PromptState));
+ state->app = g_object_ref(app);
+ state->message = g_strdup(message);
+ state->type = type;
+ state->exit_status = -1;
+ return state;
+}
+
+static void
+prompt_state_free(PromptState *state)
+{
+ g_clear_object(&state->app);
+ g_free(state->message);
+ g_free(state);
+}
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(PromptState, prompt_state_free)
+
+static void
+prompt_password_done(GObject *source_object, GAsyncResult *res,
+ gpointer user_data)
+{
+ GcrPrompt *prompt = GCR_PROMPT(source_object);
+ PromptState *state = user_data;
+ g_autoptr(GError) error = NULL;
+
+ /*
+ * “The returned password is valid until the next time a method
+ * is called to display another prompt.”
+ */
+ const char *pw = gcr_prompt_password_finish(prompt, res, &error);
+
+ if ((!pw && !error) || (error && error->code == G_IO_ERROR_CANCELLED)) {
+ /* Operation was cancelled or timed out. */
+ state->exit_status = -1;
+ } else if (error) {
+ warnx("Failed to prompt for ssh-askpass: %s", error->message);
+ state->exit_status = 1;
+ } else {
+ /* Report passphrase if user selected Continue. */
+ g_autofree char *local = g_locale_from_utf8(pw, strlen(pw),
+ NULL, NULL, NULL);
+
+ if (local != NULL) {
+ puts(local);
+ memset(local, '\0', strlen(local));
+ } else {
+ puts(pw);
+ }
+ state->exit_status = 0;
+ }
+
+ g_application_release(state->app);
+}
+
+static void
+prompt_confirm_done(GObject *source_object, GAsyncResult *res,
+ gpointer user_data)
+{
+ GcrPrompt *prompt = GCR_PROMPT(source_object);
+ PromptState *state = user_data;
+ g_autoptr(GError) error = NULL;
+
+ GcrPromptReply reply = gcr_prompt_confirm_finish(prompt, res, &error);
+ if (error) {
+ if (error->code == G_IO_ERROR_CANCELLED) {
+ /* Operation was cancelled or timed out. */
+ state->exit_status = -1;
+ } else {
+ state->exit_status = 1;
+ warnx("Failed to prompt for ssh-askpass: %s",
+ error->message);
+ }
+ } else if (reply == GCR_PROMPT_REPLY_CONTINUE ||
+ state->type == PROMPT_NONE) {
+ /*
+ * Since Gcr doesn’t yet support one button message
+ * boxes treat Cancel the same as Continue.
+ */
+ state->exit_status = 0;
+ } else {
+ /* GCR_PROMPT_REPLY_CANCEL */
+ state->exit_status = -1;
+ }
+
+ g_application_release(state->app);
+}
+
+static int
+command_line(GApplication* app, G_GNUC_UNUSED GApplicationCommandLine *cmdline,
+ gpointer user_data)
+{
+ PromptState *state = user_data;
+
+ /* Prevent app from exiting while waiting for the async callback. */
+ g_application_hold(app);
+
+ /* Wait indefinitely. */
+ int timeout_seconds = -1;
+ g_autoptr(GError) error = NULL;
+ GcrPrompt* prompt = gcr_system_prompt_open(timeout_seconds, NULL, &error);
+
+ if (!prompt) {
+ if (error->code == GCR_SYSTEM_PROMPT_IN_PROGRESS) {
+ /*
+ * This means the timeout elapsed, but no prompt
+ * was ever shown.
+ */
+ warnx("Timeout: the Gcr system prompter was "
+ "already in use.");
+ } else {
+ warnx("Couldn’t create prompt for ssh-askpass: %s",
+ error->message);
+ }
+
+ return 1;
+ }
+
+ gcr_prompt_set_message(prompt, "OpenSSH");
+ gcr_prompt_set_description(prompt, state->message);
+
+ /*
+ * XXX: Remove the Cancel button for PROMPT_NONE when GCR
+ * supports that.
+ */
+ if (state->type == PROMPT_ENTRY) {
+ gcr_prompt_password_async(prompt, NULL, prompt_password_done, state);
+ } else {
+ gcr_prompt_confirm_async(prompt, NULL, prompt_confirm_done, state);
+ }
+
+ /* The exit status will be changed in the async callbacks. */
+ return 1;
+}
+
+int
+main(int argc, char **argv)
+{
+ g_autoptr(GApplication) app = g_application_new(
+ "com.openssh.gnome-ssh-askpass4",
+ G_APPLICATION_HANDLES_COMMAND_LINE);
+ g_autofree char *message = NULL;
+
+ if (argc > 1) {
+ message = g_strjoinv(" ", argv + 1);
+ } else {
+ message = g_strdup("Enter your OpenSSH passphrase:");
+ }
+
+ const char *prompt_mode = getenv("SSH_ASKPASS_PROMPT");
+ PromptType type = PROMPT_ENTRY;
+ if (prompt_mode != NULL) {
+ if (strcasecmp(prompt_mode, "confirm") == 0) {
+ type = PROMPT_CONFIRM;
+ } else if (strcasecmp(prompt_mode, "none") == 0) {
+ type = PROMPT_NONE;
+ }
+ }
+
+ g_autoptr(PromptState) state = prompt_state_new(app, message, type);
+
+ g_signal_connect(app, "command-line", G_CALLBACK(command_line), state);
+
+ /*
+ * Since we are calling g_application_hold, we cannot use
+ * g_application_command_line_set_exit_status.
+ * To change the exit status returned by g_application_run:
+ * “If the commandline invocation results in the mainloop running
+ * (ie: because the use-count of the application increased to a
+ * non-zero value) then the application is considered to have been
+ * ‘successful’ in a certain sense, and the exit status is always
+ * zero.”
+ */
+ (void)(g_application_run(app, argc, argv));
+
+ return state->exit_status;
+}
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 74116b485135..a8fe2ecd0620 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
-%global ver 10.0p1
+%global ver 10.1p1
%global rel 1%{?dist}
# OpenSSH privilege separation requires a user & group ID
@@ -281,20 +281,6 @@ if [ "$1" != 0 -a -r /var/run/sshd.pid ] ; then
touch /var/run/sshd.restart
fi
-%triggerun server -- openssh-server < 2.5.0p1
-# Count the number of HostKey and HostDsaKey statements we have.
-gawk 'BEGIN {IGNORECASE=1}
- /^hostkey/ || /^hostdsakey/ {sawhostkey = sawhostkey + 1}
- END {exit sawhostkey}' /etc/ssh/sshd_config
-# And if we only found one, we know the client was relying on the old default
-# behavior, which loaded the the SSH2 DSA host key when HostDsaKey wasn't
-# specified. Now that HostKey is used for both SSH1 and SSH2 keys, specifying
-# one nullifies the default, which would have loaded both.
-if [ $? -eq 1 ] ; then
- echo HostKey /etc/ssh/ssh_host_rsa_key >> /etc/ssh/sshd_config
- echo HostKey /etc/ssh/ssh_host_dsa_key >> /etc/ssh/sshd_config
-fi
-
%triggerpostun server -- ssh-server
if [ "$1" != 0 ] ; then
/sbin/chkconfig --add sshd
@@ -367,6 +353,7 @@ fi
%defattr(-,root,root)
%dir %attr(0111,root,root) %{_var}/empty/sshd
%attr(0755,root,root) %{_sbindir}/sshd
+%attr(0755,root,root) %{_libexecdir}/openssh/sshd-auth
%attr(0755,root,root) %{_libexecdir}/openssh/sshd-session
%attr(0755,root,root) %{_libexecdir}/openssh/sftp-server
%attr(0644,root,root) %{_mandir}/man8/sshd.8*
diff --git a/contrib/redhat/sshd.init b/contrib/redhat/sshd.init
index 8ee5fcd3bb4f..b82545956ac8 100755
--- a/contrib/redhat/sshd.init
+++ b/contrib/redhat/sshd.init
@@ -41,7 +41,7 @@ start()
/usr/bin/ssh-keygen -A
if [ -x /sbin/restorecon ]; then
/sbin/restorecon /etc/ssh/ssh_host_rsa_key.pub
- /sbin/restorecon /etc/ssh/ssh_host_dsa_key.pub
+ /sbin/restorecon /etc/ssh/ssh_host_ed25519_key.pub
/sbin/restorecon /etc/ssh/ssh_host_ecdsa_key.pub
fi
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index dcf579843a74..afb9beca497d 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -1,12 +1,14 @@
#!/bin/sh
-# Copyright (c) 1999-2024 Philip Hands <phil@hands.com>
+# Copyright (c) 1999-2025 Philip Hands <phil@hands.com>
+# 2025 Denis Ovsienko <denis@ovsienko.info>
+# 2024 Frank Fischer <f.fischer@freifunk-nordhessen.de>
# 2021 Carlos Rodríguez Gili <carlos.rodriguez-gili@upc.edu>
# 2020 Matthias Blümel <blaimi@blaimi.de>
# 2017 Sebastien Boyron <seb@boyron.eu>
# 2013 Martin Kletzander <mkletzan@redhat.com>
# 2010 Adeodato =?iso-8859-1?Q?Sim=F3?= <asp16@alu.ua.es>
-# 2010 Eric Moret <eric.moret@gmail.com>
+# 2010 Eric Moret
# 2009 Xr <xr@i-jeuxvideo.com>
# 2007 Justin Pryzby <justinpryzby@users.sourceforge.net>
# 2004 Reini Urban <rurban@x-ray.at>
@@ -284,14 +286,17 @@ installkeys_sh() {
# the -z `tail ...` checks for a trailing newline. The echo adds one if was missing
# the cat adds the keys we're getting via STDIN
# and if available restorecon is used to restore the SELinux context
- # OpenWrt has a special case for root only.
- INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF
+ # OpenWrt has a special case for root/UID:0. Haiku is also special.
+ INSTALLKEYS_SH=$(tr -s '\t\n' ' ' <<-EOF
$SET_X
cd;
umask 077;
AUTH_KEY_FILE="${TARGET_PATH}";
- [ -f /etc/openwrt_release ] && [ "\$LOGNAME" = "root" ] &&
+ [ -f /etc/openwrt_release ] &&
+ { [ "\$LOGNAME" = "root" ] || [ "\$(id -u)" = "0" ]; } &&
AUTH_KEY_FILE=/etc/dropbear/authorized_keys;
+ [ "\`uname -s\`" = "Haiku" ] &&
+ AUTH_KEY_FILE=config/settings/ssh/authorized_keys;
AUTH_KEY_DIR=\`dirname "\${AUTH_KEY_FILE}"\`;
mkdir -p "\${AUTH_KEY_DIR}" &&
{ [ -z "\`tail -1c "\${AUTH_KEY_FILE}" 2>/dev/null\`" ] ||
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 849e9b61f3b8..63ea57064d10 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -13,7 +13,7 @@
Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation
Name: openssh
-Version: 10.0p1
+Version: 10.1p1
URL: https://www.openssh.com/
Release: 1
Source0: openssh-%{version}.tar.gz
@@ -211,6 +211,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(0755,root,root) %{_sbindir}/sshd
%attr(0755,root,root) %dir %{_libdir}/ssh
%attr(0755,root,root) %{_libdir}/ssh/sftp-server
+%attr(0755,root,root) %{_libdir}/ssh/sshd-auth
%attr(0755,root,root) %{_libdir}/ssh/sshd-session
%attr(4711,root,root) %{_libdir}/ssh/ssh-keysign
%attr(0755,root,root) %{_libdir}/ssh/ssh-pkcs11-helper
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-11 04:16:34 +0000