diff --git a/CVE-2016-0777_CVE-2016-0778.patch b/CVE-2016-0777_CVE-2016-0778.patch deleted file mode 100644 index ca2c704..0000000 --- a/CVE-2016-0777_CVE-2016-0778.patch +++ /dev/null @@ -1,34 +0,0 @@ -References: https://lists.mindrot.org/pipermail/openssh-unix-announce/2016-January/000124.html https://bugzilla.suse.com/show_bug.cgi?id=961645 https://bugzilla.suse.com/show_bug.cgi?id=961642 ---- readconf.c 30 Jul 2015 00:01:34 -0000 1.239 -+++ readconf.c 13 Jan 2016 23:17:23 -0000 -@@ -1648,7 +1648,7 @@ initialize_options(Options * options) - options->tun_remote = -1; - options->local_command = NULL; - options->permit_local_command = -1; -- options->use_roaming = -1; -+ options->use_roaming = 0; - options->visual_host_key = -1; - options->ip_qos_interactive = -1; - options->ip_qos_bulk = -1; -@@ -1819,8 +1819,7 @@ fill_default_options(Options * options) - options->tun_remote = SSH_TUNID_ANY; - if (options->permit_local_command == -1) - options->permit_local_command = 0; -- if (options->use_roaming == -1) -- options->use_roaming = 1; -+ options->use_roaming = 0; - if (options->visual_host_key == -1) - options->visual_host_key = 0; - if (options->ip_qos_interactive == -1) ---- ssh.c 30 Jul 2015 00:01:34 -0000 1.420 -+++ ssh.c 13 Jan 2016 23:17:23 -0000 -@@ -1882,9 +1882,6 @@ ssh_session2(void) - fork_postauth(); - } - -- if (options.use_roaming) -- request_roaming(); -- - return client_loop(tty_flag, tty_flag ? - options.escape_char : SSH_ESCAPECHAR_NONE, id); - } diff --git a/README.FIPS b/README.FIPS new file mode 100644 index 0000000..473a0f4 diff --git a/README.SUSE b/README.SUSE new file mode 100644 index 0000000..8a230ae --- /dev/null +++ b/README.SUSE @@ -0,0 +1,17 @@ +This is OpenSSH version 7.2p2 for SLE12 + +There are following changes in default settings of ssh client and server: + +* Accepting and sending of locale environment variables in protocol 2 is + enabled. + +* PAM authentication is enabled. + +* root authentiation with password is enabled by default (PermitRootLogin yes). + NOTE: this has security implications and is only done in order to not change + behaviour of the server in an update. We strongly suggest setting this option + either "prohibit-password" or even better to "no" (which disables direct + remote root login entirely). + +For more information on differences in SUSE OpenSSH package see README.FIPS + diff --git a/README.SuSE b/README.SuSE deleted file mode 100644 index 10b49da..0000000 --- a/README.SuSE +++ /dev/null @@ -1,15 +0,0 @@ -This is OpenSSH version 5.6p1. - -There are following changes in default settings of ssh client: - -* Accepting and sending of locale environment variables in protocol 2 is - enabled. - -* New host keys will be hashed to and them unusable for malicious people or - software trying to use known_hosts to find further hops. - -* Tunneled clear text passwords are disabled. - -* PAM authentication is enabled. - -* Only support for protocol 2 is enabled. diff --git a/cavs_driver-ssh.pl b/cavs_driver-ssh.pl new file mode 100644 index 0000000..4868415 --- /dev/null +++ b/cavs_driver-ssh.pl @@ -0,0 +1,184 @@ +#!/usr/bin/env perl +# +# CAVS test driver for OpenSSH +# +# Copyright (C) 2015, Stephan Mueller +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# NO WARRANTY +# +# BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +# FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +# OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +# PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +# OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +# TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +# PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +# REPAIR OR CORRECTION. +# +# IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +# WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +# REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +# INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +# OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +# TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +# YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +# PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGES. +# +use strict; +use warnings; +use IPC::Open2; + +# Executing a program by feeding STDIN and retrieving +# STDOUT +# $1: data string to be piped to the app on STDIN +# rest: program and args +# returns: STDOUT of program as string +sub pipe_through_program($@) { + my $in = shift; + my @args = @_; + + my ($CO, $CI); + my $pid = open2($CO, $CI, @args); + + my $out = ""; + my $len = length($in); + my $first = 1; + while (1) { + my $rin = ""; + my $win = ""; + # Output of prog is FD that we read + vec($rin,fileno($CO),1) = 1; + # Input of prog is FD that we write + # check for $first is needed because we can have NULL input + # that is to be written to the app + if ( $len > 0 || $first) { + (vec($win,fileno($CI),1) = 1); + $first=0; + } + # Let us wait for 100ms + my $nfound = select(my $rout=$rin, my $wout=$win, undef, 0.1); + if ( $wout ) { + my $written = syswrite($CI, $in, $len); + die "broken pipe" if !defined $written; + $len -= $written; + substr($in, 0, $written) = ""; + if ($len <= 0) { + close $CI or die "broken pipe: $!"; + } + } + if ( $rout ) { + my $tmp_out = ""; + my $bytes_read = sysread($CO, $tmp_out, 4096); + $out .= $tmp_out; + last if ($bytes_read == 0); + } + } + close $CO or die "broken pipe: $!"; + waitpid $pid, 0; + + return $out; +} + +# Parser of CAVS test vector file +# $1: Test vector file +# $2: Output file for test results +# return: nothing +sub parse($$) { + my $infile = shift; + my $outfile = shift; + + my $out = ""; + + my $K = ""; + my $H = ""; + my $session_id = ""; + my $ivlen = 0; + my $eklen = ""; + my $iklen = ""; + + open(IN, "<$infile"); + while() { + + my $line = $_; + chomp($line); + $line =~ s/\r//; + + if ($line =~ /\[SHA-1\]/) { + $iklen = 20; + } elsif ($line =~ /\[SHA-256\]/) { + $iklen = 32; + } elsif ($line =~ /\[SHA-384\]/) { + $iklen = 48; + } elsif ($line =~ /\[SHA-512\]/) { + $iklen = 64; + } elsif ($line =~ /^\[IV length\s*=\s*(.*)\]/) { + $ivlen = $1; + $ivlen = $ivlen / 8; + } elsif ($line =~ /^\[encryption key length\s*=\s*(.*)\]/) { + $eklen = $1; + $eklen = $eklen / 8; + } elsif ($line =~ /^K\s*=\s*(.*)/) { + $K = $1; + $K = substr($K, 8); + $K = "00" . $K; + } elsif ($line =~ /^H\s*=\s*(.*)/) { + $H = $1; + } elsif ($line =~ /^session_id\s*=\s*(.*)/) { + $session_id = $1; + } + $out .= $line . "\n"; + + if ($K ne "" && $H ne "" && $session_id ne "" && + $ivlen ne "" && $eklen ne "" && $iklen > 0) { + $out .= pipe_through_program("", "@LIBEXECDIR@/ssh/cavstest-kdf -H $H -K $K -s $session_id -i $ivlen -e $eklen -m $iklen"); + + $K = ""; + $H = ""; + $session_id = ""; + } + } + close IN; + $out =~ s/\n/\r\n/g; # make it a dos file + open(OUT, ">$outfile") or die "Cannot create output file $outfile: $?"; + print OUT $out; + close OUT; +} + +############################################################ +# +# let us pretend to be C :-) +sub main() { + + my $infile=$ARGV[0]; + die "Error: Test vector file $infile not found" if (! -f $infile); + + my $outfile = $infile; + # let us add .rsp regardless whether we could strip .req + $outfile =~ s/\.req$//; + $outfile .= ".rsp"; + if (-f $outfile) { + die "Output file $outfile could not be removed: $?" + unless unlink($outfile); + } + print STDERR "Performing tests from source file $infile with results stored in destination file $outfile\n"; + + # Do the job + parse($infile, $outfile); +} + +########################################### +# Call it +main(); +1; diff --git a/openssh-6.6p1-X_forward_with_disabled_ipv6.patch b/openssh-6.6p1-X_forward_with_disabled_ipv6.patch deleted file mode 100644 index b2c0b93..0000000 --- a/openssh-6.6p1-X_forward_with_disabled_ipv6.patch +++ /dev/null @@ -1,34 +0,0 @@ -# HG changeset patch -# Parent 1055b218140c3cc19228c47878a68740363d80dd -Do not throw away already open sockets for X11 forwarding if another socket -family is not available for bind() - -diff --git a/openssh-6.6p1/channels.c b/openssh-6.6p1/channels.c ---- a/openssh-6.6p1/channels.c -+++ b/openssh-6.6p1/channels.c -@@ -3476,22 +3476,24 @@ x11_create_display_inet(int x11_display_ - } - if (ai->ai_family == AF_INET6) - sock_set_v6only(sock); - if (x11_use_localhost) - channel_set_reuseaddr(sock); - if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) { - debug2("bind port %d: %.100s", port, strerror(errno)); - close(sock); -- -+ continue; -+ /* do not remove successfully opened sockets - for (n = 0; n < num_socks; n++) { - close(socks[n]); - } - num_socks = 0; - break; -+ */ - } - socks[num_socks++] = sock; - if (num_socks == NUM_SOCKS) - break; - } - freeaddrinfo(aitop); - if (num_socks > 0) - break; diff --git a/openssh-6.6p1-audit1-remove_duplicit_audit.patch b/openssh-6.6p1-audit1-remove_duplicit_audit.patch deleted file mode 100644 index 96d9c54..0000000 --- a/openssh-6.6p1-audit1-remove_duplicit_audit.patch +++ /dev/null @@ -1,33 +0,0 @@ -# Don't audit SSH_INVALID_USER twice. -# PRIVSEP(getpwnamallow()) a few lines above already did this. -# -# based on: -# https://bugzilla.mindrot.org/show_bug.cgi?id=1402 -# https://bugzilla.mindrot.org/attachment.cgi?id=2010 -# by jchadima@redhat.com -# -# PRIVSEP(getpwnamallow()) a few lines above already did this. - -diff --git a/openssh-6.6p1/auth2.c b/openssh-6.6p1/auth2.c ---- a/openssh-6.6p1/auth2.c -+++ b/openssh-6.6p1/auth2.c -@@ -236,19 +236,16 @@ input_userauth_request(int type, u_int32 - authctxt->pw = PRIVSEP(getpwnamallow(user)); - authctxt->user = xstrdup(user); - if (authctxt->pw && strcmp(service, "ssh-connection")==0) { - authctxt->valid = 1; - debug2("input_userauth_request: setting up authctxt for %s", user); - } else { - logit("input_userauth_request: invalid user %s", user); - authctxt->pw = fakepw(); --#ifdef SSH_AUDIT_EVENTS -- PRIVSEP(audit_event(SSH_INVALID_USER)); --#endif - } - #ifdef USE_PAM - if (options.use_pam) - PRIVSEP(start_pam(authctxt)); - #endif - setproctitle("%s%s", authctxt->valid ? user : "unknown", - use_privsep ? " [net]" : ""); - authctxt->service = xstrdup(service); diff --git a/openssh-6.6p1-audit2-better_audit_of_user_actions.patch b/openssh-6.6p1-audit2-better_audit_of_user_actions.patch deleted file mode 100644 index 656bbe3..0000000 --- a/openssh-6.6p1-audit2-better_audit_of_user_actions.patch +++ /dev/null @@ -1,867 +0,0 @@ -# extended auditing of user actions -# based on: -# https://bugzilla.mindrot.org/show_bug.cgi?id=1402 -# https://bugzilla.mindrot.org/attachment.cgi?id=2011 -# by jchadima@redhat.com - -diff --git a/openssh-6.6p1/audit-bsm.c b/openssh-6.6p1/audit-bsm.c ---- a/openssh-6.6p1/audit-bsm.c -+++ b/openssh-6.6p1/audit-bsm.c -@@ -370,20 +370,33 @@ audit_connection_from(const char *host, - /* this is used on IPv4-only machines */ - tid->port = (dev_t)port; - tid->machine = inet_addr(host); - snprintf(buf, sizeof(buf), "%08x", tid->machine); - debug3("BSM audit: machine ID %s", buf); - #endif - } - --void -+int - audit_run_command(const char *command) - { - /* not implemented */ -+ return 0; -+} -+ -+void -+audit_end_command(int handle, const char *command) -+{ -+ /* not implemented */ -+} -+ -+void -+audit_count_session_open(void) -+{ -+ /* not necessary */ - } - - void - audit_session_open(struct logininfo *li) - { - /* not implemented */ - } - -diff --git a/openssh-6.6p1/audit-linux.c b/openssh-6.6p1/audit-linux.c ---- a/openssh-6.6p1/audit-linux.c -+++ b/openssh-6.6p1/audit-linux.c -@@ -30,97 +30,210 @@ - #include "includes.h" - #if defined(USE_LINUX_AUDIT) - #include - #include - #include - - #include "log.h" - #include "audit.h" -+#include "key.h" -+#include "hostfile.h" -+#include "auth.h" -+#include "servconf.h" - #include "canohost.h" - -+extern ServerOptions options; -+extern Authctxt *the_authctxt; -+extern u_int utmp_len; - const char* audit_username(void); - --int --linux_audit_record_event(int uid, const char *username, -- const char *hostname, const char *ip, const char *ttyn, int success) -+static void -+linux_audit_user_logxxx(int uid, const char *username, -+ const char *hostname, const char *ip, const char *ttyn, int success, int event) - { - int audit_fd, rc, saved_errno; - - audit_fd = audit_open(); - if (audit_fd < 0) { - if (errno == EINVAL || errno == EPROTONOSUPPORT || - errno == EAFNOSUPPORT) -- return 1; /* No audit support in kernel */ -+ return; /* No audit support in kernel */ - else -- return 0; /* Must prevent login */ -+ goto fatal_report; /* Must prevent login */ - } -- rc = audit_log_acct_message(audit_fd, AUDIT_USER_LOGIN, -+ rc = audit_log_acct_message(audit_fd, event, - NULL, "login", username ? username : "(unknown)", - username == NULL ? uid : -1, hostname, ip, ttyn, success); - saved_errno = errno; - close(audit_fd); - /* - * Do not report error if the error is EPERM and sshd is run as non - * root user. - */ - if ((rc == -EPERM) && (geteuid() != 0)) - rc = 0; - errno = saved_errno; -- return (rc >= 0); -+ if (rc < 0) { -+fatal_report: -+ fatal("linux_audit_write_entry failed: %s", strerror(errno)); -+ } - } - -+static void -+linux_audit_user_auth(int uid, const char *username, -+ const char *hostname, const char *ip, const char *ttyn, int success, int event) -+{ -+ int audit_fd, rc, saved_errno; -+ static const char *event_name[] = { -+ "maxtries exceeded", -+ "root denied", -+ "success", -+ "none", -+ "password", -+ "challenge-response", -+ "pubkey", -+ "hostbased", -+ "gssapi", -+ "invalid user", -+ "nologin", -+ "connection closed", -+ "connection abandoned", -+ "unknown" -+ }; -+ -+ audit_fd = audit_open(); -+ if (audit_fd < 0) { -+ if (errno == EINVAL || errno == EPROTONOSUPPORT || -+ errno == EAFNOSUPPORT) -+ return; /* No audit support in kernel */ -+ else -+ goto fatal_report; /* Must prevent login */ -+ } -+ -+ if ((event < 0) || (event > SSH_AUDIT_UNKNOWN)) -+ event = SSH_AUDIT_UNKNOWN; -+ -+ rc = audit_log_acct_message(audit_fd, AUDIT_USER_AUTH, -+ NULL, event_name[event], username ? username : "(unknown)", -+ username == NULL ? uid : -1, hostname, ip, ttyn, success); -+ saved_errno = errno; -+ close(audit_fd); -+ /* -+ * Do not report error if the error is EPERM and sshd is run as non -+ * root user. -+ */ -+ if ((rc == -EPERM) && (geteuid() != 0)) -+ rc = 0; -+ errno = saved_errno; -+ if (rc < 0) { -+fatal_report: -+ fatal("linux_audit_write_entry failed: %s", strerror(errno)); -+ } -+} -+ -+static int user_login_count = 0; -+ - /* Below is the sshd audit API code */ - - void - audit_connection_from(const char *host, int port) - { -+ /* not implemented */ - } -- /* not implemented */ -+ -+int -+audit_run_command(const char *command) -+{ -+ if (!user_login_count++) -+ linux_audit_user_logxxx(the_authctxt->pw->pw_uid, NULL, get_remote_name_or_ip(utmp_len, options.use_dns), -+ NULL, "ssh", 1, AUDIT_USER_LOGIN); -+ linux_audit_user_logxxx(the_authctxt->pw->pw_uid, NULL, get_remote_name_or_ip(utmp_len, options.use_dns), -+ NULL, "ssh", 1, AUDIT_USER_START); -+ return 0; -+} - - void --audit_run_command(const char *command) -+audit_end_command(int handle, const char *command) - { -- /* not implemented */ -+ linux_audit_user_logxxx(the_authctxt->pw->pw_uid, NULL, get_remote_name_or_ip(utmp_len, options.use_dns), -+ NULL, "ssh", 1, AUDIT_USER_END); -+ if (user_login_count && !--user_login_count) -+ linux_audit_user_logxxx(the_authctxt->pw->pw_uid, NULL, get_remote_name_or_ip(utmp_len, options.use_dns), -+ NULL, "ssh", 1, AUDIT_USER_LOGOUT); -+} -+ -+void -+audit_count_session_open(void) -+{ -+ user_login_count++; - } - - void - audit_session_open(struct logininfo *li) - { -- if (linux_audit_record_event(li->uid, NULL, li->hostname, -- NULL, li->line, 1) == 0) -- fatal("linux_audit_write_entry failed: %s", strerror(errno)); -+ if (!user_login_count++) -+ linux_audit_user_logxxx(li->uid, NULL, li->hostname, -+ NULL, li->line, 1, AUDIT_USER_LOGIN); -+ linux_audit_user_logxxx(li->uid, NULL, li->hostname, -+ NULL, li->line, 1, AUDIT_USER_START); - } - - void - audit_session_close(struct logininfo *li) - { -- /* not implemented */ -+ linux_audit_user_logxxx(li->uid, NULL, li->hostname, -+ NULL, li->line, 1, AUDIT_USER_END); -+ if (user_login_count && !--user_login_count) -+ linux_audit_user_logxxx(li->uid, NULL, li->hostname, -+ NULL, li->line, 1, AUDIT_USER_LOGOUT); - } - - void - audit_event(ssh_audit_event_t event) - { - switch(event) { - case SSH_AUTH_SUCCESS: -- case SSH_CONNECTION_CLOSE: -- case SSH_NOLOGIN: -- case SSH_LOGIN_EXCEED_MAXTRIES: -- case SSH_LOGIN_ROOT_DENIED: -+ linux_audit_user_auth(-1, audit_username(), NULL, -+ get_remote_ipaddr(), "ssh", 1, event); - break; - -+ case SSH_NOLOGIN: -+ case SSH_LOGIN_ROOT_DENIED: -+ linux_audit_user_auth(-1, audit_username(), NULL, -+ get_remote_ipaddr(), "ssh", 0, event); -+ linux_audit_user_logxxx(-1, audit_username(), NULL, -+ get_remote_ipaddr(), "ssh", 0, AUDIT_USER_LOGIN); -+ break; -+ -+ case SSH_LOGIN_EXCEED_MAXTRIES: - case SSH_AUTH_FAIL_NONE: - case SSH_AUTH_FAIL_PASSWD: - case SSH_AUTH_FAIL_KBDINT: - case SSH_AUTH_FAIL_PUBKEY: - case SSH_AUTH_FAIL_HOSTBASED: - case SSH_AUTH_FAIL_GSSAPI: -+ linux_audit_user_auth(-1, audit_username(), NULL, -+ get_remote_ipaddr(), "ssh", 0, event); -+ break; -+ -+ case SSH_CONNECTION_CLOSE: -+ if (user_login_count) { -+ while (user_login_count--) -+ linux_audit_user_logxxx(the_authctxt->pw->pw_uid, NULL, get_remote_name_or_ip(utmp_len, options.use_dns), -+ NULL, "ssh", 1, AUDIT_USER_END); -+ linux_audit_user_logxxx(the_authctxt->pw->pw_uid, NULL, get_remote_name_or_ip(utmp_len, options.use_dns), -+ NULL, "ssh", 1, AUDIT_USER_LOGOUT); -+ } -+ break; -+ -+ case SSH_CONNECTION_ABANDON: - case SSH_INVALID_USER: -- linux_audit_record_event(-1, audit_username(), NULL, -- get_remote_ipaddr(), "sshd", 0); -+ linux_audit_user_logxxx(-1, audit_username(), NULL, -+ get_remote_ipaddr(), "ssh", 0, AUDIT_USER_LOGIN); - break; - - default: - debug("%s: unhandled event %d", __func__, event); - } - } - - #endif /* USE_LINUX_AUDIT */ -diff --git a/openssh-6.6p1/audit.c b/openssh-6.6p1/audit.c ---- a/openssh-6.6p1/audit.c -+++ b/openssh-6.6p1/audit.c -@@ -135,16 +135,27 @@ audit_connection_from(const char *host, - void - audit_event(ssh_audit_event_t event) - { - debug("audit event euid %d user %s event %d (%s)", geteuid(), - audit_username(), event, audit_event_lookup(event)); - } - - /* -+ * Called when a child process has called, or will soon call, -+ * audit_session_open. -+ */ -+void -+audit_count_session_open(void) -+{ -+ debug("audit count session open euid %d user %s", geteuid(), -+ audit_username()); -+} -+ -+/* - * Called when a user session is started. Argument is the tty allocated to - * the session, or NULL if no tty was allocated. - * - * Note that this may be called multiple times if multiple sessions are used - * within a single connection. - */ - void - audit_session_open(struct logininfo *li) -@@ -169,18 +180,34 @@ audit_session_close(struct logininfo *li - - debug("audit session close euid %d user %s tty name %s", geteuid(), - audit_username(), t); - } - - /* - * This will be called when a user runs a non-interactive command. Note that - * it may be called multiple times for a single connection since SSH2 allows -- * multiple sessions within a single connection. -+ * multiple sessions within a single connection. Returns a "handle" for -+ * audit_end_command. - */ --void -+int - audit_run_command(const char *command) - { - debug("audit run command euid %d user %s command '%.200s'", geteuid(), - audit_username(), command); -+ return 0; - } -+ -+/* -+ * This will be called when the non-interactive command finishes. Note that -+ * it may be called multiple times for a single connection since SSH2 allows -+ * multiple sessions within a single connection. "handle" should come from -+ * the corresponding audit_run_command. -+ */ -+void -+audit_end_command(int handle, const char *command) -+{ -+ debug("audit end nopty exec euid %d user %s command '%.200s'", geteuid(), -+ audit_username(), command); -+} -+ - # endif /* !defined CUSTOM_SSH_AUDIT_EVENTS */ - #endif /* SSH_AUDIT_EVENTS */ -diff --git a/openssh-6.6p1/audit.h b/openssh-6.6p1/audit.h ---- a/openssh-6.6p1/audit.h -+++ b/openssh-6.6p1/audit.h -@@ -44,14 +44,16 @@ enum ssh_audit_event_type { - SSH_CONNECTION_CLOSE, /* closed after attempting auth or session */ - SSH_CONNECTION_ABANDON, /* closed without completing auth */ - SSH_AUDIT_UNKNOWN - }; - typedef enum ssh_audit_event_type ssh_audit_event_t; - - void audit_connection_from(const char *, int); - void audit_event(ssh_audit_event_t); -+void audit_count_session_open(void); - void audit_session_open(struct logininfo *); - void audit_session_close(struct logininfo *); --void audit_run_command(const char *); -+int audit_run_command(const char *); -+void audit_end_command(int, const char *); - ssh_audit_event_t audit_classify_auth(const char *); - - #endif /* _SSH_AUDIT_H */ -diff --git a/openssh-6.6p1/monitor.c b/openssh-6.6p1/monitor.c ---- a/openssh-6.6p1/monitor.c -+++ b/openssh-6.6p1/monitor.c -@@ -175,16 +175,17 @@ int mm_answer_gss_setup_ctx(int, Buffer - int mm_answer_gss_accept_ctx(int, Buffer *); - int mm_answer_gss_userok(int, Buffer *); - int mm_answer_gss_checkmic(int, Buffer *); - #endif - - #ifdef SSH_AUDIT_EVENTS - int mm_answer_audit_event(int, Buffer *); - int mm_answer_audit_command(int, Buffer *); -+int mm_answer_audit_end_command(int, Buffer *); - #endif - - static int monitor_read_log(struct monitor *); - - static Authctxt *authctxt; - static BIGNUM *ssh1_challenge = NULL; /* used for ssh1 rsa auth */ - - /* local state for key verify */ -@@ -255,16 +256,17 @@ struct mon_table mon_dispatch_postauth20 - {MONITOR_REQ_MODULI, 0, mm_answer_moduli}, - {MONITOR_REQ_SIGN, 0, mm_answer_sign}, - {MONITOR_REQ_PTY, 0, mm_answer_pty}, - {MONITOR_REQ_PTYCLEANUP, 0, mm_answer_pty_cleanup}, - {MONITOR_REQ_TERM, 0, mm_answer_term}, - #ifdef SSH_AUDIT_EVENTS - {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event}, - {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT, mm_answer_audit_command}, -+ {MONITOR_REQ_AUDIT_END_COMMAND, MON_PERMIT, mm_answer_audit_end_command}, - #endif - {0, 0, NULL} - }; - - struct mon_table mon_dispatch_proto15[] = { - {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow}, - {MONITOR_REQ_SESSKEY, MON_ONCE, mm_answer_sesskey}, - {MONITOR_REQ_SESSID, MON_ONCE, mm_answer_sessid}, -@@ -297,16 +299,17 @@ struct mon_table mon_dispatch_proto15[] - - struct mon_table mon_dispatch_postauth15[] = { - {MONITOR_REQ_PTY, MON_ONCE, mm_answer_pty}, - {MONITOR_REQ_PTYCLEANUP, MON_ONCE, mm_answer_pty_cleanup}, - {MONITOR_REQ_TERM, 0, mm_answer_term}, - #ifdef SSH_AUDIT_EVENTS - {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event}, - {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT|MON_ONCE, mm_answer_audit_command}, -+ {MONITOR_REQ_AUDIT_END_COMMAND, MON_PERMIT, mm_answer_audit_end_command}, - #endif - {0, 0, NULL} - }; - - struct mon_table *mon_dispatch; - - /* Specifies if a certain message is allowed at the moment */ - -@@ -1420,16 +1423,22 @@ mm_record_login(Session *s, struct passw - static void - mm_session_close(Session *s) - { - debug3("%s: session %d pid %ld", __func__, s->self, (long)s->pid); - if (s->ttyfd != -1) { - debug3("%s: tty %s ptyfd %d", __func__, s->tty, s->ptyfd); - session_pty_cleanup2(s); - } -+#ifdef SSH_AUDIT_EVENTS -+ if (s->command != NULL) { -+ debug3("%s: command %d", __func__, s->command_handle); -+ session_end_command2(s); -+ } -+#endif - session_unused(s->self); - } - - int - mm_answer_pty(int sock, Buffer *m) - { - extern struct monitor *pmonitor; - Session *s; -@@ -1742,21 +1751,53 @@ mm_answer_audit_event(int socket, Buffer - return (0); - } - - int - mm_answer_audit_command(int socket, Buffer *m) - { - u_int len; - char *cmd; -+ Session *s; - - debug3("%s entering", __func__); - cmd = buffer_get_string(m, &len); - /* sanity check command, if so how? */ -- audit_run_command(cmd); -+ s = session_new(); -+ if (s == NULL) -+ fatal("%s: error allocating a session", __func__); -+ s->command = cmd; -+ s->command_handle = audit_run_command(cmd); -+ -+ buffer_clear(m); -+ buffer_put_int(m, s->self); -+ -+ mm_request_send(socket, MONITOR_ANS_AUDIT_COMMAND, m); -+ -+ return (0); -+} -+ -+int -+mm_answer_audit_end_command(int socket, Buffer *m) -+{ -+ int handle; -+ u_int len; -+ char *cmd; -+ Session *s; -+ -+ debug3("%s entering", __func__); -+ handle = buffer_get_int(m); -+ cmd = buffer_get_string(m, &len); -+ -+ s = session_by_id(handle); -+ if (s == NULL || s->ttyfd != -1 || s->command == NULL || -+ strcmp(s->command, cmd) != 0) -+ fatal("%s: invalid handle", __func__); -+ mm_session_close(s); -+ - free(cmd); - return (0); - } - #endif /* SSH_AUDIT_EVENTS */ - - void - monitor_apply_keystate(struct monitor *pmonitor) - { -diff --git a/openssh-6.6p1/monitor.h b/openssh-6.6p1/monitor.h ---- a/openssh-6.6p1/monitor.h -+++ b/openssh-6.6p1/monitor.h -@@ -59,16 +59,17 @@ enum monitor_reqtype { - - MONITOR_REQ_PAM_START = 100, - MONITOR_REQ_PAM_ACCOUNT = 102, MONITOR_ANS_PAM_ACCOUNT = 103, - MONITOR_REQ_PAM_INIT_CTX = 104, MONITOR_ANS_PAM_INIT_CTX = 105, - MONITOR_REQ_PAM_QUERY = 106, MONITOR_ANS_PAM_QUERY = 107, - MONITOR_REQ_PAM_RESPOND = 108, MONITOR_ANS_PAM_RESPOND = 109, - MONITOR_REQ_PAM_FREE_CTX = 110, MONITOR_ANS_PAM_FREE_CTX = 111, - MONITOR_REQ_AUDIT_EVENT = 112, MONITOR_REQ_AUDIT_COMMAND = 113, -+ MONITOR_ANS_AUDIT_COMMAND = 114, MONITOR_REQ_AUDIT_END_COMMAND = 115, - - }; - - struct mm_master; - struct monitor { - int m_recvfd; - int m_sendfd; - int m_log_recvfd; -diff --git a/openssh-6.6p1/monitor_wrap.c b/openssh-6.6p1/monitor_wrap.c ---- a/openssh-6.6p1/monitor_wrap.c -+++ b/openssh-6.6p1/monitor_wrap.c -@@ -1184,27 +1184,48 @@ mm_audit_event(ssh_audit_event_t event) - - buffer_init(&m); - buffer_put_int(&m, event); - - mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUDIT_EVENT, &m); - buffer_free(&m); - } - --void -+int - mm_audit_run_command(const char *command) - { - Buffer m; -+ int handle; - - debug3("%s entering command %s", __func__, command); - - buffer_init(&m); - buffer_put_cstring(&m, command); - - mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUDIT_COMMAND, &m); -+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_AUDIT_COMMAND, &m); -+ -+ handle = buffer_get_int(&m); -+ buffer_free(&m); -+ -+ return (handle); -+} -+ -+void -+mm_audit_end_command(int handle, const char *command) -+{ -+ Buffer m; -+ -+ debug3("%s entering command %s", __func__, command); -+ -+ buffer_init(&m); -+ buffer_put_int(&m, handle); -+ buffer_put_cstring(&m, command); -+ -+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUDIT_END_COMMAND, &m); - buffer_free(&m); - } - #endif /* SSH_AUDIT_EVENTS */ - - #ifdef GSSAPI - OM_uint32 - mm_ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID goid) - { -diff --git a/openssh-6.6p1/monitor_wrap.h b/openssh-6.6p1/monitor_wrap.h ---- a/openssh-6.6p1/monitor_wrap.h -+++ b/openssh-6.6p1/monitor_wrap.h -@@ -69,17 +69,18 @@ void *mm_sshpam_init_ctx(struct Authctxt - int mm_sshpam_query(void *, char **, char **, u_int *, char ***, u_int **); - int mm_sshpam_respond(void *, u_int, char **); - void mm_sshpam_free_ctx(void *); - #endif - - #ifdef SSH_AUDIT_EVENTS - #include "audit.h" - void mm_audit_event(ssh_audit_event_t); --void mm_audit_run_command(const char *); -+int mm_audit_run_command(const char *); -+void mm_audit_end_command(int, const char *); - #endif - - struct Session; - void mm_terminate(void); - int mm_pty_allocate(int *, int *, char *, size_t); - void mm_session_pty_cleanup2(struct Session *); - - /* SSHv1 interfaces */ -diff --git a/openssh-6.6p1/session.c b/openssh-6.6p1/session.c ---- a/openssh-6.6p1/session.c -+++ b/openssh-6.6p1/session.c -@@ -740,16 +740,24 @@ do_exec_pty(Session *s, const char *comm - cygwin_set_impersonation_token(INVALID_HANDLE_VALUE); - #endif - - s->pid = pid; - - /* Parent. Close the slave side of the pseudo tty. */ - close(ttyfd); - -+#ifndef HAVE_OSF_SIA -+ /* do_login in the child did not affect state in this process, -+ compensate. From an architectural standpoint, this is extremely -+ ugly. */ -+ if (!(options.use_login && command == NULL)) -+ audit_count_session_open(); -+#endif -+ - /* Enter interactive session. */ - s->ptymaster = ptymaster; - packet_set_interactive(1, - options.ip_qos_interactive, options.ip_qos_bulk); - if (compat20) { - session_set_fds(s, ptyfd, fdout, -1, 1, 1); - } else { - server_loop(pid, ptyfd, fdout, -1); -@@ -834,25 +842,29 @@ do_exec(Session *s, const char *command) - session_type, - tty == NULL ? "" : " on ", - tty == NULL ? "" : tty, - s->pw->pw_name, - get_remote_ipaddr(), - get_remote_port()); - - #ifdef SSH_AUDIT_EVENTS -+ if (s->command != NULL || s->command_handle != -1) -+ fatal("do_exec: command already set"); - if (command != NULL) -- PRIVSEP(audit_run_command(command)); -+ s->command = xstrdup(command); - else if (s->ttyfd == -1) { - char *shell = s->pw->pw_shell; - - if (shell[0] == '\0') /* empty shell means /bin/sh */ - shell =_PATH_BSHELL; -- PRIVSEP(audit_run_command(shell)); -+ s->command = xstrdup(shell); - } -+ if (s->command != NULL) -+ s->command_handle = PRIVSEP(audit_run_command(s->command)); - #endif - if (s->ttyfd != -1) - ret = do_exec_pty(s, command); - else - ret = do_exec_no_pty(s, command); - - original_command = NULL; - -@@ -1908,16 +1920,17 @@ session_unused(int id) - memset(&sessions[id], 0, sizeof(*sessions)); - sessions[id].self = id; - sessions[id].used = 0; - sessions[id].chanid = -1; - sessions[id].ptyfd = -1; - sessions[id].ttyfd = -1; - sessions[id].ptymaster = -1; - sessions[id].x11_chanids = NULL; -+ sessions[id].command_handle = -1; - sessions[id].next_unused = sessions_first_unused; - sessions_first_unused = id; - } - - Session * - session_new(void) - { - Session *s, *tmp; -@@ -1990,16 +2003,29 @@ session_open(Authctxt *authctxt, int cha - if (s->pw == NULL || !authctxt->valid) - fatal("no user for session %d", s->self); - debug("session_open: session %d: link with channel %d", s->self, chanid); - s->chanid = chanid; - return 1; - } - - Session * -+session_by_id(int id) -+{ -+ if (id >= 0 && id < sessions_nalloc) { -+ Session *s = &sessions[id]; -+ if (s->used) -+ return s; -+ } -+ debug("session_by_id: unknown id %d", id); -+ session_dump(); -+ return NULL; -+} -+ -+Session * - session_by_tty(char *tty) - { - int i; - for (i = 0; i < sessions_nalloc; i++) { - Session *s = &sessions[i]; - if (s->used && s->ttyfd != -1 && strcmp(s->tty, tty) == 0) { - debug("session_by_tty: session %d tty %s", i, tty); - return s; -@@ -2506,16 +2532,40 @@ session_exit_message(Session *s, int sta - * interested in data we write. - * Note that we must not call 'chan_read_failed', since there could - * be some more data waiting in the pipe. - */ - if (c->ostate != CHAN_OUTPUT_CLOSED) - chan_write_failed(c); - } - -+#ifdef SSH_AUDIT_EVENTS -+void -+session_end_command2(Session *s) -+{ -+ if (s->command != NULL) { -+ audit_end_command(s->command_handle, s->command); -+ free(s->command); -+ s->command = NULL; -+ s->command_handle = -1; -+ } -+} -+ -+static void -+session_end_command(Session *s) -+{ -+ if (s->command != NULL) { -+ PRIVSEP(audit_end_command(s->command_handle, s->command)); -+ free(s->command); -+ s->command = NULL; -+ s->command_handle = -1; -+ } -+} -+#endif -+ - void - session_close(Session *s) - { - u_int i; - int do_xauth; - - debug("session_close: session %d pid %ld", s->self, (long)s->pid); - -@@ -2546,16 +2596,20 @@ session_close(Session *s) - int status; - - waitpid(pid, &status, 0); - } - } - - if (s->ttyfd != -1) - session_pty_cleanup(s); -+#ifdef SSH_AUDIT_EVENTS -+ if (s->command) -+ session_end_command(s); -+#endif - free(s->term); - free(s->display); - free(s->x11_chanids); - free(s->auth_display); - free(s->auth_data); - free(s->auth_proto); - free(s->subsys); - if (s->env != NULL) { -@@ -2760,16 +2814,25 @@ session_setup_x11fwd(Session *s) - } - - static void - do_authenticated2(Authctxt *authctxt) - { - server_loop2(authctxt); - } - -+static void -+do_cleanup_one_session(Session *s) -+{ -+ session_pty_cleanup2(s); -+#ifdef SSH_AUDIT_EVENTS -+ session_end_command2(s); -+#endif -+} -+ - void - do_cleanup(Authctxt *authctxt) - { - static int called = 0; - - debug("do_cleanup"); - - /* no cleanup if we're in the child for login shell */ -@@ -2808,10 +2871,10 @@ do_cleanup(Authctxt *authctxt) - /* remove agent socket */ - auth_sock_cleanup_proc(authctxt->pw); - - /* - * Cleanup ptys/utmp only if privsep is disabled, - * or if running in monitor. - */ - if (!use_privsep || mm_is_monitor()) -- session_destroy_all(session_pty_cleanup2); -+ session_destroy_all(do_cleanup_one_session); - } -diff --git a/openssh-6.6p1/session.h b/openssh-6.6p1/session.h ---- a/openssh-6.6p1/session.h -+++ b/openssh-6.6p1/session.h -@@ -56,29 +56,37 @@ struct Session { - int *x11_chanids; - int is_subsystem; - char *subsys; - u_int num_env; - struct { - char *name; - char *val; - } *env; -+ -+ /* exec */ -+#ifdef SSH_AUDIT_EVENTS -+ int command_handle; -+ char *command; -+#endif - }; - - void do_authenticated(Authctxt *); - void do_cleanup(Authctxt *); - - int session_open(Authctxt *, int); - void session_unused(int); - int session_input_channel_req(Channel *, const char *); - void session_close_by_pid(pid_t, int); - void session_close_by_channel(int, void *); - void session_destroy_all(void (*)(Session *)); - void session_pty_cleanup2(Session *); -+void session_end_command2(Session *); - - Session *session_new(void); -+Session *session_by_id(int); - Session *session_by_tty(char *); - void session_close(Session *); - void do_setusercontext(struct passwd *); - void child_set_env(char ***envp, u_int *envsizep, const char *name, - const char *value); - - #endif -diff --git a/openssh-6.6p1/sshd.c b/openssh-6.6p1/sshd.c ---- a/openssh-6.6p1/sshd.c -+++ b/openssh-6.6p1/sshd.c -@@ -2532,13 +2532,14 @@ cleanup_exit(int i) - if (kill(pmonitor->m_pid, SIGKILL) != 0 && - errno != ESRCH) - error("%s: kill(%d): %s", __func__, - pmonitor->m_pid, strerror(errno)); - } - } - #ifdef SSH_AUDIT_EVENTS - /* done after do_cleanup so it can cancel the PAM auth 'thread' */ -- if (!use_privsep || mm_is_monitor()) -+ if ((the_authctxt == NULL || !the_authctxt->authenticated) && -+ (!use_privsep || mm_is_monitor())) - audit_event(SSH_CONNECTION_ABANDON); - #endif - _exit(i); - } diff --git a/openssh-6.6p1-audit3-key_auth_usage-fips.patch b/openssh-6.6p1-audit3-key_auth_usage-fips.patch deleted file mode 100644 index ac95216..0000000 --- a/openssh-6.6p1-audit3-key_auth_usage-fips.patch +++ /dev/null @@ -1,61 +0,0 @@ -# HG changeset patch -# Parent 5482d21e8bd06309af51dea77a5f3668859fb2a0 - -diff --git a/openssh-6.6p1/auth-rsa.c b/openssh-6.6p1/auth-rsa.c ---- a/openssh-6.6p1/auth-rsa.c -+++ b/openssh-6.6p1/auth-rsa.c -@@ -94,16 +94,20 @@ int - auth_rsa_verify_response(Key *key, BIGNUM *challenge, - u_char response[SSH_DIGEST_MAX_LENGTH]) - { - u_char buf[2 * SSH_DIGEST_MAX_LENGTH], mdbuf[SSH_DIGEST_MAX_LENGTH]; - struct ssh_digest_ctx *md; - int len; - int dgst; - size_t dgst_len; -+ int rv; -+#ifdef SSH_AUDIT_EVENTS -+ char *fp; -+#endif - - /* don't allow short keys */ - if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) { - error("%s: RSA modulus too small: %d < minimum %d bits", - __func__, - BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE); - return (0); - } -@@ -121,22 +125,28 @@ auth_rsa_verify_response(Key *key, BIGNU - if ((md = ssh_digest_start(dgst)) == NULL || - ssh_digest_update(md, buf, 2 * dgst_len) < 0 || - ssh_digest_update(md, session_id, dgst_len) < 0 || - ssh_digest_final(md, mdbuf, sizeof(mdbuf)) < 0) - fatal("%s: md5 failed", __func__); - ssh_digest_free(md); - - /* Verify that the response is the original challenge. */ -- if (timingsafe_bcmp(response, mdbuf, dgst_len) != 0) { -- /* Wrong answer. */ -- return (0); -+ rv = timingsafe_bcmp(response, mdbuf, dgst_len) == 0; -+ -+#ifdef SSH_AUDIT_EVENTS -+ fp = key_fingerprint(key, key_fp_type_select(), SSH_FP_HEX); -+ if (audit_keyusage(1, "ssh-rsa1", RSA_size(key->rsa) * 8, fp, rv) == 0) { -+ debug("unsuccessful audit"); -+ rv = 0; - } -- /* Correct answer. */ -- return (1); -+ free(fp); -+#endif -+ -+ return rv; - } - - /* - * Performs the RSA authentication challenge-response dialog with the client, - * and returns true (non-zero) if the client gave the correct answer to - * our challenge; returns zero if the client gives a wrong answer. - */ - diff --git a/openssh-6.6p1-audit3-key_auth_usage.patch b/openssh-6.6p1-audit3-key_auth_usage.patch deleted file mode 100644 index 1471ec8..0000000 --- a/openssh-6.6p1-audit3-key_auth_usage.patch +++ /dev/null @@ -1,506 +0,0 @@ -# auditing key-based authentication (both server and client) -# based on: -# https://bugzilla.mindrot.org/show_bug.cgi?id=1402 -# https://bugzilla.mindrot.org/attachment.cgi?id=2012 -# (replaces: https://bugzilla.mindrot.org/attachment.cgi?id=1975) -# by jchadima@redhat.com - -diff --git a/openssh-6.6p1/audit-bsm.c b/openssh-6.6p1/audit-bsm.c ---- a/openssh-6.6p1/audit-bsm.c -+++ b/openssh-6.6p1/audit-bsm.c -@@ -401,16 +401,22 @@ audit_session_open(struct logininfo *li) - } - - void - audit_session_close(struct logininfo *li) - { - /* not implemented */ - } - -+int -+audit_keyusage(int host_user, const char *type, unsigned bits, char *fp, int rv) -+{ -+ /* not implemented */ -+} -+ - void - audit_event(ssh_audit_event_t event) - { - char textbuf[BSM_TEXTBUFSZ]; - static int logged_in = 0; - const char *user = the_authctxt ? the_authctxt->user : "(unknown user)"; - - if (cannot_audit(0)) -diff --git a/openssh-6.6p1/audit-linux.c b/openssh-6.6p1/audit-linux.c ---- a/openssh-6.6p1/audit-linux.c -+++ b/openssh-6.6p1/audit-linux.c -@@ -36,16 +36,18 @@ - #include "log.h" - #include "audit.h" - #include "key.h" - #include "hostfile.h" - #include "auth.h" - #include "servconf.h" - #include "canohost.h" - -+#define AUDIT_LOG_SIZE 128 -+ - extern ServerOptions options; - extern Authctxt *the_authctxt; - extern u_int utmp_len; - const char* audit_username(void); - - static void - linux_audit_user_logxxx(int uid, const char *username, - const char *hostname, const char *ip, const char *ttyn, int success, int event) -@@ -125,16 +127,47 @@ linux_audit_user_auth(int uid, const cha - rc = 0; - errno = saved_errno; - if (rc < 0) { - fatal_report: - fatal("linux_audit_write_entry failed: %s", strerror(errno)); - } - } - -+int -+audit_keyusage(int host_user, const char *type, unsigned bits, char *fp, int rv) -+{ -+ char buf[AUDIT_LOG_SIZE]; -+ int audit_fd, rc, saved_errno; -+ -+ audit_fd = audit_open(); -+ if (audit_fd < 0) { -+ if (errno == EINVAL || errno == EPROTONOSUPPORT || -+ errno == EAFNOSUPPORT) -+ return 1; /* No audit support in kernel */ -+ else -+ return 0; /* Must prevent login */ -+ } -+ snprintf(buf, sizeof(buf), "%s_auth rport=%d", host_user ? "pubkey" : "hostbased", get_remote_port()); -+ rc = audit_log_acct_message(audit_fd, AUDIT_USER_AUTH, NULL, -+ buf, audit_username(), -1, NULL, get_remote_ipaddr(), NULL, rv); -+ if ((rc < 0) && ((rc != -1) || (getuid() == 0))) -+ goto out; -+ snprintf(buf, sizeof(buf), "key algo=%s size=%d fp=%s rport=%d", -+ type, bits, fp, get_remote_port()); -+ rc = audit_log_acct_message(audit_fd, AUDIT_USER_AUTH, NULL, -+ buf, audit_username(), -1, NULL, get_remote_ipaddr(), NULL, rv); -+out: -+ saved_errno = errno; -+ audit_close(audit_fd); -+ errno = saved_errno; -+ /* do not report error if the error is EPERM and sshd is run as non root user */ -+ return (rc >= 0) || ((rc == -EPERM) && (getuid() != 0)); -+} -+ - static int user_login_count = 0; - - /* Below is the sshd audit API code */ - - void - audit_connection_from(const char *host, int port) - { - /* not implemented */ -diff --git a/openssh-6.6p1/audit.c b/openssh-6.6p1/audit.c ---- a/openssh-6.6p1/audit.c -+++ b/openssh-6.6p1/audit.c -@@ -31,16 +31,17 @@ - - #ifdef SSH_AUDIT_EVENTS - - #include "audit.h" - #include "log.h" - #include "key.h" - #include "hostfile.h" - #include "auth.h" -+#include "xmalloc.h" - - /* - * Care must be taken when using this since it WILL NOT be initialized when - * audit_connection_from() is called and MAY NOT be initialized when - * audit_event(CONNECTION_ABANDON) is called. Test for NULL before using. - */ - extern Authctxt *the_authctxt; - -@@ -106,16 +107,32 @@ audit_event_lookup(ssh_audit_event_t ev) - }; - - for (i = 0; event_lookup[i].event != SSH_AUDIT_UNKNOWN; i++) - if (event_lookup[i].event == ev) - break; - return(event_lookup[i].name); - } - -+void -+audit_key(int host_user, int *rv, const Key *key) -+{ -+ char *fp; -+ const char *crypto_name; -+ -+ fp = key_fingerprint(key, key_fp_type_select(), SSH_FP_HEX); -+ if (key->type == KEY_RSA1) -+ crypto_name = "ssh-rsa1"; -+ else -+ crypto_name = key_ssh_name(key); -+ if (audit_keyusage(host_user, crypto_name, key_size(key), fp, *rv) == 0) -+ *rv = 0; -+ free(fp); -+} -+ - # ifndef CUSTOM_SSH_AUDIT_EVENTS - /* - * Null implementations of audit functions. - * These get used if SSH_AUDIT_EVENTS is defined but no audit module is enabled. - */ - - /* - * Called after a connection has been accepted but before any authentication -@@ -204,10 +221,22 @@ audit_run_command(const char *command) - */ - void - audit_end_command(int handle, const char *command) - { - debug("audit end nopty exec euid %d user %s command '%.200s'", geteuid(), - audit_username(), command); - } - -+/* -+ * This will be called when user is successfully autherized by the RSA1/RSA/DSA key. -+ * -+ * Type is the key type, len is the key length(byte) and fp is the fingerprint of the key. -+ */ -+int -+audit_keyusage(int host_user, const char *type, unsigned bits, char *fp, int rv) -+{ -+ debug("audit %s key usage euid %d user %s key type %s key length %d fingerprint %s, result %d", -+ host_user ? "pubkey" : "hostbased", geteuid(), audit_username(), type, bits, -+ fp, rv); -+} - # endif /* !defined CUSTOM_SSH_AUDIT_EVENTS */ - #endif /* SSH_AUDIT_EVENTS */ -diff --git a/openssh-6.6p1/audit.h b/openssh-6.6p1/audit.h ---- a/openssh-6.6p1/audit.h -+++ b/openssh-6.6p1/audit.h -@@ -23,16 +23,17 @@ - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - - #ifndef _SSH_AUDIT_H - # define _SSH_AUDIT_H - - #include "loginrec.h" -+#include "key.h" - - enum ssh_audit_event_type { - SSH_LOGIN_EXCEED_MAXTRIES, - SSH_LOGIN_ROOT_DENIED, - SSH_AUTH_SUCCESS, - SSH_AUTH_FAIL_NONE, - SSH_AUTH_FAIL_PASSWD, - SSH_AUTH_FAIL_KBDINT, /* keyboard-interactive or challenge-response */ -@@ -50,10 +51,12 @@ typedef enum ssh_audit_event_type ssh_au - void audit_connection_from(const char *, int); - void audit_event(ssh_audit_event_t); - void audit_count_session_open(void); - void audit_session_open(struct logininfo *); - void audit_session_close(struct logininfo *); - int audit_run_command(const char *); - void audit_end_command(int, const char *); - ssh_audit_event_t audit_classify_auth(const char *); -+int audit_keyusage(int, const char *, unsigned, char *, int); -+void audit_key(int, int *, const Key *); - - #endif /* _SSH_AUDIT_H */ -diff --git a/openssh-6.6p1/auth.h b/openssh-6.6p1/auth.h ---- a/openssh-6.6p1/auth.h -+++ b/openssh-6.6p1/auth.h -@@ -178,16 +178,17 @@ int allowed_user(struct passwd *); - struct passwd * getpwnamallow(const char *user); - - char *get_challenge(Authctxt *); - int verify_response(Authctxt *, const char *); - void abandon_challenge_response(Authctxt *); - - char *expand_authorized_keys(const char *, struct passwd *pw); - char *authorized_principals_file(struct passwd *); -+int user_key_verify(const Key *, const u_char *, u_int, const u_char *, u_int); - - FILE *auth_openkeyfile(const char *, struct passwd *, int); - FILE *auth_openprincipals(const char *, struct passwd *, int); - int auth_key_is_revoked(Key *); - - HostStatus - check_key_in_hostfiles(struct passwd *, Key *, const char *, - const char *, const char *); -@@ -195,16 +196,17 @@ check_key_in_hostfiles(struct passwd *, - /* hostkey handling */ - Key *get_hostkey_by_index(int); - Key *get_hostkey_public_by_index(int); - Key *get_hostkey_public_by_type(int); - Key *get_hostkey_private_by_type(int); - int get_hostkey_index(Key *); - int ssh1_session_key(BIGNUM *); - void sshd_hostkey_sign(Key *, Key *, u_char **, u_int *, u_char *, u_int); -+int hostbased_key_verify(const Key *, const u_char *, u_int, const u_char *, u_int); - - /* debug messages during authentication */ - void auth_debug_add(const char *fmt,...) __attribute__((format(printf, 1, 2))); - void auth_debug_send(void); - void auth_debug_reset(void); - - struct passwd *fakepw(void); - -diff --git a/openssh-6.6p1/auth2-hostbased.c b/openssh-6.6p1/auth2-hostbased.c ---- a/openssh-6.6p1/auth2-hostbased.c -+++ b/openssh-6.6p1/auth2-hostbased.c -@@ -124,33 +124,45 @@ userauth_hostbased(Authctxt *authctxt) - #endif - - pubkey_auth_info(authctxt, key, - "client user \"%.100s\", client host \"%.100s\"", cuser, chost); - - /* test for allowed key and correct signature */ - authenticated = 0; - if (PRIVSEP(hostbased_key_allowed(authctxt->pw, cuser, chost, key)) && -- PRIVSEP(key_verify(key, sig, slen, buffer_ptr(&b), -+ PRIVSEP(hostbased_key_verify(key, sig, slen, buffer_ptr(&b), - buffer_len(&b))) == 1) - authenticated = 1; - - buffer_free(&b); - done: - debug2("userauth_hostbased: authenticated %d", authenticated); - if (key != NULL) - key_free(key); - free(pkalg); - free(pkblob); - free(cuser); - free(chost); - free(sig); - return authenticated; - } - -+int -+hostbased_key_verify(const Key *key, const u_char *sig, u_int slen, const u_char *data, u_int datalen) -+{ -+ int rv; -+ -+ rv = key_verify(key, sig, slen, data, datalen); -+#ifdef SSH_AUDIT_EVENTS -+ audit_key(0, &rv, key); -+#endif -+ return rv; -+} -+ - /* return 1 if given hostkey is allowed */ - int - hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost, - Key *key) - { - const char *resolvedname, *ipaddr, *lookup, *reason; - HostStatus host_status; - int len; -diff --git a/openssh-6.6p1/auth2-pubkey.c b/openssh-6.6p1/auth2-pubkey.c ---- a/openssh-6.6p1/auth2-pubkey.c -+++ b/openssh-6.6p1/auth2-pubkey.c -@@ -153,17 +153,17 @@ userauth_pubkey(Authctxt *authctxt) - #ifdef DEBUG_PK - buffer_dump(&b); - #endif - pubkey_auth_info(authctxt, key, NULL); - - /* test for correct signature */ - authenticated = 0; - if (PRIVSEP(user_key_allowed(authctxt->pw, key)) && -- PRIVSEP(key_verify(key, sig, slen, buffer_ptr(&b), -+ PRIVSEP(user_key_verify(key, sig, slen, buffer_ptr(&b), - buffer_len(&b))) == 1) - authenticated = 1; - buffer_free(&b); - free(sig); - } else { - debug("test whether pkalg/pkblob are acceptable"); - packet_check_eom(); - -@@ -190,16 +190,28 @@ done: - debug2("userauth_pubkey: authenticated %d pkalg %s", authenticated, pkalg); - if (key != NULL) - key_free(key); - free(pkalg); - free(pkblob); - return authenticated; - } - -+int -+user_key_verify(const Key *key, const u_char *sig, u_int slen, const u_char *data, u_int datalen) -+{ -+ int rv; -+ -+ rv = key_verify(key, sig, slen, data, datalen); -+#ifdef SSH_AUDIT_EVENTS -+ audit_key(1, &rv, key); -+#endif -+ return rv; -+} -+ - void - pubkey_auth_info(Authctxt *authctxt, const Key *key, const char *fmt, ...) - { - char *fp, *extra; - va_list ap; - int i; - - extra = NULL; -diff --git a/openssh-6.6p1/monitor.c b/openssh-6.6p1/monitor.c ---- a/openssh-6.6p1/monitor.c -+++ b/openssh-6.6p1/monitor.c -@@ -1340,26 +1340,30 @@ monitor_valid_hostbasedblob(u_char *data - } - - int - mm_answer_keyverify(int sock, Buffer *m) - { - Key *key; - u_char *signature, *data, *blob; - u_int signaturelen, datalen, bloblen; -+ int type = 0; - int verified = 0; - int valid_data = 0; - -+ type = buffer_get_int(m); - blob = buffer_get_string(m, &bloblen); - signature = buffer_get_string(m, &signaturelen); - data = buffer_get_string(m, &datalen); - - if (hostbased_cuser == NULL || hostbased_chost == NULL || - !monitor_allowed_key(blob, bloblen)) - fatal("%s: bad key, not previously allowed", __func__); -+ if (type != key_blobtype) -+ fatal("%s: bad key type", __func__); - - key = key_from_blob(blob, bloblen); - if (key == NULL) - fatal("%s: bad public key blob", __func__); - - switch (key_blobtype) { - case MM_USERKEY: - valid_data = monitor_valid_userblob(data, datalen); -@@ -1370,17 +1374,27 @@ mm_answer_keyverify(int sock, Buffer *m) - break; - default: - valid_data = 0; - break; - } - if (!valid_data) - fatal("%s: bad signature data blob", __func__); - -- verified = key_verify(key, signature, signaturelen, data, datalen); -+ switch (key_blobtype) { -+ case MM_USERKEY: -+ verified = user_key_verify(key, signature, signaturelen, data, datalen); -+ break; -+ case MM_HOSTKEY: -+ verified = hostbased_key_verify(key, signature, signaturelen, data, datalen); -+ break; -+ default: -+ verified = 0; -+ break; -+ } - debug3("%s: key %p signature %s", - __func__, key, (verified == 1) ? "verified" : "unverified"); - - key_free(key); - free(blob); - free(signature); - free(data); - -diff --git a/openssh-6.6p1/monitor_wrap.c b/openssh-6.6p1/monitor_wrap.c ---- a/openssh-6.6p1/monitor_wrap.c -+++ b/openssh-6.6p1/monitor_wrap.c -@@ -426,30 +426,31 @@ mm_key_allowed(enum mm_keytype type, cha - - /* - * This key verify needs to send the key type along, because the - * privileged parent makes the decision if the key is allowed - * for authentication. - */ - - int --mm_key_verify(Key *key, u_char *sig, u_int siglen, u_char *data, u_int datalen) -+mm_key_verify(enum mm_keytype type, Key *key, u_char *sig, u_int siglen, u_char *data, u_int datalen) - { - Buffer m; - u_char *blob; - u_int len; - int verified = 0; - - debug3("%s entering", __func__); - - /* Convert the key to a blob and the pass it over */ - if (!key_to_blob(key, &blob, &len)) - return (0); - - buffer_init(&m); -+ buffer_put_int(&m, type); - buffer_put_string(&m, blob, len); - buffer_put_string(&m, sig, siglen); - buffer_put_string(&m, data, datalen); - free(blob); - - mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYVERIFY, &m); - - debug3("%s: waiting for MONITOR_ANS_KEYVERIFY", __func__); -@@ -457,16 +458,29 @@ mm_key_verify(Key *key, u_char *sig, u_i - - verified = buffer_get_int(&m); - - buffer_free(&m); - - return (verified); - } - -+int -+mm_hostbased_key_verify(Key *key, u_char *sig, u_int siglen, u_char *data, u_int datalen) -+{ -+ return mm_key_verify(MM_HOSTKEY, key, sig, siglen, data, datalen); -+} -+ -+int -+mm_user_key_verify(Key *key, u_char *sig, u_int siglen, u_char *data, u_int datalen) -+{ -+ return mm_key_verify(MM_USERKEY, key, sig, siglen, data, datalen); -+} -+ -+ - /* Export key state after authentication */ - Newkeys * - mm_newkeys_from_blob(u_char *blob, int blen) - { - Buffer b; - u_int len; - Newkeys *newkey = NULL; - Enc *enc; -diff --git a/openssh-6.6p1/monitor_wrap.h b/openssh-6.6p1/monitor_wrap.h ---- a/openssh-6.6p1/monitor_wrap.h -+++ b/openssh-6.6p1/monitor_wrap.h -@@ -44,17 +44,18 @@ int mm_key_sign(Key *, u_char **, u_int - void mm_inform_authserv(char *, char *); - struct passwd *mm_getpwnamallow(const char *); - char *mm_auth2_read_banner(void); - int mm_auth_password(struct Authctxt *, char *); - int mm_key_allowed(enum mm_keytype, char *, char *, Key *); - int mm_user_key_allowed(struct passwd *, Key *); - int mm_hostbased_key_allowed(struct passwd *, char *, char *, Key *); - int mm_auth_rhosts_rsa_key_allowed(struct passwd *, char *, char *, Key *); --int mm_key_verify(Key *, u_char *, u_int, u_char *, u_int); -+int mm_hostbased_key_verify(Key *, u_char *, u_int, u_char *, u_int); -+int mm_user_key_verify(Key *, u_char *, u_int, u_char *, u_int); - int mm_auth_rsa_key_allowed(struct passwd *, BIGNUM *, Key **); - int mm_auth_rsa_verify_response(Key *, BIGNUM *, u_char *); - BIGNUM *mm_auth_rsa_generate_challenge(Key *); - - #ifdef GSSAPI - OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); - OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *, - gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); diff --git a/openssh-6.6p1-audit4-kex_results-fips.patch b/openssh-6.6p1-audit4-kex_results-fips.patch deleted file mode 100644 index 7f781d7..0000000 --- a/openssh-6.6p1-audit4-kex_results-fips.patch +++ /dev/null @@ -1,82 +0,0 @@ -# HG changeset patch -# Parent 274a545b591567f1378c1086ad3ba40c911a8bd6 - -diff --git a/openssh-6.6p1/Makefile.in b/openssh-6.6p1/Makefile.in ---- a/openssh-6.6p1/Makefile.in -+++ b/openssh-6.6p1/Makefile.in -@@ -72,17 +72,18 @@ LIBSSH_OBJS=authfd.o authfile.o bufaux.o - atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ - monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ - kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \ - msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \ - ssh-pkcs11.o krl.o smult_curve25519_ref.o \ - kexc25519.o kexc25519c.o poly1305.o chacha.o cipher-chachapoly.o \ - ssh-ed25519.o digest-openssl.o hmac.o \ - sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o \ -- fips.o -+ fips.o \ -+ auditstub.o - - SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ - sshconnect.o sshconnect1.o sshconnect2.o mux.o \ - roaming_common.o roaming_client.o - - SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ - audit.o audit-bsm.o audit-linux.o platform.o \ - sshpty.o sshlogin.o servconf.o serverloop.o \ -diff --git a/openssh-6.6p1/cipher.c b/openssh-6.6p1/cipher.c ---- a/openssh-6.6p1/cipher.c -+++ b/openssh-6.6p1/cipher.c -@@ -54,30 +54,16 @@ - - /* compatibility with old or broken OpenSSL versions */ - #include "openbsd-compat/openssl-compat.h" - - extern const EVP_CIPHER *evp_ssh1_bf(void); - extern const EVP_CIPHER *evp_ssh1_3des(void); - extern void ssh1_3des_iv(EVP_CIPHER_CTX *, int, u_char *, int); - --struct Cipher { -- char *name; -- int number; /* for ssh1 only */ -- u_int block_size; -- u_int key_len; -- u_int iv_len; /* defaults to block_size */ -- u_int auth_len; -- u_int discard_len; -- u_int flags; --#define CFLAG_CBC (1<<0) --#define CFLAG_CHACHAPOLY (1<<1) -- const EVP_CIPHER *(*evptype)(void); --}; -- - static const struct Cipher ciphers_all[] = { - { "none", SSH_CIPHER_NONE, 8, 0, 0, 0, 0, 0, EVP_enc_null }, - { "des", SSH_CIPHER_DES, 8, 8, 0, 0, 0, 1, EVP_des_cbc }, - { "3des", SSH_CIPHER_3DES, 8, 16, 0, 0, 0, 1, evp_ssh1_3des }, - { "blowfish", SSH_CIPHER_BLOWFISH, 8, 32, 0, 0, 0, 1, evp_ssh1_bf }, - - { "3des-cbc", SSH_CIPHER_SSH2, 8, 24, 0, 0, 0, 1, EVP_des_ede3_cbc }, - { "blowfish-cbc", -diff --git a/openssh-6.6p1/sshd.c b/openssh-6.6p1/sshd.c ---- a/openssh-6.6p1/sshd.c -+++ b/openssh-6.6p1/sshd.c -@@ -119,16 +119,18 @@ - #endif - #include "monitor_wrap.h" - #include "roaming.h" - #include "ssh-sandbox.h" - #include "version.h" - - #include "fips.h" - -+#include "audit.h" -+ - #ifdef LIBWRAP - #include - #include - int allow_severity; - int deny_severity; - #endif /* LIBWRAP */ - - #ifndef O_NOCTTY diff --git a/openssh-6.6p1-audit4-kex_results.patch b/openssh-6.6p1-audit4-kex_results.patch deleted file mode 100644 index d6bb569..0000000 --- a/openssh-6.6p1-audit4-kex_results.patch +++ /dev/null @@ -1,701 +0,0 @@ -# key exhange auditing -# based on: -# https://bugzilla.mindrot.org/show_bug.cgi?id=1402 -# https://bugzilla.mindrot.org/attachment.cgi?id=2013 -# (replaces: https://bugzilla.mindrot.org/attachment.cgi?id=1976) -# by jchadima@redhat.com - -diff --git a/openssh-6.6p1/audit-bsm.c b/openssh-6.6p1/audit-bsm.c ---- a/openssh-6.6p1/audit-bsm.c -+++ b/openssh-6.6p1/audit-bsm.c -@@ -468,9 +468,21 @@ audit_event(ssh_audit_event_t event) - case SSH_AUTH_FAIL_KBDINT: - bsm_audit_bad_login("interactive password entry"); - break; - - default: - debug("%s: unhandled event %d", __func__, event); - } - } -+ -+void -+audit_unsupported_body(int what) -+{ -+ /* not implemented */ -+} -+ -+void -+audit_kex_body(int ctos, char *enc, char *mac, char *compress, pid_t pid, uid_t uid) -+{ -+ /* not implemented */ -+} - #endif /* BSM */ -diff --git a/openssh-6.6p1/audit-linux.c b/openssh-6.6p1/audit-linux.c ---- a/openssh-6.6p1/audit-linux.c -+++ b/openssh-6.6p1/audit-linux.c -@@ -35,16 +35,18 @@ - - #include "log.h" - #include "audit.h" - #include "key.h" - #include "hostfile.h" - #include "auth.h" - #include "servconf.h" - #include "canohost.h" -+#include "packet.h" -+#include "cipher.h" - - #define AUDIT_LOG_SIZE 128 - - extern ServerOptions options; - extern Authctxt *the_authctxt; - extern u_int utmp_len; - const char* audit_username(void); - -@@ -264,9 +266,65 @@ audit_event(ssh_audit_event_t event) - get_remote_ipaddr(), "ssh", 0, AUDIT_USER_LOGIN); - break; - - default: - debug("%s: unhandled event %d", __func__, event); - } - } - -+void -+audit_unsupported_body(int what) -+{ -+#ifdef AUDIT_CRYPTO_SESSION -+ char buf[AUDIT_LOG_SIZE]; -+ const static char *name[] = { "cipher", "mac", "comp" }; -+ char *s; -+ int audit_fd; -+ -+ snprintf(buf, sizeof(buf), "op=unsupported-%s direction=? cipher=? ksize=? rport=%d laddr=%s lport=%d ", -+ name[what], get_remote_port(), (s = get_local_ipaddr(packet_get_connection_in())), -+ get_local_port()); -+ free(s); -+ audit_fd = audit_open(); -+ if (audit_fd < 0) -+ /* no problem, the next instruction will be fatal() */ -+ return; -+ audit_log_user_message(audit_fd, AUDIT_CRYPTO_SESSION, -+ buf, NULL, get_remote_ipaddr(), NULL, 0); -+ audit_close(audit_fd); -+#endif -+} -+ -+void -+audit_kex_body(int ctos, char *enc, char *mac, char *compress, pid_t pid, -+ uid_t uid) -+{ -+#ifdef AUDIT_CRYPTO_SESSION -+ char buf[AUDIT_LOG_SIZE]; -+ int audit_fd, audit_ok; -+ const static char *direction[] = { "from-server", "from-client", "both" }; -+ Cipher *cipher = cipher_by_name(enc); -+ char *s; -+ -+ snprintf(buf, sizeof(buf), "op=start direction=%s cipher=%s ksize=%d spid=%jd suid=%jd rport=%d laddr=%s lport=%d ", -+ direction[ctos], enc, cipher ? 8 * cipher->key_len : 0, -+ (intmax_t)pid, (intmax_t)uid, -+ get_remote_port(), (s = get_local_ipaddr(packet_get_connection_in())), get_local_port()); -+ free(s); -+ audit_fd = audit_open(); -+ if (audit_fd < 0) { -+ if (errno == EINVAL || errno == EPROTONOSUPPORT || -+ errno == EAFNOSUPPORT) -+ return; /* No audit support in kernel */ -+ else -+ fatal("cannot open audit"); /* Must prevent login */ -+ } -+ audit_ok = audit_log_user_message(audit_fd, AUDIT_CRYPTO_SESSION, -+ buf, NULL, get_remote_ipaddr(), NULL, 1); -+ audit_close(audit_fd); -+ /* do not abort if the error is EPERM and sshd is run as non root user */ -+ if ((audit_ok < 0) && ((audit_ok != -1) || (getuid() == 0))) -+ fatal("cannot write into audit"); /* Must prevent login */ -+#endif -+} -+ - #endif /* USE_LINUX_AUDIT */ -diff --git a/openssh-6.6p1/audit.c b/openssh-6.6p1/audit.c ---- a/openssh-6.6p1/audit.c -+++ b/openssh-6.6p1/audit.c -@@ -23,24 +23,27 @@ - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - - #include "includes.h" - - #include - #include -+#include - - #ifdef SSH_AUDIT_EVENTS - - #include "audit.h" - #include "log.h" - #include "key.h" - #include "hostfile.h" - #include "auth.h" -+#include "ssh-gss.h" -+#include "monitor_wrap.h" - #include "xmalloc.h" - - /* - * Care must be taken when using this since it WILL NOT be initialized when - * audit_connection_from() is called and MAY NOT be initialized when - * audit_event(CONNECTION_ABANDON) is called. Test for NULL before using. - */ - extern Authctxt *the_authctxt; -@@ -123,16 +126,28 @@ audit_key(int host_user, int *rv, const - crypto_name = "ssh-rsa1"; - else - crypto_name = key_ssh_name(key); - if (audit_keyusage(host_user, crypto_name, key_size(key), fp, *rv) == 0) - *rv = 0; - free(fp); - } - -+void -+audit_unsupported(int what) -+{ -+ PRIVSEP(audit_unsupported_body(what)); -+} -+ -+void -+audit_kex(int ctos, char *enc, char *mac, char *comp) -+{ -+ PRIVSEP(audit_kex_body(ctos, enc, mac, comp, getpid(), getuid())); -+} -+ - # ifndef CUSTOM_SSH_AUDIT_EVENTS - /* - * Null implementations of audit functions. - * These get used if SSH_AUDIT_EVENTS is defined but no audit module is enabled. - */ - - /* - * Called after a connection has been accepted but before any authentication -@@ -233,10 +248,31 @@ audit_end_command(int handle, const char - */ - int - audit_keyusage(int host_user, const char *type, unsigned bits, char *fp, int rv) - { - debug("audit %s key usage euid %d user %s key type %s key length %d fingerprint %s, result %d", - host_user ? "pubkey" : "hostbased", geteuid(), audit_username(), type, bits, - fp, rv); - } -+ -+/* -+ * This will be called when the protocol negotiation fails. -+ */ -+void -+audit_unsupported_body(int what) -+{ -+ debug("audit unsupported protocol euid %d type %d", geteuid(), what); -+} -+ -+/* -+ * This will be called on succesfull protocol negotiation. -+ */ -+void -+audit_kex_body(int ctos, char *enc, char *mac, char *compress, pid_t pid, -+ uid_t uid) -+{ -+ debug("audit protocol negotiation euid %d direction %d cipher %s mac %s compresion %s from pid %ld uid %u", -+ (unsigned)geteuid(), ctos, enc, mac, compress, (long)pid, -+ (unsigned)uid); -+} - # endif /* !defined CUSTOM_SSH_AUDIT_EVENTS */ - #endif /* SSH_AUDIT_EVENTS */ -diff --git a/openssh-6.6p1/audit.h b/openssh-6.6p1/audit.h ---- a/openssh-6.6p1/audit.h -+++ b/openssh-6.6p1/audit.h -@@ -53,10 +53,14 @@ void audit_event(ssh_audit_event_t); - void audit_count_session_open(void); - void audit_session_open(struct logininfo *); - void audit_session_close(struct logininfo *); - int audit_run_command(const char *); - void audit_end_command(int, const char *); - ssh_audit_event_t audit_classify_auth(const char *); - int audit_keyusage(int, const char *, unsigned, char *, int); - void audit_key(int, int *, const Key *); -+void audit_unsupported(int); -+void audit_kex(int, char *, char *, char *); -+void audit_unsupported_body(int); -+void audit_kex_body(int, char *, char *, char *, pid_t, uid_t); - - #endif /* _SSH_AUDIT_H */ -diff --git a/openssh-6.6p1/auditstub.c b/openssh-6.6p1/auditstub.c -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/auditstub.c -@@ -0,0 +1,39 @@ -+/* $Id: auditstub.c,v 1.1 jfch Exp $ */ -+ -+/* -+ * Copyright 2010 Red Hat, Inc. All rights reserved. -+ * Use is subject to license terms. -+ * -+ * 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. -+ * -+ * Red Hat author: Jan F. Chadima -+ */ -+ -+void -+audit_unsupported(int n) -+{ -+} -+ -+void -+audit_kex(int ctos, char *enc, char *mac, char *comp) -+{ -+} -+ -diff --git a/openssh-6.6p1/cipher.h b/openssh-6.6p1/cipher.h ---- a/openssh-6.6p1/cipher.h -+++ b/openssh-6.6p1/cipher.h -@@ -58,17 +58,30 @@ - #define SSH_CIPHER_MAX 31 - - #define CIPHER_ENCRYPT 1 - #define CIPHER_DECRYPT 0 - - typedef struct Cipher Cipher; - typedef struct CipherContext CipherContext; - --struct Cipher; -+struct Cipher { -+ char *name; -+ int number; /* for ssh1 only */ -+ u_int block_size; -+ u_int key_len; -+ u_int iv_len; /* defaults to block_size */ -+ u_int auth_len; -+ u_int discard_len; -+ u_int flags; -+#define CFLAG_CBC (1<<0) -+#define CFLAG_CHACHAPOLY (1<<1) -+ const EVP_CIPHER *(*evptype)(void); -+}; -+ - struct CipherContext { - int plaintext; - int encrypt; - EVP_CIPHER_CTX evp; - struct chachapoly_ctx cp_ctx; /* XXX union with evp? */ - const Cipher *cipher; - }; - -diff --git a/openssh-6.6p1/kex.c b/openssh-6.6p1/kex.c ---- a/openssh-6.6p1/kex.c -+++ b/openssh-6.6p1/kex.c -@@ -45,16 +45,17 @@ - #include "kex.h" - #include "log.h" - #include "mac.h" - #include "match.h" - #include "dispatch.h" - #include "monitor.h" - #include "roaming.h" - #include "digest.h" -+#include "audit.h" - - #if OPENSSL_VERSION_NUMBER >= 0x00907000L - # if defined(HAVE_EVP_SHA256) - # define evp_ssh_sha256 EVP_sha256 - # else - extern const EVP_MD *evp_ssh_sha256(void); - # endif - #endif -@@ -346,53 +347,65 @@ kex_kexinit_finish(Kex *kex) - fatal("Unsupported key exchange %d", kex->kex_type); - } - } - - static void - choose_enc(Enc *enc, char *client, char *server) - { - char *name = match_list(client, server, NULL); -- if (name == NULL) -+ if (name == NULL) { -+#ifdef SSH_AUDIT_EVENTS -+ audit_unsupported(0); -+#endif - fatal("no matching cipher found: client %s server %s", - client, server); -+ } - if ((enc->cipher = cipher_by_name(name)) == NULL) - fatal("matching cipher is not supported: %s", name); - enc->name = name; - enc->enabled = 0; - enc->iv = NULL; - enc->iv_len = cipher_ivlen(enc->cipher); - enc->key = NULL; - enc->key_len = cipher_keylen(enc->cipher); - enc->block_size = cipher_blocksize(enc->cipher); - } - - static void - choose_mac(Mac *mac, char *client, char *server) - { - char *name = match_list(client, server, NULL); -- if (name == NULL) -+ if (name == NULL) { -+#ifdef SSH_AUDIT_EVENTS -+ audit_unsupported(1); -+#endif - fatal("no matching mac found: client %s server %s", - client, server); -+ } - if (mac_setup(mac, name) < 0) - fatal("unsupported mac %s", name); - /* truncate the key */ - if (datafellows & SSH_BUG_HMAC) - mac->key_len = 16; - mac->name = name; - mac->key = NULL; - mac->enabled = 0; - } - - static void - choose_comp(Comp *comp, char *client, char *server) - { - char *name = match_list(client, server, NULL); -- if (name == NULL) -+ if (name == NULL) { -+#ifdef SSH_AUDIT_EVENTS -+ audit_unsupported(2); -+#endif - fatal("no matching comp found: client %s server %s", client, server); -+ } - if (strcmp(name, "zlib@openssh.com") == 0) { - comp->type = COMP_DELAYED; - } else if (strcmp(name, "zlib") == 0) { - comp->type = COMP_ZLIB; - } else if (strcmp(name, "none") == 0) { - comp->type = COMP_NONE; - } else { - fatal("unsupported comp %s", name); -@@ -497,16 +510,19 @@ kex_choose_conf(Kex *kex) - if (authlen == 0) - choose_mac(&newkeys->mac, cprop[nmac], sprop[nmac]); - choose_comp(&newkeys->comp, cprop[ncomp], sprop[ncomp]); - debug("kex: %s %s %s %s", - ctos ? "client->server" : "server->client", - newkeys->enc.name, - authlen == 0 ? newkeys->mac.name : "", - newkeys->comp.name); -+#ifdef SSH_AUDIT_EVENTS -+ audit_kex(ctos, newkeys->enc.name, newkeys->mac.name, newkeys->comp.name); -+#endif - } - choose_kex(kex, cprop[PROPOSAL_KEX_ALGS], sprop[PROPOSAL_KEX_ALGS]); - choose_hostkeyalg(kex, cprop[PROPOSAL_SERVER_HOST_KEY_ALGS], - sprop[PROPOSAL_SERVER_HOST_KEY_ALGS]); - need = dh_need = 0; - for (mode = 0; mode < MODE_MAX; mode++) { - newkeys = kex->newkeys[mode]; - need = MAX(need, newkeys->enc.key_len); -diff --git a/openssh-6.6p1/monitor.c b/openssh-6.6p1/monitor.c ---- a/openssh-6.6p1/monitor.c -+++ b/openssh-6.6p1/monitor.c -@@ -92,16 +92,17 @@ - #endif - #include "monitor_wrap.h" - #include "monitor_fdpass.h" - #include "misc.h" - #include "compat.h" - #include "ssh2.h" - #include "roaming.h" - #include "authfd.h" -+#include "audit.h" - - #ifdef GSSAPI - static Gssctxt *gsscontext = NULL; - #endif - - /* Imports */ - extern ServerOptions options; - extern u_int utmp_len; -@@ -176,16 +177,18 @@ int mm_answer_gss_accept_ctx(int, Buffer - int mm_answer_gss_userok(int, Buffer *); - int mm_answer_gss_checkmic(int, Buffer *); - #endif - - #ifdef SSH_AUDIT_EVENTS - int mm_answer_audit_event(int, Buffer *); - int mm_answer_audit_command(int, Buffer *); - int mm_answer_audit_end_command(int, Buffer *); -+int mm_answer_audit_unsupported_body(int, Buffer *); -+int mm_answer_audit_kex_body(int, Buffer *); - #endif - - static int monitor_read_log(struct monitor *); - - static Authctxt *authctxt; - static BIGNUM *ssh1_challenge = NULL; /* used for ssh1 rsa auth */ - - /* local state for key verify */ -@@ -227,16 +230,18 @@ struct mon_table mon_dispatch_proto20[] - {MONITOR_REQ_PAM_ACCOUNT, 0, mm_answer_pam_account}, - {MONITOR_REQ_PAM_INIT_CTX, MON_ISAUTH, mm_answer_pam_init_ctx}, - {MONITOR_REQ_PAM_QUERY, MON_ISAUTH, mm_answer_pam_query}, - {MONITOR_REQ_PAM_RESPOND, MON_ISAUTH, mm_answer_pam_respond}, - {MONITOR_REQ_PAM_FREE_CTX, MON_ONCE|MON_AUTHDECIDE, mm_answer_pam_free_ctx}, - #endif - #ifdef SSH_AUDIT_EVENTS - {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event}, -+ {MONITOR_REQ_AUDIT_UNSUPPORTED, MON_PERMIT, mm_answer_audit_unsupported_body}, -+ {MONITOR_REQ_AUDIT_KEX, MON_PERMIT, mm_answer_audit_kex_body}, - #endif - #ifdef BSD_AUTH - {MONITOR_REQ_BSDAUTHQUERY, MON_ISAUTH, mm_answer_bsdauthquery}, - {MONITOR_REQ_BSDAUTHRESPOND, MON_AUTH, mm_answer_bsdauthrespond}, - #endif - #ifdef SKEY - {MONITOR_REQ_SKEYQUERY, MON_ISAUTH, mm_answer_skeyquery}, - {MONITOR_REQ_SKEYRESPOND, MON_AUTH, mm_answer_skeyrespond}, -@@ -257,16 +262,18 @@ struct mon_table mon_dispatch_postauth20 - {MONITOR_REQ_SIGN, 0, mm_answer_sign}, - {MONITOR_REQ_PTY, 0, mm_answer_pty}, - {MONITOR_REQ_PTYCLEANUP, 0, mm_answer_pty_cleanup}, - {MONITOR_REQ_TERM, 0, mm_answer_term}, - #ifdef SSH_AUDIT_EVENTS - {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event}, - {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT, mm_answer_audit_command}, - {MONITOR_REQ_AUDIT_END_COMMAND, MON_PERMIT, mm_answer_audit_end_command}, -+ {MONITOR_REQ_AUDIT_UNSUPPORTED, MON_PERMIT, mm_answer_audit_unsupported_body}, -+ {MONITOR_REQ_AUDIT_KEX, MON_PERMIT, mm_answer_audit_kex_body}, - #endif - {0, 0, NULL} - }; - - struct mon_table mon_dispatch_proto15[] = { - {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow}, - {MONITOR_REQ_SESSKEY, MON_ONCE, mm_answer_sesskey}, - {MONITOR_REQ_SESSID, MON_ONCE, mm_answer_sessid}, -@@ -288,28 +295,32 @@ struct mon_table mon_dispatch_proto15[] - {MONITOR_REQ_PAM_ACCOUNT, 0, mm_answer_pam_account}, - {MONITOR_REQ_PAM_INIT_CTX, MON_ISAUTH, mm_answer_pam_init_ctx}, - {MONITOR_REQ_PAM_QUERY, MON_ISAUTH, mm_answer_pam_query}, - {MONITOR_REQ_PAM_RESPOND, MON_ISAUTH, mm_answer_pam_respond}, - {MONITOR_REQ_PAM_FREE_CTX, MON_ONCE|MON_AUTHDECIDE, mm_answer_pam_free_ctx}, - #endif - #ifdef SSH_AUDIT_EVENTS - {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event}, -+ {MONITOR_REQ_AUDIT_UNSUPPORTED, MON_PERMIT, mm_answer_audit_unsupported_body}, -+ {MONITOR_REQ_AUDIT_KEX, MON_PERMIT, mm_answer_audit_kex_body}, - #endif - {0, 0, NULL} - }; - - struct mon_table mon_dispatch_postauth15[] = { - {MONITOR_REQ_PTY, MON_ONCE, mm_answer_pty}, - {MONITOR_REQ_PTYCLEANUP, MON_ONCE, mm_answer_pty_cleanup}, - {MONITOR_REQ_TERM, 0, mm_answer_term}, - #ifdef SSH_AUDIT_EVENTS - {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event}, - {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT|MON_ONCE, mm_answer_audit_command}, - {MONITOR_REQ_AUDIT_END_COMMAND, MON_PERMIT, mm_answer_audit_end_command}, -+ {MONITOR_REQ_AUDIT_UNSUPPORTED, MON_PERMIT, mm_answer_audit_unsupported_body}, -+ {MONITOR_REQ_AUDIT_KEX, MON_PERMIT, mm_answer_audit_kex_body}, - #endif - {0, 0, NULL} - }; - - struct mon_table *mon_dispatch; - - /* Specifies if a certain message is allowed at the moment */ - -@@ -2187,8 +2198,52 @@ mm_answer_gss_userok(int sock, Buffer *m - - auth_method = "gssapi-with-mic"; - - /* Monitor loop will terminate if authenticated */ - return (authenticated); - } - #endif /* GSSAPI */ - -+#ifdef SSH_AUDIT_EVENTS -+int -+mm_answer_audit_unsupported_body(int sock, Buffer *m) -+{ -+ int what; -+ -+ what = buffer_get_int(m); -+ -+ audit_unsupported_body(what); -+ -+ buffer_clear(m); -+ -+ mm_request_send(sock, MONITOR_ANS_AUDIT_UNSUPPORTED, m); -+ return 0; -+} -+ -+int -+mm_answer_audit_kex_body(int sock, Buffer *m) -+{ -+ int ctos, len; -+ char *cipher, *mac, *compress; -+ pid_t pid; -+ uid_t uid; -+ -+ ctos = buffer_get_int(m); -+ cipher = buffer_get_string(m, &len); -+ mac = buffer_get_string(m, &len); -+ compress = buffer_get_string(m, &len); -+ pid = buffer_get_int64(m); -+ uid = buffer_get_int64(m); -+ -+ audit_kex_body(ctos, cipher, mac, compress, pid, uid); -+ -+ free(cipher); -+ free(mac); -+ free(compress); -+ buffer_clear(m); -+ -+ mm_request_send(sock, MONITOR_ANS_AUDIT_KEX, m); -+ return 0; -+} -+ -+#endif /* SSH_AUDIT_EVENTS */ -+ -diff --git a/openssh-6.6p1/monitor.h b/openssh-6.6p1/monitor.h ---- a/openssh-6.6p1/monitor.h -+++ b/openssh-6.6p1/monitor.h -@@ -60,16 +60,18 @@ enum monitor_reqtype { - MONITOR_REQ_PAM_START = 100, - MONITOR_REQ_PAM_ACCOUNT = 102, MONITOR_ANS_PAM_ACCOUNT = 103, - MONITOR_REQ_PAM_INIT_CTX = 104, MONITOR_ANS_PAM_INIT_CTX = 105, - MONITOR_REQ_PAM_QUERY = 106, MONITOR_ANS_PAM_QUERY = 107, - MONITOR_REQ_PAM_RESPOND = 108, MONITOR_ANS_PAM_RESPOND = 109, - MONITOR_REQ_PAM_FREE_CTX = 110, MONITOR_ANS_PAM_FREE_CTX = 111, - MONITOR_REQ_AUDIT_EVENT = 112, MONITOR_REQ_AUDIT_COMMAND = 113, - MONITOR_ANS_AUDIT_COMMAND = 114, MONITOR_REQ_AUDIT_END_COMMAND = 115, -+ MONITOR_REQ_AUDIT_UNSUPPORTED = 116, MONITOR_ANS_AUDIT_UNSUPPORTED = 117, -+ MONITOR_REQ_AUDIT_KEX = 118, MONITOR_ANS_AUDIT_KEX = 119, - - }; - - struct mm_master; - struct monitor { - int m_recvfd; - int m_sendfd; - int m_log_recvfd; -diff --git a/openssh-6.6p1/monitor_wrap.c b/openssh-6.6p1/monitor_wrap.c ---- a/openssh-6.6p1/monitor_wrap.c -+++ b/openssh-6.6p1/monitor_wrap.c -@@ -1320,8 +1320,46 @@ mm_ssh_gssapi_userok(char *user) - authenticated = buffer_get_int(&m); - - buffer_free(&m); - debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not "); - return (authenticated); - } - #endif /* GSSAPI */ - -+#ifdef SSH_AUDIT_EVENTS -+void -+mm_audit_unsupported_body(int what) -+{ -+ Buffer m; -+ -+ buffer_init(&m); -+ buffer_put_int(&m, what); -+ -+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUDIT_UNSUPPORTED, &m); -+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_AUDIT_UNSUPPORTED, -+ &m); -+ -+ buffer_free(&m); -+} -+ -+void -+mm_audit_kex_body(int ctos, char *cipher, char *mac, char *compress, pid_t pid, -+ uid_t uid) -+{ -+ Buffer m; -+ -+ buffer_init(&m); -+ buffer_put_int(&m, ctos); -+ buffer_put_cstring(&m, cipher ? cipher : ""); -+ buffer_put_cstring(&m, mac ? mac : ""); -+ buffer_put_cstring(&m, compress ? compress : ""); -+ buffer_put_int64(&m, pid); -+ buffer_put_int64(&m, uid); -+ -+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUDIT_KEX, &m); -+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_AUDIT_KEX, -+ &m); -+ -+ buffer_free(&m); -+} -+#endif /* SSH_AUDIT_EVENTS */ -+ -diff --git a/openssh-6.6p1/monitor_wrap.h b/openssh-6.6p1/monitor_wrap.h ---- a/openssh-6.6p1/monitor_wrap.h -+++ b/openssh-6.6p1/monitor_wrap.h -@@ -72,16 +72,18 @@ int mm_sshpam_respond(void *, u_int, cha - void mm_sshpam_free_ctx(void *); - #endif - - #ifdef SSH_AUDIT_EVENTS - #include "audit.h" - void mm_audit_event(ssh_audit_event_t); - int mm_audit_run_command(const char *); - void mm_audit_end_command(int, const char *); -+void mm_audit_unsupported_body(int); -+void mm_audit_kex_body(int, char *, char *, char *, pid_t, uid_t); - #endif - - struct Session; - void mm_terminate(void); - int mm_pty_allocate(int *, int *, char *, size_t); - void mm_session_pty_cleanup2(struct Session *); - - /* SSHv1 interfaces */ -diff --git a/openssh-6.6p1/sshd.c b/openssh-6.6p1/sshd.c ---- a/openssh-6.6p1/sshd.c -+++ b/openssh-6.6p1/sshd.c -@@ -2325,16 +2325,20 @@ do_ssh1_kex(void) - packet_disconnect("Warning: client selects unsupported cipher."); - - /* Get check bytes from the packet. These must match those we - sent earlier with the public key packet. */ - for (i = 0; i < 8; i++) - if (cookie[i] != packet_get_char()) - packet_disconnect("IP Spoofing check bytes do not match."); - -+#ifdef SSH_AUDIT_EVENTS -+ audit_kex(2, cipher_name(cipher_type), "crc", "none"); -+#endif -+ - debug("Encryption type: %.200s", cipher_name(cipher_type)); - - /* Get the encrypted integer. */ - if ((session_key_int = BN_new()) == NULL) - fatal("do_ssh1_kex: BN_new failed"); - packet_get_bignum(session_key_int); - - protocol_flags = packet_get_int(); diff --git a/openssh-6.6p1-audit5-session_key_destruction.patch b/openssh-6.6p1-audit5-session_key_destruction.patch deleted file mode 100644 index cee4029..0000000 --- a/openssh-6.6p1-audit5-session_key_destruction.patch +++ /dev/null @@ -1,983 +0,0 @@ -# session key destruction and auditing -# based on: -# https://bugzilla.mindrot.org/show_bug.cgi?id=1402 -# https://bugzilla.mindrot.org/attachment.cgi?id=2014 -# by jchadima@redhat.com - -diff --git a/openssh-6.6p1/audit-bsm.c b/openssh-6.6p1/audit-bsm.c ---- a/openssh-6.6p1/audit-bsm.c -+++ b/openssh-6.6p1/audit-bsm.c -@@ -480,9 +480,15 @@ audit_unsupported_body(int what) - /* not implemented */ - } - - void - audit_kex_body(int ctos, char *enc, char *mac, char *compress, pid_t pid, uid_t uid) - { - /* not implemented */ - } -+ -+void -+audit_session_key_free_body(int ctos, pid_t pid, uid_t uid) -+{ -+ /* not implemented */ -+} - #endif /* BSM */ -diff --git a/openssh-6.6p1/audit-linux.c b/openssh-6.6p1/audit-linux.c ---- a/openssh-6.6p1/audit-linux.c -+++ b/openssh-6.6p1/audit-linux.c -@@ -289,24 +289,25 @@ audit_unsupported_body(int what) - /* no problem, the next instruction will be fatal() */ - return; - audit_log_user_message(audit_fd, AUDIT_CRYPTO_SESSION, - buf, NULL, get_remote_ipaddr(), NULL, 0); - audit_close(audit_fd); - #endif - } - -+const static char *direction[] = { "from-server", "from-client", "both" }; -+ - void - audit_kex_body(int ctos, char *enc, char *mac, char *compress, pid_t pid, - uid_t uid) - { - #ifdef AUDIT_CRYPTO_SESSION - char buf[AUDIT_LOG_SIZE]; - int audit_fd, audit_ok; -- const static char *direction[] = { "from-server", "from-client", "both" }; - Cipher *cipher = cipher_by_name(enc); - char *s; - - snprintf(buf, sizeof(buf), "op=start direction=%s cipher=%s ksize=%d spid=%jd suid=%jd rport=%d laddr=%s lport=%d ", - direction[ctos], enc, cipher ? 8 * cipher->key_len : 0, - (intmax_t)pid, (intmax_t)uid, - get_remote_port(), (s = get_local_ipaddr(packet_get_connection_in())), get_local_port()); - free(s); -@@ -322,9 +323,37 @@ audit_kex_body(int ctos, char *enc, char - buf, NULL, get_remote_ipaddr(), NULL, 1); - audit_close(audit_fd); - /* do not abort if the error is EPERM and sshd is run as non root user */ - if ((audit_ok < 0) && ((audit_ok != -1) || (getuid() == 0))) - fatal("cannot write into audit"); /* Must prevent login */ - #endif - } - -+void -+audit_session_key_free_body(int ctos, pid_t pid, uid_t uid) -+{ -+ char buf[AUDIT_LOG_SIZE]; -+ int audit_fd, audit_ok; -+ char *s; -+ -+ snprintf(buf, sizeof(buf), "op=destroy kind=session fp=? direction=%s spid=%jd suid=%jd rport=%d laddr=%s lport=%d ", -+ direction[ctos], (intmax_t)pid, (intmax_t)uid, -+ get_remote_port(), -+ (s = get_local_ipaddr(packet_get_connection_in())), -+ get_local_port()); -+ free(s); -+ audit_fd = audit_open(); -+ if (audit_fd < 0) { -+ if (errno != EINVAL && errno != EPROTONOSUPPORT && -+ errno != EAFNOSUPPORT) -+ error("cannot open audit"); -+ return; -+ } -+ audit_ok = audit_log_user_message(audit_fd, AUDIT_CRYPTO_KEY_USER, -+ buf, NULL, get_remote_ipaddr(), NULL, 1); -+ audit_close(audit_fd); -+ /* do not abort if the error is EPERM and sshd is run as non root user */ -+ if ((audit_ok < 0) && ((audit_ok != -1) || (getuid() == 0))) -+ error("cannot write into audit"); -+} -+ - #endif /* USE_LINUX_AUDIT */ -diff --git a/openssh-6.6p1/audit.c b/openssh-6.6p1/audit.c ---- a/openssh-6.6p1/audit.c -+++ b/openssh-6.6p1/audit.c -@@ -138,16 +138,22 @@ audit_unsupported(int what) - } - - void - audit_kex(int ctos, char *enc, char *mac, char *comp) - { - PRIVSEP(audit_kex_body(ctos, enc, mac, comp, getpid(), getuid())); - } - -+void -+audit_session_key_free(int ctos) -+{ -+ PRIVSEP(audit_session_key_free_body(ctos, getpid(), getuid())); -+} -+ - # ifndef CUSTOM_SSH_AUDIT_EVENTS - /* - * Null implementations of audit functions. - * These get used if SSH_AUDIT_EVENTS is defined but no audit module is enabled. - */ - - /* - * Called after a connection has been accepted but before any authentication -@@ -269,10 +275,20 @@ audit_unsupported_body(int what) - void - audit_kex_body(int ctos, char *enc, char *mac, char *compress, pid_t pid, - uid_t uid) - { - debug("audit protocol negotiation euid %d direction %d cipher %s mac %s compresion %s from pid %ld uid %u", - (unsigned)geteuid(), ctos, enc, mac, compress, (long)pid, - (unsigned)uid); - } -+ -+/* -+ * This will be called on succesfull session key discard -+ */ -+void -+audit_session_key_free_body(int ctos, pid_t pid, uid_t uid) -+{ -+ debug("audit session key discard euid %u direction %d from pid %ld uid %u", -+ (unsigned)geteuid(), ctos, (long)pid, (unsigned)uid); -+} - # endif /* !defined CUSTOM_SSH_AUDIT_EVENTS */ - #endif /* SSH_AUDIT_EVENTS */ -diff --git a/openssh-6.6p1/audit.h b/openssh-6.6p1/audit.h ---- a/openssh-6.6p1/audit.h -+++ b/openssh-6.6p1/audit.h -@@ -57,10 +57,12 @@ int audit_run_command(const char *); - void audit_end_command(int, const char *); - ssh_audit_event_t audit_classify_auth(const char *); - int audit_keyusage(int, const char *, unsigned, char *, int); - void audit_key(int, int *, const Key *); - void audit_unsupported(int); - void audit_kex(int, char *, char *, char *); - void audit_unsupported_body(int); - void audit_kex_body(int, char *, char *, char *, pid_t, uid_t); -+void audit_session_key_free(int ctos); -+void audit_session_key_free_body(int ctos, pid_t, uid_t); - - #endif /* _SSH_AUDIT_H */ -diff --git a/openssh-6.6p1/auditstub.c b/openssh-6.6p1/auditstub.c ---- a/openssh-6.6p1/auditstub.c -+++ b/openssh-6.6p1/auditstub.c -@@ -22,18 +22,29 @@ - * 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. - * - * Red Hat author: Jan F. Chadima - */ - -+#include -+ - void - audit_unsupported(int n) - { - } - - void - audit_kex(int ctos, char *enc, char *mac, char *comp) - { - } - -+void -+audit_session_key_free(int ctos) -+{ -+} -+ -+void -+audit_session_key_free_body(int ctos, pid_t pid, uid_t uid) -+{ -+} -diff --git a/openssh-6.6p1/kex.c b/openssh-6.6p1/kex.c ---- a/openssh-6.6p1/kex.c -+++ b/openssh-6.6p1/kex.c -@@ -700,8 +700,39 @@ dump_digest(char *msg, u_char *digest, i - if (i%32 == 31) - fprintf(stderr, "\n"); - else if (i%8 == 7) - fprintf(stderr, " "); - } - fprintf(stderr, "\n"); - } - #endif -+ -+static void -+enc_destroy(Enc *enc) -+{ -+ if (enc == NULL) -+ return; -+ -+ if (enc->key) { -+ memset(enc->key, 0, enc->key_len); -+ free(enc->key); -+ } -+ -+ if (enc->iv) { -+ memset(enc->iv, 0, enc->block_size); -+ free(enc->iv); -+ } -+ -+ memset(enc, 0, sizeof(*enc)); -+} -+ -+void -+newkeys_destroy(Newkeys *newkeys) -+{ -+ if (newkeys == NULL) -+ return; -+ -+ enc_destroy(&newkeys->enc); -+ mac_destroy(&newkeys->mac); -+ memset(&newkeys->comp, 0, sizeof(newkeys->comp)); -+} -+ -diff --git a/openssh-6.6p1/kex.h b/openssh-6.6p1/kex.h ---- a/openssh-6.6p1/kex.h -+++ b/openssh-6.6p1/kex.h -@@ -162,16 +162,18 @@ void kexdh_client(Kex *); - void kexdh_server(Kex *); - void kexgex_client(Kex *); - void kexgex_server(Kex *); - void kexecdh_client(Kex *); - void kexecdh_server(Kex *); - void kexc25519_client(Kex *); - void kexc25519_server(Kex *); - -+void newkeys_destroy(Newkeys *newkeys); -+ - void - kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int, - BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *); - void - kexgex_hash(int, char *, char *, char *, int, char *, - int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, - BIGNUM *, BIGNUM *, u_char **, u_int *); - #ifdef OPENSSL_HAS_ECC -diff --git a/openssh-6.6p1/mac.c b/openssh-6.6p1/mac.c ---- a/openssh-6.6p1/mac.c -+++ b/openssh-6.6p1/mac.c -@@ -253,16 +253,30 @@ mac_clear(Mac *mac) - if (mac->umac_ctx != NULL) - umac128_delete(mac->umac_ctx); - } else if (mac->hmac_ctx != NULL) - ssh_hmac_free(mac->hmac_ctx); - mac->hmac_ctx = NULL; - mac->umac_ctx = NULL; - } - -+void -+mac_destroy(Mac *mac) -+{ -+ if (mac == NULL) -+ return; -+ -+ if (mac->key) { -+ memset(mac->key, 0, mac->key_len); -+ free(mac->key); -+ } -+ -+ memset(mac, 0, sizeof(*mac)); -+} -+ - /* XXX copied from ciphers_valid */ - #define MAC_SEP "," - int - mac_valid(const char *names) - { - char *maclist, *cp, *p; - - if (names == NULL || strcmp(names, "") == 0) -diff --git a/openssh-6.6p1/mac.h b/openssh-6.6p1/mac.h ---- a/openssh-6.6p1/mac.h -+++ b/openssh-6.6p1/mac.h -@@ -24,8 +24,9 @@ - */ - - int mac_valid(const char *); - char *mac_alg_list(char); - int mac_setup(Mac *, char *); - int mac_init(Mac *); - u_char *mac_compute(Mac *, u_int32_t, u_char *, int); - void mac_clear(Mac *); -+void mac_destroy(Mac *); -diff --git a/openssh-6.6p1/monitor.c b/openssh-6.6p1/monitor.c ---- a/openssh-6.6p1/monitor.c -+++ b/openssh-6.6p1/monitor.c -@@ -179,16 +179,17 @@ int mm_answer_gss_checkmic(int, Buffer * - #endif - - #ifdef SSH_AUDIT_EVENTS - int mm_answer_audit_event(int, Buffer *); - int mm_answer_audit_command(int, Buffer *); - int mm_answer_audit_end_command(int, Buffer *); - int mm_answer_audit_unsupported_body(int, Buffer *); - int mm_answer_audit_kex_body(int, Buffer *); -+int mm_answer_audit_session_key_free_body(int, Buffer *); - #endif - - static int monitor_read_log(struct monitor *); - - static Authctxt *authctxt; - static BIGNUM *ssh1_challenge = NULL; /* used for ssh1 rsa auth */ - - /* local state for key verify */ -@@ -232,16 +233,17 @@ struct mon_table mon_dispatch_proto20[] - {MONITOR_REQ_PAM_QUERY, MON_ISAUTH, mm_answer_pam_query}, - {MONITOR_REQ_PAM_RESPOND, MON_ISAUTH, mm_answer_pam_respond}, - {MONITOR_REQ_PAM_FREE_CTX, MON_ONCE|MON_AUTHDECIDE, mm_answer_pam_free_ctx}, - #endif - #ifdef SSH_AUDIT_EVENTS - {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event}, - {MONITOR_REQ_AUDIT_UNSUPPORTED, MON_PERMIT, mm_answer_audit_unsupported_body}, - {MONITOR_REQ_AUDIT_KEX, MON_PERMIT, mm_answer_audit_kex_body}, -+ {MONITOR_REQ_AUDIT_SESSION_KEY_FREE, MON_PERMIT, mm_answer_audit_session_key_free_body}, - #endif - #ifdef BSD_AUTH - {MONITOR_REQ_BSDAUTHQUERY, MON_ISAUTH, mm_answer_bsdauthquery}, - {MONITOR_REQ_BSDAUTHRESPOND, MON_AUTH, mm_answer_bsdauthrespond}, - #endif - #ifdef SKEY - {MONITOR_REQ_SKEYQUERY, MON_ISAUTH, mm_answer_skeyquery}, - {MONITOR_REQ_SKEYRESPOND, MON_AUTH, mm_answer_skeyrespond}, -@@ -264,16 +266,17 @@ struct mon_table mon_dispatch_postauth20 - {MONITOR_REQ_PTYCLEANUP, 0, mm_answer_pty_cleanup}, - {MONITOR_REQ_TERM, 0, mm_answer_term}, - #ifdef SSH_AUDIT_EVENTS - {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event}, - {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT, mm_answer_audit_command}, - {MONITOR_REQ_AUDIT_END_COMMAND, MON_PERMIT, mm_answer_audit_end_command}, - {MONITOR_REQ_AUDIT_UNSUPPORTED, MON_PERMIT, mm_answer_audit_unsupported_body}, - {MONITOR_REQ_AUDIT_KEX, MON_PERMIT, mm_answer_audit_kex_body}, -+ {MONITOR_REQ_AUDIT_SESSION_KEY_FREE, MON_PERMIT, mm_answer_audit_session_key_free_body}, - #endif - {0, 0, NULL} - }; - - struct mon_table mon_dispatch_proto15[] = { - {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow}, - {MONITOR_REQ_SESSKEY, MON_ONCE, mm_answer_sesskey}, - {MONITOR_REQ_SESSID, MON_ONCE, mm_answer_sessid}, -@@ -297,30 +300,32 @@ struct mon_table mon_dispatch_proto15[] - {MONITOR_REQ_PAM_QUERY, MON_ISAUTH, mm_answer_pam_query}, - {MONITOR_REQ_PAM_RESPOND, MON_ISAUTH, mm_answer_pam_respond}, - {MONITOR_REQ_PAM_FREE_CTX, MON_ONCE|MON_AUTHDECIDE, mm_answer_pam_free_ctx}, - #endif - #ifdef SSH_AUDIT_EVENTS - {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event}, - {MONITOR_REQ_AUDIT_UNSUPPORTED, MON_PERMIT, mm_answer_audit_unsupported_body}, - {MONITOR_REQ_AUDIT_KEX, MON_PERMIT, mm_answer_audit_kex_body}, -+ {MONITOR_REQ_AUDIT_SESSION_KEY_FREE, MON_PERMIT, mm_answer_audit_session_key_free_body}, - #endif - {0, 0, NULL} - }; - - struct mon_table mon_dispatch_postauth15[] = { - {MONITOR_REQ_PTY, MON_ONCE, mm_answer_pty}, - {MONITOR_REQ_PTYCLEANUP, MON_ONCE, mm_answer_pty_cleanup}, - {MONITOR_REQ_TERM, 0, mm_answer_term}, - #ifdef SSH_AUDIT_EVENTS - {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event}, - {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT|MON_ONCE, mm_answer_audit_command}, - {MONITOR_REQ_AUDIT_END_COMMAND, MON_PERMIT, mm_answer_audit_end_command}, - {MONITOR_REQ_AUDIT_UNSUPPORTED, MON_PERMIT, mm_answer_audit_unsupported_body}, - {MONITOR_REQ_AUDIT_KEX, MON_PERMIT, mm_answer_audit_kex_body}, -+ {MONITOR_REQ_AUDIT_SESSION_KEY_FREE, MON_PERMIT, mm_answer_audit_session_key_free_body}, - #endif - {0, 0, NULL} - }; - - struct mon_table *mon_dispatch; - - /* Specifies if a certain message is allowed at the moment */ - -@@ -1949,21 +1954,23 @@ mm_get_keystate(struct monitor *pmonitor - goto skip; - } else { - /* Get the Kex for rekeying */ - *pmonitor->m_pkex = mm_get_kex(&m); - } - - blob = buffer_get_string(&m, &bloblen); - current_keys[MODE_OUT] = mm_newkeys_from_blob(blob, bloblen); -+ memset(blob, 0, bloblen); - free(blob); - - debug3("%s: Waiting for second key", __func__); - blob = buffer_get_string(&m, &bloblen); - current_keys[MODE_IN] = mm_newkeys_from_blob(blob, bloblen); -+ memset(blob, 0, bloblen); - free(blob); - - /* Now get sequence numbers for the packets */ - seqnr = buffer_get_int(&m); - blocks = buffer_get_int64(&m); - packets = buffer_get_int(&m); - bytes = buffer_get_int64(&m); - packet_set_state(MODE_OUT, seqnr, blocks, packets, bytes); -@@ -1999,16 +2006,31 @@ mm_get_keystate(struct monitor *pmonitor - - /* Roaming */ - if (compat20) { - child_state.sent_bytes = buffer_get_int64(&m); - child_state.recv_bytes = buffer_get_int64(&m); - } - - buffer_free(&m); -+ -+#ifdef SSH_AUDIT_EVENTS -+ if (compat20) { -+ buffer_init(&m); -+ mm_request_receive_expect(pmonitor->m_sendfd, -+ MONITOR_REQ_AUDIT_SESSION_KEY_FREE, &m); -+ mm_answer_audit_session_key_free_body(pmonitor->m_sendfd, &m); -+ buffer_free(&m); -+ } -+#endif -+ -+ /* Drain any buffered messages from the child */ -+ while (pmonitor->m_log_recvfd >= 0 && monitor_read_log(pmonitor) == 0) -+ ; -+ - } - - - /* Allocation functions for zlib */ - void * - mm_zalloc(struct mm_master *mm, u_int ncount, u_int size) - { - size_t len = (size_t) size * ncount; -@@ -2240,10 +2262,28 @@ mm_answer_audit_kex_body(int sock, Buffe - free(mac); - free(compress); - buffer_clear(m); - - mm_request_send(sock, MONITOR_ANS_AUDIT_KEX, m); - return 0; - } - -+int -+mm_answer_audit_session_key_free_body(int sock, Buffer *m) -+{ -+ int ctos; -+ pid_t pid; -+ uid_t uid; -+ -+ ctos = buffer_get_int(m); -+ pid = buffer_get_int64(m); -+ uid = buffer_get_int64(m); -+ -+ audit_session_key_free_body(ctos, pid, uid); -+ -+ buffer_clear(m); -+ -+ mm_request_send(sock, MONITOR_ANS_AUDIT_SESSION_KEY_FREE, m); -+ return 0; -+} - #endif /* SSH_AUDIT_EVENTS */ - -diff --git a/openssh-6.6p1/monitor.h b/openssh-6.6p1/monitor.h ---- a/openssh-6.6p1/monitor.h -+++ b/openssh-6.6p1/monitor.h -@@ -62,16 +62,17 @@ enum monitor_reqtype { - MONITOR_REQ_PAM_INIT_CTX = 104, MONITOR_ANS_PAM_INIT_CTX = 105, - MONITOR_REQ_PAM_QUERY = 106, MONITOR_ANS_PAM_QUERY = 107, - MONITOR_REQ_PAM_RESPOND = 108, MONITOR_ANS_PAM_RESPOND = 109, - MONITOR_REQ_PAM_FREE_CTX = 110, MONITOR_ANS_PAM_FREE_CTX = 111, - MONITOR_REQ_AUDIT_EVENT = 112, MONITOR_REQ_AUDIT_COMMAND = 113, - MONITOR_ANS_AUDIT_COMMAND = 114, MONITOR_REQ_AUDIT_END_COMMAND = 115, - MONITOR_REQ_AUDIT_UNSUPPORTED = 116, MONITOR_ANS_AUDIT_UNSUPPORTED = 117, - MONITOR_REQ_AUDIT_KEX = 118, MONITOR_ANS_AUDIT_KEX = 119, -+ MONITOR_REQ_AUDIT_SESSION_KEY_FREE = 120, MONITOR_ANS_AUDIT_SESSION_KEY_FREE = 121, - - }; - - struct mm_master; - struct monitor { - int m_recvfd; - int m_sendfd; - int m_log_recvfd; -diff --git a/openssh-6.6p1/monitor_wrap.c b/openssh-6.6p1/monitor_wrap.c ---- a/openssh-6.6p1/monitor_wrap.c -+++ b/openssh-6.6p1/monitor_wrap.c -@@ -649,22 +649,24 @@ mm_send_keystate(struct monitor *monitor - __func__, packet_get_newkeys(MODE_OUT), - packet_get_newkeys(MODE_IN)); - - /* Keys from Kex */ - if (!mm_newkeys_to_blob(MODE_OUT, &blob, &bloblen)) - fatal("%s: conversion of newkeys failed", __func__); - - buffer_put_string(&m, blob, bloblen); -+ memset(blob, 0, bloblen); - free(blob); - - if (!mm_newkeys_to_blob(MODE_IN, &blob, &bloblen)) - fatal("%s: conversion of newkeys failed", __func__); - - buffer_put_string(&m, blob, bloblen); -+ memset(blob, 0, bloblen); - free(blob); - - packet_get_state(MODE_OUT, &seqnr, &blocks, &packets, &bytes); - buffer_put_int(&m, seqnr); - buffer_put_int64(&m, blocks); - buffer_put_int(&m, packets); - buffer_put_int64(&m, bytes); - packet_get_state(MODE_IN, &seqnr, &blocks, &packets, &bytes); -@@ -1356,10 +1358,25 @@ mm_audit_kex_body(int ctos, char *cipher - buffer_put_int64(&m, uid); - - mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUDIT_KEX, &m); - mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_AUDIT_KEX, - &m); - - buffer_free(&m); - } -+ -+void -+mm_audit_session_key_free_body(int ctos, pid_t pid, uid_t uid) -+{ -+ Buffer m; -+ -+ buffer_init(&m); -+ buffer_put_int(&m, ctos); -+ buffer_put_int64(&m, pid); -+ buffer_put_int64(&m, uid); -+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUDIT_SESSION_KEY_FREE, &m); -+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_AUDIT_SESSION_KEY_FREE, -+ &m); -+ buffer_free(&m); -+} - #endif /* SSH_AUDIT_EVENTS */ - -diff --git a/openssh-6.6p1/monitor_wrap.h b/openssh-6.6p1/monitor_wrap.h ---- a/openssh-6.6p1/monitor_wrap.h -+++ b/openssh-6.6p1/monitor_wrap.h -@@ -74,16 +74,17 @@ void mm_sshpam_free_ctx(void *); - - #ifdef SSH_AUDIT_EVENTS - #include "audit.h" - void mm_audit_event(ssh_audit_event_t); - int mm_audit_run_command(const char *); - void mm_audit_end_command(int, const char *); - void mm_audit_unsupported_body(int); - void mm_audit_kex_body(int, char *, char *, char *, pid_t, uid_t); -+void mm_audit_session_key_free_body(int, pid_t, uid_t); - #endif - - struct Session; - void mm_terminate(void); - int mm_pty_allocate(int *, int *, char *, size_t); - void mm_session_pty_cleanup2(struct Session *); - - /* SSHv1 interfaces */ -diff --git a/openssh-6.6p1/packet.c b/openssh-6.6p1/packet.c ---- a/openssh-6.6p1/packet.c -+++ b/openssh-6.6p1/packet.c -@@ -56,16 +56,17 @@ - #include - #include - #include - #include - #include - #include - - #include "xmalloc.h" -+#include "audit.h" - #include "buffer.h" - #include "packet.h" - #include "crc32.h" - #include "compress.h" - #include "deattack.h" - #include "channels.h" - #include "compat.h" - #include "ssh1.h" -@@ -469,41 +470,51 @@ packet_get_connection_in(void) - /* Returns the descriptor used for writing. */ - - int - packet_get_connection_out(void) - { - return active_state->connection_out; - } - -+static int -+packet_state_has_keys (const struct session_state *state) -+{ -+ return state != NULL && -+ (state->newkeys[MODE_IN] != NULL || state->newkeys[MODE_OUT] != NULL); -+} -+ - /* Closes the connection and clears and frees internal data structures. */ - - void - packet_close(void) - { - if (!active_state->initialized) - return; - active_state->initialized = 0; -- if (active_state->connection_in == active_state->connection_out) { -- shutdown(active_state->connection_out, SHUT_RDWR); -- close(active_state->connection_out); -- } else { -- close(active_state->connection_in); -- close(active_state->connection_out); -- } - buffer_free(&active_state->input); - buffer_free(&active_state->output); - buffer_free(&active_state->outgoing_packet); - buffer_free(&active_state->incoming_packet); - if (active_state->compression_buffer_ready) { - buffer_free(&active_state->compression_buffer); - buffer_compress_uninit(); - } -- cipher_cleanup(&active_state->send_context); -- cipher_cleanup(&active_state->receive_context); -+ if (packet_state_has_keys(active_state)) { -+ cipher_cleanup(&active_state->send_context); -+ cipher_cleanup(&active_state->receive_context); -+ audit_session_key_free(2); -+ } -+ if (active_state->connection_in == active_state->connection_out) { -+ shutdown(active_state->connection_out, SHUT_RDWR); -+ close(active_state->connection_out); -+ } else { -+ close(active_state->connection_in); -+ close(active_state->connection_out); -+ } - } - - /* Sets remote side protocol flags. */ - - void - packet_set_protocol_flags(u_int protocol_flags) - { - active_state->remote_protocol_flags = protocol_flags; -@@ -729,16 +740,35 @@ packet_send1(void) - - /* - * Note that the packet is now only buffered in output. It won't be - * actually sent until packet_write_wait or packet_write_poll is - * called. - */ - } - -+static void -+newkeys_destroy_and_free(Newkeys *newkeys) -+{ -+ if (newkeys == NULL) -+ return; -+ -+ free(newkeys->enc.name); -+ -+ mac_clear(&newkeys->mac); -+ /* MAC may happen to be empty - if the GCM mode of AES is used */ -+ if (newkeys->mac.name) -+ free(newkeys->mac.name); -+ -+ free(newkeys->comp.name); -+ -+ newkeys_destroy(newkeys); -+ free(newkeys); -+} -+ - void - set_newkeys(int mode) - { - Enc *enc; - Mac *mac; - Comp *comp; - CipherContext *cc; - u_int64_t *max_blocks; -@@ -754,31 +784,19 @@ set_newkeys(int mode) - } else { - cc = &active_state->receive_context; - crypt_type = CIPHER_DECRYPT; - active_state->p_read.packets = active_state->p_read.blocks = 0; - max_blocks = &active_state->max_blocks_in; - } - if (active_state->newkeys[mode] != NULL) { - debug("set_newkeys: rekeying"); -+ audit_session_key_free(mode); - cipher_cleanup(cc); -- enc = &active_state->newkeys[mode]->enc; -- mac = &active_state->newkeys[mode]->mac; -- comp = &active_state->newkeys[mode]->comp; -- mac_clear(mac); -- explicit_bzero(enc->iv, enc->iv_len); -- explicit_bzero(enc->key, enc->key_len); -- explicit_bzero(mac->key, mac->key_len); -- free(enc->name); -- free(enc->iv); -- free(enc->key); -- free(mac->name); -- free(mac->key); -- free(comp->name); -- free(active_state->newkeys[mode]); -+ newkeys_destroy_and_free(active_state->newkeys[mode]); - } - active_state->newkeys[mode] = kex_get_newkeys(mode); - if (active_state->newkeys[mode] == NULL) - fatal("newkeys: no keys for mode %d", mode); - enc = &active_state->newkeys[mode]->enc; - mac = &active_state->newkeys[mode]->mac; - comp = &active_state->newkeys[mode]->comp; - if (cipher_authlen(enc->cipher) == 0 && mac_init(mac) == 0) -@@ -2004,54 +2022,93 @@ packet_get_output(void) - } - - void * - packet_get_newkeys(int mode) - { - return (void *)active_state->newkeys[mode]; - } - -+static void -+packet_destroy_state(struct session_state *state) -+{ -+ if (state == NULL) -+ return; -+ -+ cipher_cleanup(&state->receive_context); -+ cipher_cleanup(&state->send_context); -+ -+ buffer_free(&state->input); -+ buffer_free(&state->output); -+ buffer_free(&state->outgoing_packet); -+ buffer_free(&state->incoming_packet); -+ buffer_free(&state->compression_buffer); -+ newkeys_destroy_and_free(state->newkeys[MODE_IN]); -+ state->newkeys[MODE_IN] = NULL; -+ newkeys_destroy_and_free(state->newkeys[MODE_OUT]); -+ state->newkeys[MODE_OUT] = NULL; -+ mac_destroy(state->packet_discard_mac); -+// TAILQ_HEAD(, packet) outgoing; -+// memset(state, 0, sizeof(state)); -+} -+ -+void -+packet_destroy_all(int audit_it, int privsep) -+{ -+ if (audit_it) -+ audit_it = packet_state_has_keys (active_state) || -+ packet_state_has_keys (backup_state); -+ packet_destroy_state(active_state); -+ packet_destroy_state(backup_state); -+ if (audit_it) { -+#ifdef SSH_AUDIT_EVENTS -+ if (privsep) -+ audit_session_key_free(2); -+ else -+ audit_session_key_free_body(2, getpid(), getuid()); -+#endif -+ } -+} -+ - /* - * Save the state for the real connection, and use a separate state when - * resuming a suspended connection. - */ - void - packet_backup_state(void) - { -- struct session_state *tmp; -- - close(active_state->connection_in); - active_state->connection_in = -1; - close(active_state->connection_out); - active_state->connection_out = -1; -- if (backup_state) -- tmp = backup_state; -- else -- tmp = alloc_session_state(); - backup_state = active_state; -- active_state = tmp; -+ active_state = alloc_session_state(); - } - - /* - * Swap in the old state when resuming a connecion. - */ - void - packet_restore_state(void) - { - struct session_state *tmp; - void *buf; - u_int len; - - tmp = backup_state; - backup_state = active_state; - active_state = tmp; - active_state->connection_in = backup_state->connection_in; -- backup_state->connection_in = -1; - active_state->connection_out = backup_state->connection_out; -- backup_state->connection_out = -1; - len = buffer_len(&backup_state->input); - if (len > 0) { - buf = buffer_ptr(&backup_state->input); - buffer_append(&active_state->input, buf, len); - buffer_clear(&backup_state->input); - add_recv_bytes(len); - } -+ backup_state->connection_in = -1; -+ backup_state->connection_out = -1; -+ packet_destroy_state(backup_state); -+ free(backup_state); -+ backup_state = NULL; - } -+ -diff --git a/openssh-6.6p1/packet.h b/openssh-6.6p1/packet.h ---- a/openssh-6.6p1/packet.h -+++ b/openssh-6.6p1/packet.h -@@ -119,9 +119,10 @@ void packet_set_rekey_limits(u_int32_t, - time_t packet_get_rekey_timeout(void); - - void packet_backup_state(void); - void packet_restore_state(void); - - void *packet_get_input(void); - void *packet_get_output(void); - -+void packet_destroy_all(int, int); - #endif /* PACKET_H */ -diff --git a/openssh-6.6p1/session.c b/openssh-6.6p1/session.c ---- a/openssh-6.6p1/session.c -+++ b/openssh-6.6p1/session.c -@@ -1694,16 +1694,19 @@ do_child(Session *s, const char *command - int env_size; - char *argv[ARGV_MAX]; - const char *shell, *shell0, *hostname = NULL; - struct passwd *pw = s->pw; - int r = 0; - - /* remove hostkey from the child's memory */ - destroy_sensitive_data(); -+ /* Don't audit this - both us and the parent would be talking to the -+ monitor over a single socket, with no synchronization. */ -+ packet_destroy_all(0, 1); - - /* Force a password change */ - if (s->authctxt->force_pwchange) { - do_setusercontext(pw); - child_close_fds(); - do_pwchange(s); - exit(1); - } -diff --git a/openssh-6.6p1/sshd.c b/openssh-6.6p1/sshd.c ---- a/openssh-6.6p1/sshd.c -+++ b/openssh-6.6p1/sshd.c -@@ -720,16 +720,18 @@ privsep_preauth(Authctxt *authctxt) - setproctitle("%s", "[net]"); - if (box != NULL) - ssh_sandbox_child(box); - - return 0; - } - } - -+extern Newkeys *current_keys[]; -+ - static void - privsep_postauth(Authctxt *authctxt) - { - u_int32_t rnd[256]; - - #ifdef DISABLE_FD_PASSING - if (1) { - #else -@@ -744,16 +746,20 @@ privsep_postauth(Authctxt *authctxt) - monitor_reinit(pmonitor); - - pmonitor->m_pid = fork(); - if (pmonitor->m_pid == -1) - fatal("fork of unprivileged child failed"); - else if (pmonitor->m_pid != 0) { - verbose("User child is on pid %ld", (long)pmonitor->m_pid); - buffer_clear(&loginmsg); -+ newkeys_destroy(current_keys[MODE_OUT]); -+ newkeys_destroy(current_keys[MODE_IN]); -+ audit_session_key_free_body(2, getpid(), getuid()); -+ packet_destroy_all(0, 0); - monitor_child_postauth(pmonitor); - - /* NEVERREACHED */ - exit(0); - } - - /* child */ - -@@ -2118,16 +2124,17 @@ main(int ac, char **av) - do_authentication(authctxt); - } - /* - * If we use privilege separation, the unprivileged child transfers - * the current keystate and exits - */ - if (use_privsep) { - mm_send_keystate(pmonitor); -+ packet_destroy_all(1, 1); - exit(0); - } - - authenticated: - /* - * Cancel the alarm we set to limit the time taken for - * authentication. - */ -@@ -2170,16 +2177,18 @@ main(int ac, char **av) - - packet_set_timeout(options.client_alive_interval, - options.client_alive_count_max); - - /* Start session. */ - do_authenticated(authctxt); - - /* The connection has been terminated. */ -+ packet_destroy_all(1, 1); -+ - packet_get_state(MODE_IN, NULL, NULL, NULL, &ibytes); - packet_get_state(MODE_OUT, NULL, NULL, NULL, &obytes); - verbose("Transferred: sent %llu, received %llu bytes", - (unsigned long long)obytes, (unsigned long long)ibytes); - - verbose("Closing connection to %.500s port %d", remote_ip, remote_port); - - #ifdef USE_PAM -@@ -2526,26 +2535,38 @@ do_ssh2_kex(void) - #endif - debug("KEX done"); - } - - /* server specific fatal cleanup */ - void - cleanup_exit(int i) - { -+ static int in_cleanup = 0; -+ int is_privsep_child; -+ -+ /* cleanup_exit can be called at the very least from the privsep -+ wrappers used for auditing. Make sure we don't recurse -+ indefinitely. */ -+ if (in_cleanup) -+ _exit(i); -+ in_cleanup = 1; -+ - if (the_authctxt) { - do_cleanup(the_authctxt); - if (use_privsep && privsep_is_preauth && pmonitor->m_pid > 1) { - debug("Killing privsep child %d", pmonitor->m_pid); - if (kill(pmonitor->m_pid, SIGKILL) != 0 && - errno != ESRCH) - error("%s: kill(%d): %s", __func__, - pmonitor->m_pid, strerror(errno)); - } - } -+ is_privsep_child = use_privsep && (pmonitor != NULL) && !mm_is_monitor(); -+ packet_destroy_all(1, is_privsep_child); - #ifdef SSH_AUDIT_EVENTS - /* done after do_cleanup so it can cancel the PAM auth 'thread' */ - if ((the_authctxt == NULL || !the_authctxt->authenticated) && - (!use_privsep || mm_is_monitor())) - audit_event(SSH_CONNECTION_ABANDON); - #endif - _exit(i); - } diff --git a/openssh-6.6p1-audit6-server_key_destruction.patch b/openssh-6.6p1-audit6-server_key_destruction.patch deleted file mode 100644 index 73821e8..0000000 --- a/openssh-6.6p1-audit6-server_key_destruction.patch +++ /dev/null @@ -1,742 +0,0 @@ -# server key destruction and auditing -# based on: -# https://bugzilla.mindrot.org/show_bug.cgi?id=1402 -# https://bugzilla.mindrot.org/attachment.cgi?id=2015 -# by jchadima@redhat.com - -diff --git a/openssh-6.6p1/audit-bsm.c b/openssh-6.6p1/audit-bsm.c ---- a/openssh-6.6p1/audit-bsm.c -+++ b/openssh-6.6p1/audit-bsm.c -@@ -486,9 +486,27 @@ audit_kex_body(int ctos, char *enc, char - /* not implemented */ - } - - void - audit_session_key_free_body(int ctos, pid_t pid, uid_t uid) - { - /* not implemented */ - } -+ -+void -+audit_destroy_sensitive_data(const char *fp) -+{ -+ /* not implemented */ -+} -+ -+void -+audit_destroy_sensitive_data(const char *fp, pid_t pid, uid_t uid) -+{ -+ /* not implemented */ -+} -+ -+void -+audit_generate_ephemeral_server_key(const char *fp) -+{ -+ /* not implemented */ -+} - #endif /* BSM */ -diff --git a/openssh-6.6p1/audit-linux.c b/openssh-6.6p1/audit-linux.c ---- a/openssh-6.6p1/audit-linux.c -+++ b/openssh-6.6p1/audit-linux.c -@@ -351,9 +351,55 @@ audit_session_key_free_body(int ctos, pi - audit_ok = audit_log_user_message(audit_fd, AUDIT_CRYPTO_KEY_USER, - buf, NULL, get_remote_ipaddr(), NULL, 1); - audit_close(audit_fd); - /* do not abort if the error is EPERM and sshd is run as non root user */ - if ((audit_ok < 0) && ((audit_ok != -1) || (getuid() == 0))) - error("cannot write into audit"); - } - -+void -+audit_destroy_sensitive_data(const char *fp, pid_t pid, uid_t uid) -+{ -+ char buf[AUDIT_LOG_SIZE]; -+ int audit_fd, audit_ok; -+ -+ snprintf(buf, sizeof(buf), "op=destroy kind=server fp=%s direction=? spid=%jd suid=%jd ", -+ fp, (intmax_t)pid, (intmax_t)uid); -+ audit_fd = audit_open(); -+ if (audit_fd < 0) { -+ if (errno != EINVAL && errno != EPROTONOSUPPORT && -+ errno != EAFNOSUPPORT) -+ error("cannot open audit"); -+ return; -+ } -+ audit_ok = audit_log_user_message(audit_fd, AUDIT_CRYPTO_KEY_USER, -+ buf, NULL, -+ listening_for_clients() ? NULL : get_remote_ipaddr(), -+ NULL, 1); -+ audit_close(audit_fd); -+ /* do not abort if the error is EPERM and sshd is run as non root user */ -+ if ((audit_ok < 0) && ((audit_ok != -1) || (getuid() == 0))) -+ error("cannot write into audit"); -+} -+ -+void -+audit_generate_ephemeral_server_key(const char *fp) -+{ -+ char buf[AUDIT_LOG_SIZE]; -+ int audit_fd, audit_ok; -+ -+ snprintf(buf, sizeof(buf), "op=create kind=server fp=%s direction=? ", fp); -+ audit_fd = audit_open(); -+ if (audit_fd < 0) { -+ if (errno != EINVAL && errno != EPROTONOSUPPORT && -+ errno != EAFNOSUPPORT) -+ error("cannot open audit"); -+ return; -+ } -+ audit_ok = audit_log_user_message(audit_fd, AUDIT_CRYPTO_KEY_USER, -+ buf, NULL, 0, NULL, 1); -+ audit_close(audit_fd); -+ /* do not abort if the error is EPERM and sshd is run as non root user */ -+ if ((audit_ok < 0) && ((audit_ok != -1) || (getuid() == 0))) -+ error("cannot write into audit"); -+} - #endif /* USE_LINUX_AUDIT */ -diff --git a/openssh-6.6p1/audit.c b/openssh-6.6p1/audit.c ---- a/openssh-6.6p1/audit.c -+++ b/openssh-6.6p1/audit.c -@@ -285,10 +285,29 @@ audit_kex_body(int ctos, char *enc, char - * This will be called on succesfull session key discard - */ - void - audit_session_key_free_body(int ctos, pid_t pid, uid_t uid) - { - debug("audit session key discard euid %u direction %d from pid %ld uid %u", - (unsigned)geteuid(), ctos, (long)pid, (unsigned)uid); - } -+ -+/* -+ * This will be called on destroy private part of the server key -+ */ -+void -+audit_destroy_sensitive_data(const char *fp, pid_t pid, uid_t uid) -+{ -+ debug("audit destroy sensitive data euid %d fingerprint %s from pid %ld uid %u", -+ geteuid(), fp, (long)pid, (unsigned)uid); -+} -+ -+/* -+ * This will be called on generation of the ephemeral server key -+ */ -+void -+audit_generate_ephemeral_server_key(const char *) -+{ -+ debug("audit create ephemeral server key euid %d fingerprint %s", geteuid(), fp); -+} - # endif /* !defined CUSTOM_SSH_AUDIT_EVENTS */ - #endif /* SSH_AUDIT_EVENTS */ -diff --git a/openssh-6.6p1/audit.h b/openssh-6.6p1/audit.h ---- a/openssh-6.6p1/audit.h -+++ b/openssh-6.6p1/audit.h -@@ -43,26 +43,30 @@ enum ssh_audit_event_type { - SSH_INVALID_USER, - SSH_NOLOGIN, /* denied by /etc/nologin, not implemented */ - SSH_CONNECTION_CLOSE, /* closed after attempting auth or session */ - SSH_CONNECTION_ABANDON, /* closed without completing auth */ - SSH_AUDIT_UNKNOWN - }; - typedef enum ssh_audit_event_type ssh_audit_event_t; - -+int listening_for_clients(void); -+ - void audit_connection_from(const char *, int); - void audit_event(ssh_audit_event_t); - void audit_count_session_open(void); - void audit_session_open(struct logininfo *); - void audit_session_close(struct logininfo *); - int audit_run_command(const char *); - void audit_end_command(int, const char *); - ssh_audit_event_t audit_classify_auth(const char *); - int audit_keyusage(int, const char *, unsigned, char *, int); - void audit_key(int, int *, const Key *); - void audit_unsupported(int); - void audit_kex(int, char *, char *, char *); - void audit_unsupported_body(int); - void audit_kex_body(int, char *, char *, char *, pid_t, uid_t); - void audit_session_key_free(int ctos); - void audit_session_key_free_body(int ctos, pid_t, uid_t); -+void audit_destroy_sensitive_data(const char *, pid_t, uid_t); -+void audit_generate_ephemeral_server_key(const char *); - - #endif /* _SSH_AUDIT_H */ -diff --git a/openssh-6.6p1/key.c b/openssh-6.6p1/key.c ---- a/openssh-6.6p1/key.c -+++ b/openssh-6.6p1/key.c -@@ -1964,16 +1964,43 @@ key_demote(const Key *k) - fatal("key_demote: bad key type %d", k->type); - break; - } - - return (pk); - } - - int -+key_is_private(const Key *k) -+{ -+ switch (k->type) { -+ case KEY_RSA_CERT_V00: -+ case KEY_RSA_CERT: -+ case KEY_RSA1: -+ case KEY_RSA: -+ return k->rsa->d != NULL; -+ case KEY_DSA_CERT_V00: -+ case KEY_DSA_CERT: -+ case KEY_DSA: -+ return k->dsa->priv_key != NULL; -+#ifdef OPENSSL_HAS_ECC -+ case KEY_ECDSA_CERT: -+ case KEY_ECDSA: -+ return EC_KEY_get0_private_key(k->ecdsa) != NULL; -+#endif -+ case KEY_ED25519_CERT: -+ case KEY_ED25519: -+ return k->ed25519_sk != NULL; -+ default: -+ fatal("key_is_private: bad key type %d", k->type); -+ return 1; -+ } -+} -+ -+int - key_is_cert(const Key *k) - { - if (k == NULL) - return 0; - return key_type_is_cert(k->type); - } - - /* Return the cert-less equivalent to a certified key type */ -diff --git a/openssh-6.6p1/key.h b/openssh-6.6p1/key.h ---- a/openssh-6.6p1/key.h -+++ b/openssh-6.6p1/key.h -@@ -113,16 +113,17 @@ int key_read(Key *, char **); - u_int key_size(const Key *); - enum fp_type key_fp_type_select(void); - char *key_fp_type_str(enum fp_type); - - Key *key_generate(int, u_int); - Key *key_from_private(const Key *); - int key_type_from_name(char *); - int key_is_cert(const Key *); -+int key_is_private(const Key *k); - int key_type_is_cert(int); - int key_type_plain(int); - int key_to_certified(Key *, int); - int key_drop_cert(Key *); - int key_certify(Key *, Key *); - void key_cert_copy(const Key *, struct Key *); - int key_cert_check_authority(const Key *, int, int, const char *, - const char **); -diff --git a/openssh-6.6p1/monitor.c b/openssh-6.6p1/monitor.c ---- a/openssh-6.6p1/monitor.c -+++ b/openssh-6.6p1/monitor.c -@@ -109,16 +109,18 @@ extern u_int utmp_len; - extern Newkeys *current_keys[]; - extern z_stream incoming_stream; - extern z_stream outgoing_stream; - extern u_char session_id[]; - extern Buffer auth_debug; - extern int auth_debug_init; - extern Buffer loginmsg; - -+extern void destroy_sensitive_data(int); -+ - /* State exported from the child */ - - struct { - z_stream incoming; - z_stream outgoing; - u_char *keyin; - u_int keyinlen; - u_char *keyout; -@@ -180,16 +182,17 @@ int mm_answer_gss_checkmic(int, Buffer * - - #ifdef SSH_AUDIT_EVENTS - int mm_answer_audit_event(int, Buffer *); - int mm_answer_audit_command(int, Buffer *); - int mm_answer_audit_end_command(int, Buffer *); - int mm_answer_audit_unsupported_body(int, Buffer *); - int mm_answer_audit_kex_body(int, Buffer *); - int mm_answer_audit_session_key_free_body(int, Buffer *); -+int mm_answer_audit_server_key_free(int, Buffer *); - #endif - - static int monitor_read_log(struct monitor *); - - static Authctxt *authctxt; - static BIGNUM *ssh1_challenge = NULL; /* used for ssh1 rsa auth */ - - /* local state for key verify */ -@@ -234,16 +237,17 @@ struct mon_table mon_dispatch_proto20[] - {MONITOR_REQ_PAM_RESPOND, MON_ISAUTH, mm_answer_pam_respond}, - {MONITOR_REQ_PAM_FREE_CTX, MON_ONCE|MON_AUTHDECIDE, mm_answer_pam_free_ctx}, - #endif - #ifdef SSH_AUDIT_EVENTS - {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event}, - {MONITOR_REQ_AUDIT_UNSUPPORTED, MON_PERMIT, mm_answer_audit_unsupported_body}, - {MONITOR_REQ_AUDIT_KEX, MON_PERMIT, mm_answer_audit_kex_body}, - {MONITOR_REQ_AUDIT_SESSION_KEY_FREE, MON_PERMIT, mm_answer_audit_session_key_free_body}, -+ {MONITOR_REQ_AUDIT_SERVER_KEY_FREE, MON_PERMIT, mm_answer_audit_server_key_free}, - #endif - #ifdef BSD_AUTH - {MONITOR_REQ_BSDAUTHQUERY, MON_ISAUTH, mm_answer_bsdauthquery}, - {MONITOR_REQ_BSDAUTHRESPOND, MON_AUTH, mm_answer_bsdauthrespond}, - #endif - #ifdef SKEY - {MONITOR_REQ_SKEYQUERY, MON_ISAUTH, mm_answer_skeyquery}, - {MONITOR_REQ_SKEYRESPOND, MON_AUTH, mm_answer_skeyrespond}, -@@ -267,16 +271,17 @@ struct mon_table mon_dispatch_postauth20 - {MONITOR_REQ_TERM, 0, mm_answer_term}, - #ifdef SSH_AUDIT_EVENTS - {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event}, - {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT, mm_answer_audit_command}, - {MONITOR_REQ_AUDIT_END_COMMAND, MON_PERMIT, mm_answer_audit_end_command}, - {MONITOR_REQ_AUDIT_UNSUPPORTED, MON_PERMIT, mm_answer_audit_unsupported_body}, - {MONITOR_REQ_AUDIT_KEX, MON_PERMIT, mm_answer_audit_kex_body}, - {MONITOR_REQ_AUDIT_SESSION_KEY_FREE, MON_PERMIT, mm_answer_audit_session_key_free_body}, -+ {MONITOR_REQ_AUDIT_SERVER_KEY_FREE, MON_PERMIT, mm_answer_audit_server_key_free}, - #endif - {0, 0, NULL} - }; - - struct mon_table mon_dispatch_proto15[] = { - {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow}, - {MONITOR_REQ_SESSKEY, MON_ONCE, mm_answer_sesskey}, - {MONITOR_REQ_SESSID, MON_ONCE, mm_answer_sessid}, -@@ -301,31 +306,33 @@ struct mon_table mon_dispatch_proto15[] - {MONITOR_REQ_PAM_RESPOND, MON_ISAUTH, mm_answer_pam_respond}, - {MONITOR_REQ_PAM_FREE_CTX, MON_ONCE|MON_AUTHDECIDE, mm_answer_pam_free_ctx}, - #endif - #ifdef SSH_AUDIT_EVENTS - {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event}, - {MONITOR_REQ_AUDIT_UNSUPPORTED, MON_PERMIT, mm_answer_audit_unsupported_body}, - {MONITOR_REQ_AUDIT_KEX, MON_PERMIT, mm_answer_audit_kex_body}, - {MONITOR_REQ_AUDIT_SESSION_KEY_FREE, MON_PERMIT, mm_answer_audit_session_key_free_body}, -+ {MONITOR_REQ_AUDIT_SERVER_KEY_FREE, MON_PERMIT, mm_answer_audit_server_key_free}, - #endif - {0, 0, NULL} - }; - - struct mon_table mon_dispatch_postauth15[] = { - {MONITOR_REQ_PTY, MON_ONCE, mm_answer_pty}, - {MONITOR_REQ_PTYCLEANUP, MON_ONCE, mm_answer_pty_cleanup}, - {MONITOR_REQ_TERM, 0, mm_answer_term}, - #ifdef SSH_AUDIT_EVENTS - {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event}, - {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT|MON_ONCE, mm_answer_audit_command}, - {MONITOR_REQ_AUDIT_END_COMMAND, MON_PERMIT, mm_answer_audit_end_command}, - {MONITOR_REQ_AUDIT_UNSUPPORTED, MON_PERMIT, mm_answer_audit_unsupported_body}, - {MONITOR_REQ_AUDIT_KEX, MON_PERMIT, mm_answer_audit_kex_body}, - {MONITOR_REQ_AUDIT_SESSION_KEY_FREE, MON_PERMIT, mm_answer_audit_session_key_free_body}, -+ {MONITOR_REQ_AUDIT_SERVER_KEY_FREE, MON_PERMIT, mm_answer_audit_server_key_free}, - #endif - {0, 0, NULL} - }; - - struct mon_table *mon_dispatch; - - /* Specifies if a certain message is allowed at the moment */ - -@@ -1739,16 +1746,18 @@ mm_answer_term(int sock, Buffer *req) - /* The child is terminating */ - session_destroy_all(&mm_session_close); - - #ifdef USE_PAM - if (options.use_pam) - sshpam_cleanup(); - #endif - -+ destroy_sensitive_data(0); -+ - while (waitpid(pmonitor->m_pid, &status, 0) == -1) - if (errno != EINTR) - exit(1); - - res = WIFEXITED(status) ? WEXITSTATUS(status) : 1; - - /* Terminate process */ - exit(res); -@@ -2280,10 +2289,31 @@ mm_answer_audit_session_key_free_body(in - - audit_session_key_free_body(ctos, pid, uid); - - buffer_clear(m); - - mm_request_send(sock, MONITOR_ANS_AUDIT_SESSION_KEY_FREE, m); - return 0; - } -+ -+int -+mm_answer_audit_server_key_free(int sock, Buffer *m) -+{ -+ int len; -+ char *fp; -+ pid_t pid; -+ uid_t uid; -+ -+ fp = buffer_get_string(m, &len); -+ pid = buffer_get_int64(m); -+ uid = buffer_get_int64(m); -+ -+ audit_destroy_sensitive_data(fp, pid, uid); -+ -+ free(fp); -+ buffer_clear(m); -+ -+ mm_request_send(sock, MONITOR_ANS_AUDIT_SERVER_KEY_FREE, m); -+ return 0; -+} - #endif /* SSH_AUDIT_EVENTS */ - -diff --git a/openssh-6.6p1/monitor.h b/openssh-6.6p1/monitor.h ---- a/openssh-6.6p1/monitor.h -+++ b/openssh-6.6p1/monitor.h -@@ -63,16 +63,17 @@ enum monitor_reqtype { - MONITOR_REQ_PAM_QUERY = 106, MONITOR_ANS_PAM_QUERY = 107, - MONITOR_REQ_PAM_RESPOND = 108, MONITOR_ANS_PAM_RESPOND = 109, - MONITOR_REQ_PAM_FREE_CTX = 110, MONITOR_ANS_PAM_FREE_CTX = 111, - MONITOR_REQ_AUDIT_EVENT = 112, MONITOR_REQ_AUDIT_COMMAND = 113, - MONITOR_ANS_AUDIT_COMMAND = 114, MONITOR_REQ_AUDIT_END_COMMAND = 115, - MONITOR_REQ_AUDIT_UNSUPPORTED = 116, MONITOR_ANS_AUDIT_UNSUPPORTED = 117, - MONITOR_REQ_AUDIT_KEX = 118, MONITOR_ANS_AUDIT_KEX = 119, - MONITOR_REQ_AUDIT_SESSION_KEY_FREE = 120, MONITOR_ANS_AUDIT_SESSION_KEY_FREE = 121, -+ MONITOR_REQ_AUDIT_SERVER_KEY_FREE = 122, MONITOR_ANS_AUDIT_SERVER_KEY_FREE = 123, - - }; - - struct mm_master; - struct monitor { - int m_recvfd; - int m_sendfd; - int m_log_recvfd; -diff --git a/openssh-6.6p1/monitor_wrap.c b/openssh-6.6p1/monitor_wrap.c ---- a/openssh-6.6p1/monitor_wrap.c -+++ b/openssh-6.6p1/monitor_wrap.c -@@ -1373,10 +1373,26 @@ mm_audit_session_key_free_body(int ctos, - buffer_put_int(&m, ctos); - buffer_put_int64(&m, pid); - buffer_put_int64(&m, uid); - mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUDIT_SESSION_KEY_FREE, &m); - mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_AUDIT_SESSION_KEY_FREE, - &m); - buffer_free(&m); - } -+ -+void -+mm_audit_destroy_sensitive_data(const char *fp, pid_t pid, uid_t uid) -+{ -+ Buffer m; -+ -+ buffer_init(&m); -+ buffer_put_cstring(&m, fp); -+ buffer_put_int64(&m, pid); -+ buffer_put_int64(&m, uid); -+ -+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUDIT_SERVER_KEY_FREE, &m); -+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_AUDIT_SERVER_KEY_FREE, -+ &m); -+ buffer_free(&m); -+} - #endif /* SSH_AUDIT_EVENTS */ - -diff --git a/openssh-6.6p1/monitor_wrap.h b/openssh-6.6p1/monitor_wrap.h ---- a/openssh-6.6p1/monitor_wrap.h -+++ b/openssh-6.6p1/monitor_wrap.h -@@ -75,16 +75,17 @@ void mm_sshpam_free_ctx(void *); - #ifdef SSH_AUDIT_EVENTS - #include "audit.h" - void mm_audit_event(ssh_audit_event_t); - int mm_audit_run_command(const char *); - void mm_audit_end_command(int, const char *); - void mm_audit_unsupported_body(int); - void mm_audit_kex_body(int, char *, char *, char *, pid_t, uid_t); - void mm_audit_session_key_free_body(int, pid_t, uid_t); -+void mm_audit_destroy_sensitive_data(const char *, pid_t, uid_t); - #endif - - struct Session; - void mm_terminate(void); - int mm_pty_allocate(int *, int *, char *, size_t); - void mm_session_pty_cleanup2(struct Session *); - - /* SSHv1 interfaces */ -diff --git a/openssh-6.6p1/session.c b/openssh-6.6p1/session.c ---- a/openssh-6.6p1/session.c -+++ b/openssh-6.6p1/session.c -@@ -132,17 +132,17 @@ static int session_pty_req(Session *); - - /* import */ - extern ServerOptions options; - extern char *__progname; - extern int log_stderr; - extern int debug_flag; - extern u_int utmp_len; - extern int startup_pipe; --extern void destroy_sensitive_data(void); -+extern void destroy_sensitive_data(int); - extern Buffer loginmsg; - - /* original command from peer. */ - const char *original_command = NULL; - - /* data */ - static int sessions_first_unused = -1; - static int sessions_nalloc = 0; -@@ -1693,17 +1693,17 @@ do_child(Session *s, const char *command - char **env; - int env_size; - char *argv[ARGV_MAX]; - const char *shell, *shell0, *hostname = NULL; - struct passwd *pw = s->pw; - int r = 0; - - /* remove hostkey from the child's memory */ -- destroy_sensitive_data(); -+ destroy_sensitive_data(1); - /* Don't audit this - both us and the parent would be talking to the - monitor over a single socket, with no synchronization. */ - packet_destroy_all(0, 1); - - /* Force a password change */ - if (s->authctxt->force_pwchange) { - do_setusercontext(pw); - child_close_fds(); -diff --git a/openssh-6.6p1/sshd.c b/openssh-6.6p1/sshd.c ---- a/openssh-6.6p1/sshd.c -+++ b/openssh-6.6p1/sshd.c -@@ -259,17 +259,17 @@ Buffer cfg; - - /* message to be displayed after login */ - Buffer loginmsg; - - /* Unprivileged user */ - struct passwd *privsep_pw = NULL; - - /* Prototypes for various functions defined later in this file. */ --void destroy_sensitive_data(void); -+void destroy_sensitive_data(int); - void demote_sensitive_data(void); - - static void do_ssh1_kex(void); - static void do_ssh2_kex(void); - - /* - * Close all listening sockets - */ -@@ -278,16 +278,25 @@ close_listen_socks(void) - { - int i; - - for (i = 0; i < num_listen_socks; i++) - close(listen_socks[i]); - num_listen_socks = -1; - } - -+/* -+ * Is this process listening for clients (i.e. not specific to any specific -+ * client connection?) -+ */ -+int listening_for_clients(void) -+{ -+ return num_listen_socks > 0; -+} -+ - static void - close_startup_pipes(void) - { - int i; - - if (startup_pipes) - for (i = 0; i < options.max_startups; i++) - if (startup_pipes[i] != -1) -@@ -557,60 +566,99 @@ sshd_exchange_identification(int sock_in - close(sock_out); - logit("Protocol major versions differ for %s: %.200s vs. %.200s", - get_remote_ipaddr(), - server_version_string, client_version_string); - cleanup_exit(255); - } - } - --/* Destroy the host and server keys. They will no longer be needed. */ -+/* -+ * Destroy the host and server keys. They will no longer be needed. Careful, -+ * this can be called from cleanup_exit() - i.e. from just about anywhere. -+ */ - void --destroy_sensitive_data(void) -+destroy_sensitive_data(int privsep) - { - int i; -+ pid_t pid; -+ uid_t uid; - - if (sensitive_data.server_key) { - key_free(sensitive_data.server_key); - sensitive_data.server_key = NULL; - } -+ pid = getpid(); -+ uid = getuid(); - for (i = 0; i < options.num_host_key_files; i++) { - if (sensitive_data.host_keys[i]) { -+ char *fp; -+ -+ if (key_is_private(sensitive_data.host_keys[i])) -+ fp = key_fingerprint(sensitive_data.host_keys[i], -+ key_fp_type_select(), SSH_FP_HEX); -+ else -+ fp = NULL; - key_free(sensitive_data.host_keys[i]); - sensitive_data.host_keys[i] = NULL; -+ if (fp != NULL) { -+ if (privsep) -+ PRIVSEP(audit_destroy_sensitive_data(fp, -+ pid, uid)); -+ else -+ audit_destroy_sensitive_data(fp, -+ pid, uid); -+ free(fp); -+ } - } -- if (sensitive_data.host_certificates[i]) { -+ if (sensitive_data.host_certificates -+ && sensitive_data.host_certificates[i]) { - key_free(sensitive_data.host_certificates[i]); - sensitive_data.host_certificates[i] = NULL; - } - } - sensitive_data.ssh1_host_key = NULL; - explicit_bzero(sensitive_data.ssh1_cookie, SSH_SESSION_KEY_LENGTH); - } - - /* Demote private to public keys for network child */ - void - demote_sensitive_data(void) - { - Key *tmp; -+ pid_t pid; -+ uid_t uid; - int i; - -+ pid = getpid(); -+ uid = getuid(); - if (sensitive_data.server_key) { - tmp = key_demote(sensitive_data.server_key); - key_free(sensitive_data.server_key); - sensitive_data.server_key = tmp; - } - - for (i = 0; i < options.num_host_key_files; i++) { - if (sensitive_data.host_keys[i]) { -+ char *fp; -+ -+ if (key_is_private(sensitive_data.host_keys[i])) -+ fp = key_fingerprint(sensitive_data.host_keys[i], -+ key_fp_type_select(), SSH_FP_HEX); -+ else -+ fp = NULL; - tmp = key_demote(sensitive_data.host_keys[i]); - key_free(sensitive_data.host_keys[i]); - sensitive_data.host_keys[i] = tmp; - if (tmp->type == KEY_RSA1) - sensitive_data.ssh1_host_key = tmp; -+ if (fp != NULL) { -+ audit_destroy_sensitive_data(fp, pid, uid); -+ free(fp); -+ } - } - /* Certs do not need demotion */ - } - - /* We do not clear ssh1_host key and cookie. XXX - Okay Niels? */ - } - - static void -@@ -1201,16 +1249,17 @@ server_accept_loop(int *sock_in, int *so - - /* Wait in select until there is a connection. */ - ret = select(maxfd+1, fdset, NULL, NULL, NULL); - if (ret < 0 && errno != EINTR) - error("select: %.100s", strerror(errno)); - if (received_sigterm) { - logit("Received signal %d; terminating.", - (int) received_sigterm); -+ destroy_sensitive_data(0); - close_listen_socks(); - unlink(options.pid_file); - exit(received_sigterm == SIGTERM ? 0 : 255); - } - if (key_used && key_do_regen) { - generate_ephemeral_server_key(); - key_used = 0; - key_do_regen = 0; -@@ -2167,27 +2216,28 @@ main(int ac, char **av) - /* - * In privilege separation, we fork another child and prepare - * file descriptor passing. - */ - if (use_privsep) { - privsep_postauth(authctxt); - /* the monitor process [priv] will not return */ - if (!compat20) -- destroy_sensitive_data(); -+ destroy_sensitive_data(0); - } - - packet_set_timeout(options.client_alive_interval, - options.client_alive_count_max); - - /* Start session. */ - do_authenticated(authctxt); - - /* The connection has been terminated. */ - packet_destroy_all(1, 1); -+ destroy_sensitive_data(1); - - packet_get_state(MODE_IN, NULL, NULL, NULL, &ibytes); - packet_get_state(MODE_OUT, NULL, NULL, NULL, &obytes); - verbose("Transferred: sent %llu, received %llu bytes", - (unsigned long long)obytes, (unsigned long long)ibytes); - - verbose("Closing connection to %.500s port %d", remote_ip, remote_port); - -@@ -2412,17 +2462,17 @@ do_ssh1_kex(void) - fatal("%s: hash failed", __func__); - ssh_digest_free(md); - explicit_bzero(buf, bytes); - free(buf); - for (i = 0; i < 16; i++) - session_id[i] = session_key[i] ^ session_key[i + 16]; - } - /* Destroy the private and public keys. No longer. */ -- destroy_sensitive_data(); -+ destroy_sensitive_data(0); - - if (use_privsep) - mm_ssh1_session_id(session_id); - - /* Destroy the decrypted integer. It is no longer needed. */ - BN_clear_free(session_key_int); - - /* Set the session key. From this on all communications will be encrypted. */ -@@ -2556,16 +2606,18 @@ cleanup_exit(int i) - debug("Killing privsep child %d", pmonitor->m_pid); - if (kill(pmonitor->m_pid, SIGKILL) != 0 && - errno != ESRCH) - error("%s: kill(%d): %s", __func__, - pmonitor->m_pid, strerror(errno)); - } - } - is_privsep_child = use_privsep && (pmonitor != NULL) && !mm_is_monitor(); -+ if (sensitive_data.host_keys != NULL) -+ destroy_sensitive_data(is_privsep_child); - packet_destroy_all(1, is_privsep_child); - #ifdef SSH_AUDIT_EVENTS - /* done after do_cleanup so it can cancel the PAM auth 'thread' */ - if ((the_authctxt == NULL || !the_authctxt->authenticated) && - (!use_privsep || mm_is_monitor())) - audit_event(SSH_CONNECTION_ABANDON); - #endif - _exit(i); diff --git a/openssh-6.6p1-audit7-libaudit_compat.patch b/openssh-6.6p1-audit7-libaudit_compat.patch deleted file mode 100644 index ce46452..0000000 --- a/openssh-6.6p1-audit7-libaudit_compat.patch +++ /dev/null @@ -1,107 +0,0 @@ -# definitions for AUDIT_CRYPTO_* symbols fom libaudit 2.x - -diff --git a/openssh-6.6p1/audit-linux.c b/openssh-6.6p1/audit-linux.c ---- a/openssh-6.6p1/audit-linux.c -+++ b/openssh-6.6p1/audit-linux.c -@@ -25,16 +25,17 @@ - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Red Hat author: Jan F. Chadima - */ - - #include "includes.h" - #if defined(USE_LINUX_AUDIT) - #include -+#include "compat-libaudit.h" - #include - #include - - #include "log.h" - #include "audit.h" - #include "key.h" - #include "hostfile.h" - #include "auth.h" -diff --git a/openssh-6.6p1/compat-libaudit.h b/openssh-6.6p1/compat-libaudit.h -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/compat-libaudit.h -@@ -0,0 +1,79 @@ -+/* AUDIT_CRYPTO symbol definitions from libaudit 2.x */ -+/* libaudit.h -- -+ * Copyright 2004-2011 Red Hat Inc., Durham, North Carolina. -+ * All Rights Reserved. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * -+ * Authors: -+ * Steve Grubb -+ * Rickard E. (Rik) Faith -+ */ -+#ifndef _COMPAT_LIBAUDIT_H_ -+#define _COMPAT_LIBAUDIT_H_ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#ifndef AUDIT_FIRST_CRYPTO_MSG -+#define AUDIT_FIRST_CRYPTO_MSG 2400 -+#endif -+ -+#ifndef AUDIT_CRYPTO_TEST_USER -+#define AUDIT_CRYPTO_TEST_USER 2400 /* Crypto test results */ -+#endif -+ -+#ifndef AUDIT_CRYPTO_PARAM_CHANGE_USER -+#define AUDIT_CRYPTO_PARAM_CHANGE_USER 2401 /* Crypto attribute change */ -+#endif -+ -+#ifndef AUDIT_CRYPTO_LOGIN -+#define AUDIT_CRYPTO_LOGIN 2402 /* Logged in as crypto officer */ -+#endif -+ -+#ifndef AUDIT_CRYPTO_LOGOUT -+#define AUDIT_CRYPTO_LOGOUT 2403 /* Logged out from crypto */ -+#endif -+ -+#ifndef AUDIT_CRYPTO_KEY_USER -+#define AUDIT_CRYPTO_KEY_USER 2404 /* Create,delete,negotiate */ -+#endif -+ -+#ifndef AUDIT_CRYPTO_FAILURE_USER -+#define AUDIT_CRYPTO_FAILURE_USER 2405 /* Fail decrypt,encrypt,randomiz */ -+#endif -+ -+#ifndef AUDIT_CRYPTO_REPLAY_USER -+#define AUDIT_CRYPTO_REPLAY_USER 2406 /* Crypto replay detected */ -+#endif -+ -+#ifndef AUDIT_CRYPTO_SESSION -+#define AUDIT_CRYPTO_SESSION 2407 /* Record parameters set during -+ TLS session establishment */ -+#endif -+ -+ -+#ifndef AUDIT_LAST_CRYPTO_MSG -+#define AUDIT_LAST_CRYPTO_MSG 2499 -+#endif -+ -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif /* _COMPAT_LIBAUDIT_H_ */ -+ diff --git a/openssh-6.6p1-audit8-libaudit_dns_timeouts.patch b/openssh-6.6p1-audit8-libaudit_dns_timeouts.patch deleted file mode 100644 index c199c65..0000000 --- a/openssh-6.6p1-audit8-libaudit_dns_timeouts.patch +++ /dev/null @@ -1,47 +0,0 @@ -# bnc#752354, bnc#757360 -# prevent timeouts in libaudit code caused by DNS misconfiguration by -# explicitely disabling DNS lookups in libaudit when UseDNS is false. -# Note that this particular solution causes the logs to always contain -# "hostname=?, addr=?" when DNS lookups are disabled. - -diff --git a/openssh-6.6p1/audit-linux.c b/openssh-6.6p1/audit-linux.c ---- a/openssh-6.6p1/audit-linux.c -+++ b/openssh-6.6p1/audit-linux.c -@@ -62,17 +62,17 @@ linux_audit_user_logxxx(int uid, const c - if (errno == EINVAL || errno == EPROTONOSUPPORT || - errno == EAFNOSUPPORT) - return; /* No audit support in kernel */ - else - goto fatal_report; /* Must prevent login */ - } - rc = audit_log_acct_message(audit_fd, event, - NULL, "login", username ? username : "(unknown)", -- username == NULL ? uid : -1, hostname, ip, ttyn, success); -+ username == NULL ? uid : -1, options.use_dns ? hostname : NULL, ip, ttyn, success); - saved_errno = errno; - close(audit_fd); - /* - * Do not report error if the error is EPERM and sshd is run as non - * root user. - */ - if ((rc == -EPERM) && (geteuid() != 0)) - rc = 0; -@@ -114,17 +114,17 @@ linux_audit_user_auth(int uid, const cha - goto fatal_report; /* Must prevent login */ - } - - if ((event < 0) || (event > SSH_AUDIT_UNKNOWN)) - event = SSH_AUDIT_UNKNOWN; - - rc = audit_log_acct_message(audit_fd, AUDIT_USER_AUTH, - NULL, event_name[event], username ? username : "(unknown)", -- username == NULL ? uid : -1, hostname, ip, ttyn, success); -+ username == NULL ? uid : -1, options.use_dns ? hostname : NULL, ip, ttyn, success); - saved_errno = errno; - close(audit_fd); - /* - * Do not report error if the error is EPERM and sshd is run as non - * root user. - */ - if ((rc == -EPERM) && (geteuid() != 0)) - rc = 0; diff --git a/openssh-6.6p1-curve25519-6.6.1p1.patch b/openssh-6.6p1-curve25519-6.6.1p1.patch deleted file mode 100644 index 7eb8086..0000000 --- a/openssh-6.6p1-curve25519-6.6.1p1.patch +++ /dev/null @@ -1,205 +0,0 @@ -# Date: Sun, 20 Apr 2014 17:14:08 +1000 (EST) -# From: Damien Miller -# To: openssh-unix-dev@mindrot.org -# Subject: bad bignum encoding for curve25519-sha256@libssh.org -# Message-ID: -# -# Hi, -# -# So I screwed up when writing the support for the curve25519 KEX method -# that doesn't depend on OpenSSL's BIGNUM type - a bug in my code left -# leading zero bytes where they should have been skipped. The impact of -# this is that OpenSSH 6.5 and 6.6 will fail during key exchange with a -# peer that implements curve25519-sha256@libssh.org properly about 0.2% -# of the time (one in every 512ish connections). -# -# We've fixed this for OpenSSH 6.7 by avoiding the curve25519-sha256 -# key exchange for previous versions, but I'd recommend distributors -# of OpenSSH apply this patch so the affected code doesn't become -# too entrenched in LTS releases. -# -# The patch fixes the bug and makes OpenSSH identify itself as 6.6.1 so as -# to distinguish itself from the incorrect versions so the compatibility -# code to disable the affected KEX isn't activated. -# -# I've committed this on the 6.6 branch too. -# -# Apologies for the hassle. -# -# -d - -diff --git a/openssh-6.6p1/bufaux.c b/openssh-6.6p1/bufaux.c ---- a/openssh-6.6p1/bufaux.c -+++ b/openssh-6.6p1/bufaux.c -@@ -1,9 +1,9 @@ --/* $OpenBSD: bufaux.c,v 1.56 2014/02/02 03:44:31 djm Exp $ */ -+/* $OpenBSD: bufaux.c,v 1.57 2014/04/16 23:22:45 djm Exp $ */ - /* - * Author: Tatu Ylonen - * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland - * All rights reserved - * Auxiliary functions for storing and retrieving various data types to/from - * Buffers. - * - * As far as I am concerned, the code I have written for this software -@@ -367,16 +367,19 @@ buffer_get_bignum2_as_string(Buffer *buf - void - buffer_put_bignum2_from_string(Buffer *buffer, const u_char *s, u_int l) - { - u_char *buf, *p; - int pad = 0; - - if (l > 8 * 1024) - fatal("%s: length %u too long", __func__, l); -+ /* Skip leading zero bytes */ -+ for (; l > 0 && *s == 0; l--, s++) -+ ; - p = buf = xmalloc(l + 1); - /* - * If most significant bit is set then prepend a zero byte to - * avoid interpretation as a negative number. - */ - if (l > 0 && (s[0] & 0x80) != 0) { - *p++ = '\0'; - pad = 1; -diff --git a/openssh-6.6p1/compat.c b/openssh-6.6p1/compat.c ---- a/openssh-6.6p1/compat.c -+++ b/openssh-6.6p1/compat.c -@@ -90,16 +90,19 @@ compat_datafellows(const char *version) - SSH_OLD_FORWARD_ADDR}, - { "OpenSSH_2.*," - "OpenSSH_3.0*," - "OpenSSH_3.1*", SSH_BUG_EXTEOF|SSH_OLD_FORWARD_ADDR}, - { "OpenSSH_3.*", SSH_OLD_FORWARD_ADDR }, - { "Sun_SSH_1.0*", SSH_BUG_NOREKEY|SSH_BUG_EXTEOF}, - { "OpenSSH_4*", 0 }, - { "OpenSSH_5*", SSH_NEW_OPENSSH|SSH_BUG_DYNAMIC_RPORT}, -+ { "OpenSSH_6.6.1*", SSH_NEW_OPENSSH}, -+ { "OpenSSH_6.5*," -+ "OpenSSH_6.6*", SSH_NEW_OPENSSH|SSH_BUG_CURVE25519PAD}, - { "OpenSSH*", SSH_NEW_OPENSSH }, - { "*MindTerm*", 0 }, - { "2.1.0*", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| - SSH_OLD_SESSIONID|SSH_BUG_DEBUG| - SSH_BUG_RSASIGMD5|SSH_BUG_HBSERVICE| - SSH_BUG_FIRSTKEX }, - { "2.1 *", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| - SSH_OLD_SESSIONID|SSH_BUG_DEBUG| -@@ -246,22 +249,34 @@ compat_cipher_proposal(char *cipher_prop - debug2("%s: original cipher proposal: %s", __func__, cipher_prop); - cipher_prop = filter_proposal(cipher_prop, "aes*"); - debug2("%s: compat cipher proposal: %s", __func__, cipher_prop); - if (*cipher_prop == '\0') - fatal("No supported ciphers found"); - return cipher_prop; - } - -- - char * - compat_pkalg_proposal(char *pkalg_prop) - { - if (!(datafellows & SSH_BUG_RSASIGMD5)) - return pkalg_prop; - debug2("%s: original public key proposal: %s", __func__, pkalg_prop); - pkalg_prop = filter_proposal(pkalg_prop, "ssh-rsa"); - debug2("%s: compat public key proposal: %s", __func__, pkalg_prop); - if (*pkalg_prop == '\0') - fatal("No supported PK algorithms found"); - return pkalg_prop; - } - -+char * -+compat_kex_proposal(char *kex_prop) -+{ -+ if (!(datafellows & SSH_BUG_CURVE25519PAD)) -+ return kex_prop; -+ debug2("%s: original KEX proposal: %s", __func__, kex_prop); -+ kex_prop = filter_proposal(kex_prop, "curve25519-sha256@libssh.org"); -+ debug2("%s: compat KEX proposal: %s", __func__, kex_prop); -+ if (*kex_prop == '\0') -+ fatal("No supported key exchange algorithms found"); -+ return kex_prop; -+} -+ -diff --git a/openssh-6.6p1/compat.h b/openssh-6.6p1/compat.h ---- a/openssh-6.6p1/compat.h -+++ b/openssh-6.6p1/compat.h -@@ -54,20 +54,22 @@ - #define SSH_BUG_DUMMYCHAN 0x00100000 - #define SSH_BUG_EXTEOF 0x00200000 - #define SSH_BUG_PROBE 0x00400000 - #define SSH_BUG_FIRSTKEX 0x00800000 - #define SSH_OLD_FORWARD_ADDR 0x01000000 - #define SSH_BUG_RFWD_ADDR 0x02000000 - #define SSH_NEW_OPENSSH 0x04000000 - #define SSH_BUG_DYNAMIC_RPORT 0x08000000 -+#define SSH_BUG_CURVE25519PAD 0x10000000 - - void enable_compat13(void); - void enable_compat20(void); - void compat_datafellows(const char *); - int proto_spec(const char *); - char *compat_cipher_proposal(char *); - char *compat_pkalg_proposal(char *); -+char *compat_kex_proposal(char *); - - extern int compat13; - extern int compat20; - extern int datafellows; - #endif -diff --git a/openssh-6.6p1/sshconnect2.c b/openssh-6.6p1/sshconnect2.c ---- a/openssh-6.6p1/sshconnect2.c -+++ b/openssh-6.6p1/sshconnect2.c -@@ -190,16 +190,18 @@ ssh_kex2(char *host, struct sockaddr *ho - else { - /* Prefer algorithms that we already have keys for */ - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = - compat_pkalg_proposal( - order_hostkeyalgs(host, hostaddr, port)); - } - if (options.kex_algorithms != NULL) - myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; -+ myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal( -+ myproposal[PROPOSAL_KEX_ALGS]); - - if (options.rekey_limit || options.rekey_interval) - packet_set_rekey_limits((u_int32_t)options.rekey_limit, - (time_t)options.rekey_interval); - - /* start key exchange */ - kex = kex_setup(myproposal); - kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; -diff --git a/openssh-6.6p1/sshd.c b/openssh-6.6p1/sshd.c ---- a/openssh-6.6p1/sshd.c -+++ b/openssh-6.6p1/sshd.c -@@ -2457,16 +2457,19 @@ do_ssh2_kex(void) - myproposal[PROPOSAL_COMP_ALGS_STOC] = "none"; - } else if (options.compression == COMP_DELAYED) { - myproposal[PROPOSAL_COMP_ALGS_CTOS] = - myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib@openssh.com"; - } - if (options.kex_algorithms != NULL) - myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; - -+ myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal( -+ myproposal[PROPOSAL_KEX_ALGS]); -+ - if (options.rekey_limit || options.rekey_interval) - packet_set_rekey_limits((u_int32_t)options.rekey_limit, - (time_t)options.rekey_interval); - - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal( - list_hostkey_types()); - - /* start key exchange */ -diff --git a/openssh-6.6p1/version.h b/openssh-6.6p1/version.h ---- a/openssh-6.6p1/version.h -+++ b/openssh-6.6p1/version.h -@@ -1,6 +1,6 @@ - /* $OpenBSD: version.h,v 1.70 2014/02/27 22:57:40 djm Exp $ */ - --#define SSH_VERSION "OpenSSH_6.6" -+#define SSH_VERSION "OpenSSH_6.6.1" - - #define SSH_PORTABLE "p1" - #define SSH_RELEASE SSH_VERSION SSH_PORTABLE diff --git a/openssh-6.6p1-default-protocol.patch b/openssh-6.6p1-default-protocol.patch deleted file mode 100644 index c1ddaa7..0000000 --- a/openssh-6.6p1-default-protocol.patch +++ /dev/null @@ -1,24 +0,0 @@ -# only enable SSHv2 protocol by default (upstream default is fallback to v1) - -diff --git a/openssh-6.6p1/ssh_config b/openssh-6.6p1/ssh_config ---- a/openssh-6.6p1/ssh_config -+++ b/openssh-6.6p1/ssh_config -@@ -41,17 +41,17 @@ ForwardX11Trusted yes - # CheckHostIP yes - # AddressFamily any - # ConnectTimeout 0 - # StrictHostKeyChecking ask - # IdentityFile ~/.ssh/identity - # IdentityFile ~/.ssh/id_rsa - # IdentityFile ~/.ssh/id_dsa - # Port 22 --# Protocol 2,1 -+Protocol 2 - # Cipher 3des - # Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc - # MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 - # EscapeChar ~ - # Tunnel no - # TunnelDevice any:any - # PermitLocalCommand no - # VisualHostKey no diff --git a/openssh-6.6p1-disable-openssl-abi-check.patch b/openssh-6.6p1-disable-openssl-abi-check.patch deleted file mode 100644 index 61ce8d5..0000000 --- a/openssh-6.6p1-disable-openssl-abi-check.patch +++ /dev/null @@ -1,32 +0,0 @@ -# disable run-time check for OpenSSL ABI by version number as that is not a -# reliable indicator of ABI changes and doesn't make much sense in a -# distribution package - -diff --git a/openssh-6.6p1/entropy.c b/openssh-6.6p1/entropy.c ---- a/openssh-6.6p1/entropy.c -+++ b/openssh-6.6p1/entropy.c -@@ -212,22 +212,23 @@ seed_rng(void) - #endif - /* - * OpenSSL version numbers: MNNFFPPS: major minor fix patch status - * We match major, minor, fix and status (not patch) for <1.0.0. - * After that, we acceptable compatible fix versions (so we - * allow 1.0.1 to work with 1.0.0). Going backwards is only allowed - * within a patch series. - */ -+#if 0 - u_long version_mask = SSLeay() >= 0x1000000f ? ~0xffff0L : ~0xff0L; - if (((SSLeay() ^ OPENSSL_VERSION_NUMBER) & version_mask) || - (SSLeay() >> 12) < (OPENSSL_VERSION_NUMBER >> 12)) - fatal("OpenSSL version mismatch. Built against %lx, you " - "have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay()); -- -+#endif - #ifndef OPENSSL_PRNG_ONLY - if (RAND_status() == 1) { - debug3("RNG is ready, skipping seeding"); - return; - } - - if (seed_from_prngd(buf, sizeof(buf)) == -1) - fatal("Could not obtain seed from PRNGd"); diff --git a/openssh-6.6p1-fingerprint_hash.patch b/openssh-6.6p1-fingerprint_hash.patch deleted file mode 100644 index 7a0a76f..0000000 --- a/openssh-6.6p1-fingerprint_hash.patch +++ /dev/null @@ -1,730 +0,0 @@ -# HG changeset patch -# Parent 8b2615db484b7061edd15f3bee36958f790f790e - -# select fingerprint hash algorithms based on the environment variable -# SSH_FP_TYPE_ENVVAR and append it to hex and randomart fingerprints -# Petr Cerny - -diff --git a/openssh-6.6p1/auth-rsa.c b/openssh-6.6p1/auth-rsa.c ---- a/openssh-6.6p1/auth-rsa.c -+++ b/openssh-6.6p1/auth-rsa.c -@@ -230,17 +230,17 @@ rsa_key_allowed_in_file(struct passwd *p - - /* check the real bits */ - keybits = BN_num_bits(key->rsa->n); - if (keybits < 0 || bits != keybits) - logit("Warning: %s, line %lu: keysize mismatch: " - "actual %d vs. announced %d.", - file, linenum, BN_num_bits(key->rsa->n), bits); - -- fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); -+ fp = key_fingerprint(key, key_fp_type_select(), SSH_FP_HEX); - debug("matching key found: file %s, line %lu %s %s", - file, linenum, key_type(key), fp); - free(fp); - - /* Never accept a revoked key */ - if (auth_key_is_revoked(key)) - break; - -diff --git a/openssh-6.6p1/auth.c b/openssh-6.6p1/auth.c ---- a/openssh-6.6p1/auth.c -+++ b/openssh-6.6p1/auth.c -@@ -680,17 +680,17 @@ auth_key_is_revoked(Key *key) - case -1: - /* Error opening revoked_keys_file: refuse all keys */ - error("Revoked keys file is unreadable: refusing public key " - "authentication"); - return 1; - case 1: - revoked: - /* Key revoked */ -- key_fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); -+ key_fp = key_fingerprint(key, key_fp_type_select(), SSH_FP_HEX); - error("WARNING: authentication attempt with a revoked " - "%s key %s ", key_type(key), key_fp); - free(key_fp); - return 1; - } - fatal("key_in_file returned junk"); - } - -diff --git a/openssh-6.6p1/auth2-hostbased.c b/openssh-6.6p1/auth2-hostbased.c ---- a/openssh-6.6p1/auth2-hostbased.c -+++ b/openssh-6.6p1/auth2-hostbased.c -@@ -202,23 +202,23 @@ hostbased_key_allowed(struct passwd *pw, - _PATH_SSH_SYSTEM_HOSTFILE2, - options.ignore_user_known_hosts ? NULL : - _PATH_SSH_USER_HOSTFILE2); - } - - if (host_status == HOST_OK) { - if (key_is_cert(key)) { - fp = key_fingerprint(key->cert->signature_key, -- SSH_FP_MD5, SSH_FP_HEX); -+ key_fp_type_select(), SSH_FP_HEX); - verbose("Accepted certificate ID \"%s\" signed by " - "%s CA %s from %s@%s", key->cert->key_id, - key_type(key->cert->signature_key), fp, - cuser, lookup); - } else { -- fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); -+ fp = key_fingerprint(key, key_fp_type_select(), SSH_FP_HEX); - verbose("Accepted %s public key %s from %s@%s", - key_type(key), fp, cuser, lookup); - } - free(fp); - } - - return (host_status == HOST_OK); - } -diff --git a/openssh-6.6p1/auth2-pubkey.c b/openssh-6.6p1/auth2-pubkey.c ---- a/openssh-6.6p1/auth2-pubkey.c -+++ b/openssh-6.6p1/auth2-pubkey.c -@@ -208,25 +208,25 @@ pubkey_auth_info(Authctxt *authctxt, con - i = vasprintf(&extra, fmt, ap); - va_end(ap); - if (i < 0 || extra == NULL) - fatal("%s: vasprintf failed", __func__); - } - - if (key_is_cert(key)) { - fp = key_fingerprint(key->cert->signature_key, -- SSH_FP_MD5, SSH_FP_HEX); -+ key_fp_type_select(), SSH_FP_HEX); - auth_info(authctxt, "%s ID %s (serial %llu) CA %s %s%s%s", - key_type(key), key->cert->key_id, - (unsigned long long)key->cert->serial, - key_type(key->cert->signature_key), fp, - extra == NULL ? "" : ", ", extra == NULL ? "" : extra); - free(fp); - } else { -- fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); -+ fp = key_fingerprint(key, key_fp_type_select(), SSH_FP_HEX); - auth_info(authctxt, "%s %s%s%s", key_type(key), fp, - extra == NULL ? "" : ", ", extra == NULL ? "" : extra); - free(fp); - } - free(extra); - } - - static int -@@ -360,17 +360,17 @@ check_authkeys_file(FILE *f, char *file, - if (key_is_cert(key)) { - if (!key_equal(found, key->cert->signature_key)) - continue; - if (auth_parse_options(pw, key_options, file, - linenum) != 1) - continue; - if (!key_is_cert_authority) - continue; -- fp = key_fingerprint(found, SSH_FP_MD5, -+ fp = key_fingerprint(found, key_fp_type_select(), - SSH_FP_HEX); - debug("matching CA found: file %s, line %lu, %s %s", - file, linenum, key_type(found), fp); - /* - * If the user has specified a list of principals as - * a key option, then prefer that list to matching - * their username in the certificate principals list. - */ -@@ -401,17 +401,17 @@ check_authkeys_file(FILE *f, char *file, - break; - } else if (key_equal(found, key)) { - if (auth_parse_options(pw, key_options, file, - linenum) != 1) - continue; - if (key_is_cert_authority) - continue; - found_key = 1; -- fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX); -+ fp = key_fingerprint(found, key_fp_type_select(), SSH_FP_HEX); - debug("matching key found: file %s, line %lu %s %s", - file, linenum, key_type(found), fp); - free(fp); - break; - } - } - if (found != NULL) - key_free(found); -@@ -427,17 +427,17 @@ user_cert_trusted_ca(struct passwd *pw, - char *ca_fp, *principals_file = NULL; - const char *reason; - int ret = 0; - - if (!key_is_cert(key) || options.trusted_user_ca_keys == NULL) - return 0; - - ca_fp = key_fingerprint(key->cert->signature_key, -- SSH_FP_MD5, SSH_FP_HEX); -+ key_fp_type_select(), SSH_FP_HEX); - - if (key_in_file(key->cert->signature_key, - options.trusted_user_ca_keys, 1) != 1) { - debug2("%s: CA %s %s is not listed in %s", __func__, - key_type(key->cert->signature_key), ca_fp, - options.trusted_user_ca_keys); - goto out; - } -diff --git a/openssh-6.6p1/key.c b/openssh-6.6p1/key.c ---- a/openssh-6.6p1/key.c -+++ b/openssh-6.6p1/key.c -@@ -420,30 +420,39 @@ key_fingerprint_raw(const Key *k, enum f - *dgst_raw_length = ssh_digest_bytes(hash_alg); - } else { - fatal("%s: blob is null", __func__); - } - return retval; - } - - static char * --key_fingerprint_hex(u_char *dgst_raw, u_int dgst_raw_len) -+key_fingerprint_hex(u_char *dgst_raw, u_int dgst_raw_len, enum fp_type dgst_type) - { - char *retval; - u_int i; - -- retval = xcalloc(1, dgst_raw_len * 3 + 1); -+ /* reserve space for both the key hash and the string for the hash type */ -+ retval = xcalloc(1, dgst_raw_len * 3 + 1 + SSH_FP_TYPE_STRLEN + 2); - for (i = 0; i < dgst_raw_len; i++) { - char hex[4]; - snprintf(hex, sizeof(hex), "%02x:", dgst_raw[i]); - strlcat(retval, hex, dgst_raw_len * 3 + 1); - } - - /* Remove the trailing ':' character */ -- retval[(dgst_raw_len * 3) - 1] = '\0'; -+ retval[(dgst_raw_len * 3) - 1] = ' '; -+ -+ /* Append hash type */ -+ { -+ char hash[SSH_FP_TYPE_STRLEN + 2 + 1]; -+ snprintf(hash, sizeof(hash), "[%s]", key_fp_type_str(dgst_type)); -+ strlcat(retval, hash, dgst_raw_len * 3 + 1 + SSH_FP_TYPE_STRLEN + 2); -+ } -+ - return retval; - } - - static char * - key_fingerprint_bubblebabble(u_char *dgst_raw, u_int dgst_raw_len) - { - char vowels[] = { 'a', 'e', 'i', 'o', 'u', 'y' }; - char consonants[] = { 'b', 'c', 'd', 'f', 'g', 'h', 'k', 'l', 'm', -@@ -518,17 +527,18 @@ key_fingerprint_bubblebabble(u_char *dgs - * can be in the exact middle of the picture, and FLDBASE should be >=8 . - * Else pictures would be too dense, and drawing the frame would - * fail, too, because the key type would not fit in anymore. - */ - #define FLDBASE 8 - #define FLDSIZE_Y (FLDBASE + 1) - #define FLDSIZE_X (FLDBASE * 2 + 1) - static char * --key_fingerprint_randomart(u_char *dgst_raw, u_int dgst_raw_len, const Key *k) -+key_fingerprint_randomart(u_char *dgst_raw, u_int dgst_raw_len, const Key *k, -+ enum fp_type dgst_type) - { - /* - * Chars to be used after each other every time the worm - * intersects with itself. Matter of taste. - */ - char *augmentation_string = " .o+=*BOX@%&#/^SE"; - char *retval, *p; - u_char field[FLDSIZE_X][FLDSIZE_Y]; -@@ -585,18 +595,19 @@ key_fingerprint_randomart(u_char *dgst_r - *p++ = '|'; - for (x = 0; x < FLDSIZE_X; x++) - *p++ = augmentation_string[MIN(field[x][y], len)]; - *p++ = '|'; - *p++ = '\n'; - } - - /* output lower border */ -- *p++ = '+'; -- for (i = 0; i < FLDSIZE_X; i++) -+ i = snprintf(p, FLDSIZE_X, "+--[%s]", key_fp_type_str(dgst_type)); -+ p += i; -+ for (i--; i < FLDSIZE_X; i++) - *p++ = '-'; - *p++ = '+'; - - return retval; - } - - char * - key_fingerprint(const Key *k, enum fp_type dgst_type, enum fp_rep dgst_rep) -@@ -605,34 +616,91 @@ key_fingerprint(const Key *k, enum fp_ty - u_char *dgst_raw; - u_int dgst_raw_len; - - dgst_raw = key_fingerprint_raw(k, dgst_type, &dgst_raw_len); - if (!dgst_raw) - fatal("key_fingerprint: null from key_fingerprint_raw()"); - switch (dgst_rep) { - case SSH_FP_HEX: -- retval = key_fingerprint_hex(dgst_raw, dgst_raw_len); -+ retval = key_fingerprint_hex(dgst_raw, dgst_raw_len, dgst_type); - break; - case SSH_FP_BUBBLEBABBLE: - retval = key_fingerprint_bubblebabble(dgst_raw, dgst_raw_len); - break; - case SSH_FP_RANDOMART: -- retval = key_fingerprint_randomart(dgst_raw, dgst_raw_len, k); -+ retval = key_fingerprint_randomart(dgst_raw, dgst_raw_len, k, dgst_type); - break; - default: - fatal("key_fingerprint: bad digest representation %d", - dgst_rep); - break; - } - explicit_bzero(dgst_raw, dgst_raw_len); - free(dgst_raw); - return retval; - } - -+enum fp_type -+key_fp_type_select(void) -+{ -+ static enum fp_type fp; -+ static char fp_defined = 0; -+ char *env; -+ -+ if (!fp_defined) { -+ env = getenv(SSH_FP_TYPE_ENVVAR); -+ if (env) { -+ if (!strcasecmp(env, "md5") || -+ !strcasecmp(env, "md-5")) -+ fp = SSH_FP_MD5; -+ else if (!strcasecmp(env, "sha1") || -+ !strcasecmp(env, "sha-1")) -+ fp = SSH_FP_SHA1; -+#ifdef HAVE_EVP_SHA256 -+ else if (!strcasecmp(env, "sha256") || -+ !strcasecmp(env, "sha-256")) -+ fp = SSH_FP_SHA256; -+#endif -+ else { -+ error("invalid key type in environment variable " -+ SSH_FP_TYPE_ENVVAR ": '%s' - falling back to MD5.", -+ env); -+ fp = SSH_FP_MD5; -+ } -+ } else -+ fp = SSH_FP_MD5; -+ -+ fp_defined = 1; -+ } -+ return fp; -+} -+ -+/* -+ * string lengths must be less or equal to SSH_FP_TYPE_STRLEN (defined in -+ * key.h) as to fit into the fingerprint string buffer -+ */ -+char * -+key_fp_type_str(enum fp_type dgst_type) -+{ -+ switch (dgst_type) { -+ case SSH_FP_MD5: -+ return "MD5"; -+ case SSH_FP_SHA1: -+ return "SHA-1"; -+#ifdef HAVE_EVP_SHA256 -+ case SSH_FP_SHA256: -+ return "SHA-256"; -+#endif -+ default: -+ fatal("%s: unknown key fingerprint hash algorithm requested", __func__); -+ } -+} -+ -+ - /* - * Reads a multiple-precision integer in decimal from the buffer, and advances - * the pointer. The integer must already be initialized. This function is - * permitted to modify the buffer. This leaves *cpp to point just beyond the - * last processed (and maybe modified) character. Note that this may modify - * the buffer containing the number. - */ - static int -diff --git a/openssh-6.6p1/key.h b/openssh-6.6p1/key.h ---- a/openssh-6.6p1/key.h -+++ b/openssh-6.6p1/key.h -@@ -53,16 +53,18 @@ enum fp_type { - SSH_FP_MD5, - SSH_FP_SHA256 - }; - enum fp_rep { - SSH_FP_HEX, - SSH_FP_BUBBLEBABBLE, - SSH_FP_RANDOMART - }; -+#define SSH_FP_TYPE_ENVVAR "SSH_FINGERPRINT_TYPE" -+#define SSH_FP_TYPE_STRLEN 8 - - /* key is stored in external hardware */ - #define KEY_FLAG_EXT 0x0001 - - #define CERT_MAX_PRINCIPALS 256 - struct KeyCert { - Buffer certblob; /* Kept around for use on wire */ - u_int type; /* SSH2_CERT_TYPE_USER or SSH2_CERT_TYPE_HOST */ -@@ -104,16 +106,18 @@ int key_equal_public(const Key *, cons - int key_equal(const Key *, const Key *); - char *key_fingerprint(const Key *, enum fp_type, enum fp_rep); - u_char *key_fingerprint_raw(const Key *, enum fp_type, u_int *); - const char *key_type(const Key *); - const char *key_cert_type(const Key *); - int key_write(const Key *, FILE *); - int key_read(Key *, char **); - u_int key_size(const Key *); -+enum fp_type key_fp_type_select(void); -+char *key_fp_type_str(enum fp_type); - - Key *key_generate(int, u_int); - Key *key_from_private(const Key *); - int key_type_from_name(char *); - int key_is_cert(const Key *); - int key_type_is_cert(int); - int key_type_plain(int); - int key_to_certified(Key *, int); -diff --git a/openssh-6.6p1/ssh-add.c b/openssh-6.6p1/ssh-add.c ---- a/openssh-6.6p1/ssh-add.c -+++ b/openssh-6.6p1/ssh-add.c -@@ -325,17 +325,17 @@ list_identities(AuthenticationConnection - int version; - - for (version = 1; version <= 2; version++) { - for (key = ssh_get_first_identity(ac, &comment, version); - key != NULL; - key = ssh_get_next_identity(ac, &comment, version)) { - had_identities = 1; - if (do_fp) { -- fp = key_fingerprint(key, SSH_FP_MD5, -+ fp = key_fingerprint(key, key_fp_type_select(), - SSH_FP_HEX); - printf("%d %s %s (%s)\n", - key_size(key), fp, comment, key_type(key)); - free(fp); - } else { - if (!key_write(key, stdout)) - fprintf(stderr, "key_write failed"); - fprintf(stdout, " %s\n", comment); -diff --git a/openssh-6.6p1/ssh-agent.c b/openssh-6.6p1/ssh-agent.c ---- a/openssh-6.6p1/ssh-agent.c -+++ b/openssh-6.6p1/ssh-agent.c -@@ -193,17 +193,17 @@ lookup_identity(Key *key, int version) - - /* Check confirmation of keysign request */ - static int - confirm_key(Identity *id) - { - char *p; - int ret = -1; - -- p = key_fingerprint(id->key, SSH_FP_MD5, SSH_FP_HEX); -+ p = key_fingerprint(id->key, key_fp_type_select(), SSH_FP_HEX); - if (ask_permission("Allow use of key %s?\nKey fingerprint %s.", - id->comment, p)) - ret = 0; - free(p); - - return (ret); - } - -diff --git a/openssh-6.6p1/ssh-keygen.c b/openssh-6.6p1/ssh-keygen.c ---- a/openssh-6.6p1/ssh-keygen.c -+++ b/openssh-6.6p1/ssh-keygen.c -@@ -741,27 +741,27 @@ do_download(struct passwd *pw) - { - #ifdef ENABLE_PKCS11 - Key **keys = NULL; - int i, nkeys; - enum fp_rep rep; - enum fp_type fptype; - char *fp, *ra; - -- fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5; -+ fptype = print_bubblebabble ? SSH_FP_SHA1 : key_fp_type_select(); - rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX; - - pkcs11_init(0); - nkeys = pkcs11_add_provider(pkcs11provider, NULL, &keys); - if (nkeys <= 0) - fatal("cannot read public key from pkcs11"); - for (i = 0; i < nkeys; i++) { - if (print_fingerprint) { - fp = key_fingerprint(keys[i], fptype, rep); -- ra = key_fingerprint(keys[i], SSH_FP_MD5, -+ ra = key_fingerprint(keys[i], key_fp_type_select(), - SSH_FP_RANDOMART); - printf("%u %s %s (PKCS11 key)\n", key_size(keys[i]), - fp, key_type(keys[i])); - if (log_level >= SYSLOG_LEVEL_VERBOSE) - printf("%s\n", ra); - free(ra); - free(fp); - } else { -@@ -784,29 +784,29 @@ do_fingerprint(struct passwd *pw) - FILE *f; - Key *public; - char *comment = NULL, *cp, *ep, line[16*1024], *fp, *ra; - int i, skip = 0, num = 0, invalid = 1; - enum fp_rep rep; - enum fp_type fptype; - struct stat st; - -- fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5; -+ fptype = print_bubblebabble ? SSH_FP_SHA1 : key_fp_type_select(); - rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX; - - if (!have_identity) - ask_filename(pw, "Enter file in which the key is"); - if (stat(identity_file, &st) < 0) { - perror(identity_file); - exit(1); - } - public = key_load_public(identity_file, &comment); - if (public != NULL) { - fp = key_fingerprint(public, fptype, rep); -- ra = key_fingerprint(public, SSH_FP_MD5, SSH_FP_RANDOMART); -+ ra = key_fingerprint(public, key_fp_type_select(), SSH_FP_RANDOMART); - printf("%u %s %s (%s)\n", key_size(public), fp, comment, - key_type(public)); - if (log_level >= SYSLOG_LEVEL_VERBOSE) - printf("%s\n", ra); - key_free(public); - free(comment); - free(ra); - free(fp); -@@ -862,17 +862,17 @@ do_fingerprint(struct passwd *pw) - public = key_new(KEY_UNSPEC); - if (key_read(public, &cp) != 1) { - key_free(public); - continue; - } - } - comment = *cp ? cp : comment; - fp = key_fingerprint(public, fptype, rep); -- ra = key_fingerprint(public, SSH_FP_MD5, SSH_FP_RANDOMART); -+ ra = key_fingerprint(public, key_fp_type_select(), SSH_FP_RANDOMART); - printf("%u %s %s (%s)\n", key_size(public), fp, - comment ? comment : "no comment", key_type(public)); - if (log_level >= SYSLOG_LEVEL_VERBOSE) - printf("%s\n", ra); - free(ra); - free(fp); - key_free(public); - invalid = 0; -@@ -983,20 +983,20 @@ do_gen_all_hostkeys(struct passwd *pw) - static void - printhost(FILE *f, const char *name, Key *public, int ca, int hash) - { - if (print_fingerprint) { - enum fp_rep rep; - enum fp_type fptype; - char *fp, *ra; - -- fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5; -+ fptype = print_bubblebabble ? SSH_FP_SHA1 : key_fp_type_select(); - rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX; - fp = key_fingerprint(public, fptype, rep); -- ra = key_fingerprint(public, SSH_FP_MD5, SSH_FP_RANDOMART); -+ ra = key_fingerprint(public, key_fp_type_select(), SSH_FP_RANDOMART); - printf("%u %s %s (%s)\n", key_size(public), fp, name, - key_type(public)); - if (log_level >= SYSLOG_LEVEL_VERBOSE) - printf("%s\n", ra); - free(ra); - free(fp); - } else { - if (hash && (name = host_hash(name, NULL, 0)) == NULL) -@@ -1873,19 +1873,19 @@ do_show_cert(struct passwd *pw) - if (stat(identity_file, &st) < 0) - fatal("%s: %s: %s", __progname, identity_file, strerror(errno)); - if ((key = key_load_public(identity_file, NULL)) == NULL) - fatal("%s is not a public key", identity_file); - if (!key_is_cert(key)) - fatal("%s is not a certificate", identity_file); - v00 = key->type == KEY_RSA_CERT_V00 || key->type == KEY_DSA_CERT_V00; - -- key_fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); -+ key_fp = key_fingerprint(key, key_fp_type_select(), SSH_FP_HEX); - ca_fp = key_fingerprint(key->cert->signature_key, -- SSH_FP_MD5, SSH_FP_HEX); -+ key_fp_type_select(), SSH_FP_HEX); - - printf("%s:\n", identity_file); - printf(" Type: %s %s certificate\n", key_ssh_name(key), - key_cert_type(key)); - printf(" Public key: %s %s\n", key_type(key), key_fp); - printf(" Signing CA: %s %s\n", - key_type(key->cert->signature_key), ca_fp); - printf(" Key ID: \"%s\"\n", key->cert->key_id); -@@ -2681,18 +2681,18 @@ passphrase_again: - exit(1); - } - if (!key_write(public, f)) - fprintf(stderr, "write key failed\n"); - fprintf(f, " %s\n", comment); - fclose(f); - - if (!quiet) { -- char *fp = key_fingerprint(public, SSH_FP_MD5, SSH_FP_HEX); -- char *ra = key_fingerprint(public, SSH_FP_MD5, -+ char *fp = key_fingerprint(public, key_fp_type_select(), SSH_FP_HEX); -+ char *ra = key_fingerprint(public, key_fp_type_select(), - SSH_FP_RANDOMART); - printf("Your public key has been saved in %s.\n", - identity_file); - printf("The key fingerprint is:\n"); - printf("%s %s\n", fp, comment); - printf("The key's randomart image is:\n"); - printf("%s\n", ra); - free(ra); -diff --git a/openssh-6.6p1/sshconnect.c b/openssh-6.6p1/sshconnect.c ---- a/openssh-6.6p1/sshconnect.c -+++ b/openssh-6.6p1/sshconnect.c -@@ -909,18 +909,18 @@ check_host_key(char *hostname, struct so - "address '%.128s' to the list of known " - "hosts (%.30s).", type, ip, - user_hostfiles[0]); - else - logit("Warning: Permanently added the %s host " - "key for IP address '%.128s' to the list " - "of known hosts.", type, ip); - } else if (options.visual_host_key) { -- fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX); -- ra = key_fingerprint(host_key, SSH_FP_MD5, -+ fp = key_fingerprint(host_key, key_fp_type_select(), SSH_FP_HEX); -+ ra = key_fingerprint(host_key, key_fp_type_select(), - SSH_FP_RANDOMART); - logit("Host key fingerprint is %s\n%s\n", fp, ra); - free(ra); - free(fp); - } - break; - case HOST_NEW: - if (options.host_key_alias == NULL && port != 0 && -@@ -950,18 +950,18 @@ check_host_key(char *hostname, struct so - - if (show_other_keys(host_hostkeys, host_key)) - snprintf(msg1, sizeof(msg1), - "\nbut keys of different type are already" - " known for this host."); - else - snprintf(msg1, sizeof(msg1), "."); - /* The default */ -- fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX); -- ra = key_fingerprint(host_key, SSH_FP_MD5, -+ fp = key_fingerprint(host_key, key_fp_type_select(), SSH_FP_HEX); -+ ra = key_fingerprint(host_key, key_fp_type_select(), - SSH_FP_RANDOMART); - msg2[0] = '\0'; - if (options.verify_host_key_dns) { - if (matching_host_key_dns) - snprintf(msg2, sizeof(msg2), - "Matching host key fingerprint" - " found in DNS.\n"); - else -@@ -1215,17 +1215,17 @@ fail: - - /* returns 0 if key verifies or -1 if key does NOT verify */ - int - verify_host_key(char *host, struct sockaddr *hostaddr, Key *host_key) - { - int flags = 0; - char *fp; - -- fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX); -+ fp = key_fingerprint(host_key, key_fp_type_select(), SSH_FP_HEX); - debug("Server host key: %s %s", key_type(host_key), fp); - free(fp); - - /* XXX certs are not yet supported for DNS */ - if (!key_is_cert(host_key) && options.verify_host_key_dns && - verify_host_key_dns(host, hostaddr, host_key, &flags) == 0) { - if (flags & DNS_VERIFY_FOUND) { - -@@ -1322,18 +1322,18 @@ show_other_keys(struct hostkeys *hostkey - char *fp, *ra; - const struct hostkey_entry *found; - - for (i = 0; type[i] != -1; i++) { - if (type[i] == key->type) - continue; - if (!lookup_key_in_hostkeys_by_type(hostkeys, type[i], &found)) - continue; -- fp = key_fingerprint(found->key, SSH_FP_MD5, SSH_FP_HEX); -- ra = key_fingerprint(found->key, SSH_FP_MD5, SSH_FP_RANDOMART); -+ fp = key_fingerprint(found->key, key_fp_type_select(), SSH_FP_HEX); -+ ra = key_fingerprint(found->key, key_fp_type_select(), SSH_FP_RANDOMART); - logit("WARNING: %s key found for host %s\n" - "in %s:%lu\n" - "%s key fingerprint %s.", - key_type(found->key), - found->host, found->file, found->line, - key_type(found->key), fp); - if (options.visual_host_key) - logit("%s", ra); -@@ -1344,17 +1344,17 @@ show_other_keys(struct hostkeys *hostkey - return ret; - } - - static void - warn_changed_key(Key *host_key) - { - char *fp; - -- fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX); -+ fp = key_fingerprint(host_key, key_fp_type_select(), SSH_FP_HEX); - - error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); - error("@ WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED! @"); - error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); - error("IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"); - error("Someone could be eavesdropping on you right now (man-in-the-middle attack)!"); - error("It is also possible that a host key has just been changed."); - error("The fingerprint for the %s key sent by the remote host is\n%s.", -diff --git a/openssh-6.6p1/sshconnect2.c b/openssh-6.6p1/sshconnect2.c ---- a/openssh-6.6p1/sshconnect2.c -+++ b/openssh-6.6p1/sshconnect2.c -@@ -579,17 +579,17 @@ input_userauth_pk_ok(int type, u_int32_t - goto done; - } - if (key->type != pktype) { - error("input_userauth_pk_ok: type mismatch " - "for decoded key (received %d, expected %d)", - key->type, pktype); - goto done; - } -- fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); -+ fp = key_fingerprint(key, key_fp_type_select(), SSH_FP_HEX); - debug2("input_userauth_pk_ok: fp %s", fp); - free(fp); - - /* - * search keys in the reverse order, because last candidate has been - * moved to the end of the queue. this also avoids confusion by - * duplicate keys - */ -@@ -990,17 +990,17 @@ sign_and_send_pubkey(Authctxt *authctxt, - Buffer b; - u_char *blob, *signature; - u_int bloblen, slen; - u_int skip = 0; - int ret = -1; - int have_sig = 1; - char *fp; - -- fp = key_fingerprint(id->key, SSH_FP_MD5, SSH_FP_HEX); -+ fp = key_fingerprint(id->key, key_fp_type_select(), SSH_FP_HEX); - debug3("sign_and_send_pubkey: %s %s", key_type(id->key), fp); - free(fp); - - if (key_to_blob(id->key, &blob, &bloblen) == 0) { - /* we cannot handle this key */ - debug3("sign_and_send_pubkey: cannot handle key"); - return 0; - } diff --git a/openssh-6.6p1-fips-checks.patch b/openssh-6.6p1-fips-checks.patch deleted file mode 100644 index 3c78a2a..0000000 --- a/openssh-6.6p1-fips-checks.patch +++ /dev/null @@ -1,529 +0,0 @@ -# HG changeset patch -# Parent 717873621cf4991164c61caafd9ac07473231f10 -# Simple implementation of FIPS 140-2 selfchecks. Use OpenSSL to generate and -# verify checksums of binaries. Any hash iused in OpenSSH can be used (MD5 would -# obviously be a poor choice, since OpenSSL would barf and abort immediately in -# FIPS mode). SHA-2 seems to be a reasonable choice. -# -# The logic of the checks is as follows: decide whether FIPS mode is mandated -# (either by checking /proc/sys/crypto/fips_enabled or envoroinment variable -# SSH_FORCE_FIPS. In FIPS mode, checksums are required to match (inability to -# retrieve pre-calculated hash is a fatal error). In non-FIPS mode the checks -# still must be performed, unless the hashes are not installed. Thus if the hash -# file is not found (or the hash matches), proceed in non-FIPS mode and abort -# otherwise. - -diff --git a/openssh-6.6p1/fips-check.c b/openssh-6.6p1/fips-check.c -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/fips-check.c -@@ -0,0 +1,37 @@ -+#include "includes.h" -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "digest.h" -+#include "fips.h" -+ -+#include -+ -+#define PROC_NAME_LEN 64 -+ -+static const char *argv0; -+ -+void -+print_help_exit(int ev) -+{ -+ fprintf(stderr, "%s <-c|-w> \n", argv0); -+ fprintf(stderr, " -c verify hash of 'file' against hash in 'checksum_file'\n"); -+ fprintf(stderr, " -w write hash of 'file' into 'checksum_file'\n"); -+ exit(ev); -+} -+ -+int -+main(int argc, char **argv) -+{ -+ -+ fips_ssh_init(); -+// printf("SSL Error: %lx: %s", ERR_get_error(), ERR_get_string(ERR_get_error(), NULL)); -+ -+ return 0; -+} -diff --git a/openssh-6.6p1/fips.c b/openssh-6.6p1/fips.c ---- a/openssh-6.6p1/fips.c -+++ b/openssh-6.6p1/fips.c -@@ -24,21 +24,342 @@ - - #include "includes.h" - - #include "fips.h" - - #include "digest.h" - #include "key.h" - #include "log.h" -+#include "xmalloc.h" -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include - - #include -+#include -+ -+enum fips_checksum_status { -+ CHECK_OK = 0, -+ CHECK_FAIL, -+ CHECK_MISSING -+}; - - static int fips_state = -1; - -+static char * -+hex_fingerprint(u_int raw_len, u_char *raw) -+{ -+ char *retval; -+ u_int i; -+ -+ /* reserve space for both the key hash and the string for the hash type */ -+ retval = malloc(3 * raw_len); -+ for (i = 0; i < raw_len; i++) { -+ char hex[4]; -+ snprintf(hex, sizeof(hex), "%02x:", raw[i]); -+ strlcat(retval, hex, raw_len * 3); -+ } -+ -+ return retval; -+} -+ -+/* calculates hash of contents of file given by filename using algorithm alg -+ * and placing the resukt into newly allacated memory - remember to free it -+ * when not needed anymore */ -+static int -+hash_file(const char *filename, int alg, u_char **hash_out) -+{ -+ int check = -1; -+ int hash_len; -+ int fd; -+ struct stat fs; -+ void *hmap; -+ char *hash; -+ -+ hash_len = ssh_digest_bytes(alg); -+ hash = xmalloc(hash_len); -+ -+ fd = open(filename, O_RDONLY); -+ if (-1 == fd) -+ goto bail_out; -+ -+ if (-1 == fstat(fd, &fs)) -+ goto bail_out; -+ -+ hmap = mmap(NULL, fs.st_size, PROT_READ, MAP_SHARED, fd, 0); -+ -+ if ((void *)(-1) != hmap) { -+ check = ssh_digest_memory(alg, hmap, fs.st_size, hash, hash_len); -+ munmap(hmap, fs.st_size); -+ } -+ close(fd); -+ -+bail_out: -+ if (0 == check) { -+ check = CHECK_OK; -+ *hash_out = hash; -+ } else { -+ check = CHECK_FAIL; -+ *hash_out = NULL; -+ free(hash); -+ } -+ return check; -+} -+ -+/* find pathname of binary of process with PID pid. exe is buffer expected to -+ * be capable of holding at least max_pathlen characters -+ */ -+static int -+get_executable_path(pid_t pid, char *exe, int max_pathlen) -+{ -+ char exe_sl[PROC_EXE_PATH_LEN]; -+ int n; -+ -+ n = snprintf(exe_sl, sizeof(exe_sl), "/proc/%u/exe", pid); -+ if ((n <= 10) || (n >= max_pathlen)) { -+ fatal("error compiling filename of link to executable"); -+ } -+ -+ n = readlink(exe_sl, exe, max_pathlen); -+ if (n < max_pathlen) { -+ exe[n] = 0; -+ } else { -+ fatal("error getting executable pathname"); -+ } -+ return 0; -+} -+ -+/* Read checksum file chk, storing the algorithm used for generating it into -+ * *alg; allocate enough memory to hold the hash and return it in *hash. -+ * Remember to free() it when not needed anymore. -+ */ -+static int -+read_hash(const char *chk, int *alg, u_char **hash) -+{ -+ int check = -1; -+ int hash_len; -+ int fdh, n; -+ char alg_c; -+ char *hash_in; -+ -+ *hash = NULL; -+ -+ fdh = open(chk, O_RDONLY); -+ if (-1 == fdh) { -+ switch (errno) { -+ case ENOENT: -+ check = CHECK_MISSING; -+ debug("fips: checksum file %s is missing\n", chk); -+ break; -+ default: -+ check = CHECK_FAIL; -+ debug("fips: ckecksum file %s not accessible\n", chk); -+ break; -+ -+ } -+ goto bail_out; -+ } -+ -+ n = read(fdh, &alg_c, 1); -+ if (1 != n) { -+ check = CHECK_FAIL; -+ goto bail_out; -+ } -+ -+ *alg = (int)alg_c; -+ hash_len = ssh_digest_bytes(*alg); -+ hash_in = xmalloc(hash_len); -+ -+ n = read(fdh, (void *)hash_in, hash_len); -+ if (hash_len != n) { -+ debug("fips: unable to read whole checksum from checksum file\n"); -+ free (hash_in); -+ check = CHECK_FAIL; -+ } else { -+ check = CHECK_OK; -+ *hash = hash_in; -+ } -+bail_out: -+ return check; -+} -+ -+static int -+fips_hash_self(void) -+{ -+ int check = -1; -+ int alg; -+ u_char *hash, *hash_chk; -+ char *exe, *chk; -+ -+ exe = xmalloc(PATH_MAX); -+ chk = xmalloc(PATH_MAX); -+ -+ /* we will need to add the ".chk" suffix and the null terminator */ -+ check = get_executable_path(getpid(), exe -+ , PATH_MAX - strlen(CHECKSUM_SUFFIX) - 1); -+ -+ strncpy(chk, exe, PATH_MAX); -+ strlcat(chk, CHECKSUM_SUFFIX, PATH_MAX); -+ -+ check = read_hash(chk, &alg, &hash_chk); -+ if (CHECK_OK != check) -+ goto cleanup_chk; -+ -+ check = hash_file(exe, alg, &hash); -+ if (CHECK_OK != check) -+ goto cleanup; -+ -+ check = memcmp(hash, hash_chk, ssh_digest_bytes(alg)); -+ if (0 == check) { -+ check = CHECK_OK; -+ debug("fips: checksum matches\n"); -+ } else { -+ check = CHECK_FAIL; -+ debug("fips: checksum mismatch!\n"); -+ } -+ -+cleanup: -+ free(hash); -+cleanup_chk: -+ free(hash_chk); -+ free(chk); -+ free(exe); -+ -+ return check; -+} -+ -+static int -+fips_check_required_proc(void) -+{ -+ int fips_required = 0; -+ int fips_fd; -+ char fips_sys = 0; -+ -+ struct stat dummy; -+ if (-1 == stat(FIPS_PROC_PATH, &dummy)) { -+ switch (errno) { -+ case ENOENT: -+ case ENOTDIR: -+ break; -+ default: -+ fatal("Check for system-wide FIPS mode is required and %s cannot" -+ " be accessed for reason other than non-existence - aborting" -+ , FIPS_PROC_PATH); -+ break; -+ } -+ } else { -+ if (-1 == (fips_fd = open(FIPS_PROC_PATH, O_RDONLY))) -+ fatal("Check for system-wide FIPS mode is required and %s cannot" -+ " be opened for reading - aborting" -+ , FIPS_PROC_PATH); -+ if (1 > read(fips_fd, &fips_sys, 1)) -+ fatal("Check for system-wide FIPS mode is required and %s doesn't" -+ " return at least one character - aborting" -+ , FIPS_PROC_PATH); -+ close(fips_sys); -+ switch (fips_sys) { -+ case '0': -+ case '1': -+ fips_required = fips_sys - '0'; -+ break; -+ default: -+ fatal("Bogus character %c found in %s - aborting" -+ , fips_sys, FIPS_PROC_PATH); -+ } -+ } -+ return fips_required; -+} -+ -+static int -+fips_check_required_env(void) -+{ -+ int fips_required = 0; -+ char *env = getenv(SSH_FORCE_FIPS_ENV); -+ -+ if (env) { -+ errno = 0; -+ fips_required = strtol(env, NULL, 10); -+ if (errno) { -+ debug("bogus value in the %s environment variable, ignoring\n" -+ , SSH_FORCE_FIPS_ENV); -+ fips_required = 0; -+ } else -+ fips_required = 1; -+ } -+ return fips_required; -+} -+ -+static int -+fips_required(void) -+{ -+ int fips_requests = 0; -+ fips_requests += fips_check_required_proc(); -+ fips_requests += fips_check_required_env(); -+ return fips_requests; -+} -+ -+/* check whether FIPS mode is required and perform selfchecksum/selftest */ -+void -+fips_ssh_init(void) -+{ -+ int checksum; -+ -+ checksum = fips_hash_self(); -+ -+ if (fips_required()) { -+ switch (checksum) { -+ case CHECK_OK: -+ debug("fips: mandatory checksum ok"); -+ break; -+ case CHECK_FAIL: -+ fatal("fips: mandatory checksum failed - aborting"); -+ break; -+ case CHECK_MISSING: -+ fatal("fips: mandatory checksum data missing - aborting"); -+ break; -+ default: -+ fatal("Fatal error: internal error at %s:%u" -+ , __FILE__, __LINE__); -+ break; -+ } -+ fips_state = FIPS_mode_set(1); -+ if (1 != fips_state) { -+ ERR_load_crypto_strings(); -+ u_long err = ERR_get_error(); -+ error("fips: OpenSSL error %lx: %s", err, ERR_error_string(err, NULL)); -+ fatal("fips: unable to set OpenSSL into FIPS mode - aborting" -+ , fips_state); -+ } -+ } else { -+ switch (checksum) { -+ case CHECK_OK: -+ debug("fips: checksum ok"); -+ break; -+ case CHECK_FAIL: -+ fatal("fips: checksum failed - aborting"); -+ break; -+ case CHECK_MISSING: -+ debug("fips: mandatory checksum data missing, but not required - continuing non-FIPS"); -+ break; -+ default: -+ fatal("Fatal error: internal error at %s:%u", -+ __FILE__, __LINE__); -+ break; -+ } -+ } -+ return; -+} -+ - int - fips_mode() - { - if (-1 == fips_state) { - fips_state = FIPS_mode(); - if (fips_state) - debug("FIPS mode initialized"); - } -diff --git a/openssh-6.6p1/fips.h b/openssh-6.6p1/fips.h ---- a/openssh-6.6p1/fips.h -+++ b/openssh-6.6p1/fips.h -@@ -1,10 +1,10 @@ - /* -- * Copyright (c) 2012 Petr Cerny. All rights reserved. -+ * Copyright (c) 2012-2014 Petr Cerny. 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 -@@ -19,15 +19,22 @@ - * 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. - */ - #ifndef FIPS_H - #define FIPS_H - -+#define SSH_FORCE_FIPS_ENV "SSH_FORCE_FIPS" -+#define FIPS_PROC_PATH "/proc/sys/crypto/fips_enabled" -+ -+#define PROC_EXE_PATH_LEN 64 -+#define CHECKSUM_SUFFIX ".chk" -+ -+void fips_ssh_init(void); - int fips_mode(void); - int fips_correct_dgst(int); - int fips_dgst_min(void); - enum fp_type fips_correct_fp_type(enum fp_type); - - #endif - -diff --git a/openssh-6.6p1/sftp-server.c b/openssh-6.6p1/sftp-server.c ---- a/openssh-6.6p1/sftp-server.c -+++ b/openssh-6.6p1/sftp-server.c -@@ -47,16 +47,18 @@ - #include "log.h" - #include "misc.h" - #include "match.h" - #include "uidswap.h" - - #include "sftp.h" - #include "sftp-common.h" - -+#include "fips.h" -+ - /* helper */ - #define get_int64() buffer_get_int64(&iqueue); - #define get_int() buffer_get_int(&iqueue); - #define get_string(lenp) buffer_get_string(&iqueue, lenp); - - /* Our verbosity */ - static LogLevel log_level = SYSLOG_LEVEL_ERROR; - -@@ -1453,16 +1455,19 @@ sftp_server_main(int argc, char **argv, - ssize_t len, olen, set_size; - SyslogFacility log_facility = SYSLOG_FACILITY_AUTH; - char *cp, *homedir = NULL, buf[4*4096]; - long mask; - - extern char *optarg; - extern char *__progname; - -+ /* initialize fips */ -+ fips_ssh_init(); -+ - __progname = ssh_get_progname(argv[0]); - log_init(__progname, log_level, log_facility, log_stderr); - - pw = pwcopy(user_pw); - - while (!skipargs && (ch = getopt(argc, argv, - "d:f:l:P:p:Q:u:m:cehR")) != -1) { - switch (ch) { -diff --git a/openssh-6.6p1/ssh.c b/openssh-6.6p1/ssh.c ---- a/openssh-6.6p1/ssh.c -+++ b/openssh-6.6p1/ssh.c -@@ -420,16 +420,19 @@ main(int ac, char **av) - struct stat st; - struct passwd *pw; - int timeout_ms; - extern int optind, optreset; - extern char *optarg; - Forward fwd; - struct addrinfo *addrs = NULL; - -+ /* initialize fips */ -+ fips_ssh_init(); -+ - /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ - sanitise_stdfd(); - - __progname = ssh_get_progname(av[0]); - - #ifndef HAVE_SETPROCTITLE - /* Prepare for later setproctitle emulation */ - /* Save argv so it isn't clobbered by setproctitle() emulation */ -diff --git a/openssh-6.6p1/sshd.c b/openssh-6.6p1/sshd.c ---- a/openssh-6.6p1/sshd.c -+++ b/openssh-6.6p1/sshd.c -@@ -1466,16 +1466,19 @@ main(int ac, char **av) - u_int64_t ibytes, obytes; - mode_t new_umask; - Key *key; - Key *pubkey; - int keytype; - Authctxt *authctxt; - struct connection_info *connection_info = get_connection_info(0, 0); - -+ /* initialize fips */ -+ fips_ssh_init(); -+ - #ifdef HAVE_SECUREWARE - (void)set_auth_parameters(ac, av); - #endif - __progname = ssh_get_progname(av[0]); - - /* Save argv. Duplicate so setproctitle emulation doesn't clobber it */ - saved_argc = ac; - rexec_argc = ac; diff --git a/openssh-6.6p1-fips.patch b/openssh-6.6p1-fips.patch deleted file mode 100644 index 21e675f..0000000 --- a/openssh-6.6p1-fips.patch +++ /dev/null @@ -1,1059 +0,0 @@ -# comply with FIPS 140-2 by using only approved crypto algorithms -# when OpenSSL is detected to be running in FIPS mode -# -# HG changeset patch -# Parent 844066cb9c0ec2b10eb1ace7134f7bced7cc802d - -diff --git a/openssh-6.6p1/Makefile.in b/openssh-6.6p1/Makefile.in ---- a/openssh-6.6p1/Makefile.in -+++ b/openssh-6.6p1/Makefile.in -@@ -71,17 +71,18 @@ LIBSSH_OBJS=authfd.o authfile.o bufaux.o - readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \ - atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ - monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ - kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \ - msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \ - ssh-pkcs11.o krl.o smult_curve25519_ref.o \ - kexc25519.o kexc25519c.o poly1305.o chacha.o cipher-chachapoly.o \ - ssh-ed25519.o digest-openssl.o hmac.o \ -- sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o -+ sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o \ -+ fips.o - - SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ - sshconnect.o sshconnect1.o sshconnect2.o mux.o \ - roaming_common.o roaming_client.o - - SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ - audit.o audit-bsm.o audit-linux.o platform.o \ - sshpty.o sshlogin.o servconf.o serverloop.o \ -diff --git a/openssh-6.6p1/auth-rsa.c b/openssh-6.6p1/auth-rsa.c ---- a/openssh-6.6p1/auth-rsa.c -+++ b/openssh-6.6p1/auth-rsa.c -@@ -44,16 +44,18 @@ - #include "ssh-gss.h" - #endif - #include "monitor_wrap.h" - #include "ssh.h" - #include "misc.h" - - #include "digest.h" - -+#include "fips.h" -+ - /* import */ - extern ServerOptions options; - - /* - * Session identifier that is used to bind key exchange and authentication - * responses to a particular session. - */ - extern u_char session_id[16]; -@@ -84,45 +86,52 @@ auth_rsa_generate_challenge(Key *key) - if (BN_mod(challenge, challenge, key->rsa->n, ctx) == 0) - fatal("auth_rsa_generate_challenge: BN_mod failed"); - BN_CTX_free(ctx); - - return challenge; - } - - int --auth_rsa_verify_response(Key *key, BIGNUM *challenge, u_char response[16]) -+auth_rsa_verify_response(Key *key, BIGNUM *challenge, -+ u_char response[SSH_DIGEST_MAX_LENGTH]) - { -- u_char buf[32], mdbuf[16]; -+ u_char buf[2 * SSH_DIGEST_MAX_LENGTH], mdbuf[SSH_DIGEST_MAX_LENGTH]; - struct ssh_digest_ctx *md; - int len; -+ int dgst; -+ size_t dgst_len; - - /* don't allow short keys */ - if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) { - error("%s: RSA modulus too small: %d < minimum %d bits", - __func__, - BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE); - return (0); - } - -- /* The response is MD5 of decrypted challenge plus session id. */ -+ dgst = fips_correct_dgst(SSH_DIGEST_MD5); -+ dgst_len = ssh_digest_bytes(dgst); -+ -+ /* The response is a hash of decrypted challenge plus session id. -+ * Normally this is MD5, in FIPS mode a stronger function is used. */ - len = BN_num_bytes(challenge); -- if (len <= 0 || len > 32) -+ if (len <= 0 || (unsigned int)len > (2 * dgst_len)) - fatal("%s: bad challenge length %d", __func__, len); -- memset(buf, 0, 32); -- BN_bn2bin(challenge, buf + 32 - len); -- if ((md = ssh_digest_start(SSH_DIGEST_MD5)) == NULL || -- ssh_digest_update(md, buf, 32) < 0 || -- ssh_digest_update(md, session_id, 16) < 0 || -+ memset(buf, 0, sizeof(buf)); -+ BN_bn2bin(challenge, buf + 2 * dgst_len - len); -+ if ((md = ssh_digest_start(dgst)) == NULL || -+ ssh_digest_update(md, buf, 2 * dgst_len) < 0 || -+ ssh_digest_update(md, session_id, dgst_len) < 0 || - ssh_digest_final(md, mdbuf, sizeof(mdbuf)) < 0) - fatal("%s: md5 failed", __func__); - ssh_digest_free(md); - - /* Verify that the response is the original challenge. */ -- if (timingsafe_bcmp(response, mdbuf, 16) != 0) { -+ if (timingsafe_bcmp(response, mdbuf, dgst_len) != 0) { - /* Wrong answer. */ - return (0); - } - /* Correct answer. */ - return (1); - } - - /* -@@ -130,17 +139,17 @@ auth_rsa_verify_response(Key *key, BIGNU - * and returns true (non-zero) if the client gave the correct answer to - * our challenge; returns zero if the client gives a wrong answer. - */ - - int - auth_rsa_challenge_dialog(Key *key) - { - BIGNUM *challenge, *encrypted_challenge; -- u_char response[16]; -+ u_char response[SSH_DIGEST_MAX_LENGTH]; - int i, success; - - if ((encrypted_challenge = BN_new()) == NULL) - fatal("auth_rsa_challenge_dialog: BN_new() failed"); - - challenge = PRIVSEP(auth_rsa_generate_challenge(key)); - - /* Encrypt the challenge with the public key. */ -@@ -150,17 +159,17 @@ auth_rsa_challenge_dialog(Key *key) - packet_start(SSH_SMSG_AUTH_RSA_CHALLENGE); - packet_put_bignum(encrypted_challenge); - packet_send(); - BN_clear_free(encrypted_challenge); - packet_write_wait(); - - /* Wait for a response. */ - packet_read_expect(SSH_CMSG_AUTH_RSA_RESPONSE); -- for (i = 0; i < 16; i++) -+ for (i = 0; i < ssh_digest_bytes(fips_dgst_min()); i++) - response[i] = (u_char)packet_get_char(); - packet_check_eom(); - - success = PRIVSEP(auth_rsa_verify_response(key, challenge, response)); - BN_clear_free(challenge); - return (success); - } - -diff --git a/openssh-6.6p1/cipher-ctr.c b/openssh-6.6p1/cipher-ctr.c ---- a/openssh-6.6p1/cipher-ctr.c -+++ b/openssh-6.6p1/cipher-ctr.c -@@ -22,16 +22,18 @@ - #include - #include - - #include - - #include "xmalloc.h" - #include "log.h" - -+#include "fips.h" -+ - /* compatibility with old or broken OpenSSL versions */ - #include "openbsd-compat/openssl-compat.h" - - #ifndef USE_BUILTIN_RIJNDAEL - #include - #endif - - struct ssh_aes_ctr_ctx -@@ -134,13 +136,15 @@ evp_aes_128_ctr(void) - aes_ctr.iv_len = AES_BLOCK_SIZE; - aes_ctr.key_len = 16; - aes_ctr.init = ssh_aes_ctr_init; - aes_ctr.cleanup = ssh_aes_ctr_cleanup; - aes_ctr.do_cipher = ssh_aes_ctr; - #ifndef SSH_OLD_EVP - aes_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | - EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV; -+ if (fips_mode()) -+ aes_ctr.flags |= EVP_CIPH_FLAG_FIPS; - #endif - return (&aes_ctr); - } - - #endif /* OPENSSL_HAVE_EVPCTR */ -diff --git a/openssh-6.6p1/cipher.c b/openssh-6.6p1/cipher.c ---- a/openssh-6.6p1/cipher.c -+++ b/openssh-6.6p1/cipher.c -@@ -45,16 +45,18 @@ - - #include "xmalloc.h" - #include "log.h" - #include "misc.h" - #include "cipher.h" - #include "buffer.h" - #include "digest.h" - -+#include "fips.h" -+ - /* compatibility with old or broken OpenSSL versions */ - #include "openbsd-compat/openssl-compat.h" - - extern const EVP_CIPHER *evp_ssh1_bf(void); - extern const EVP_CIPHER *evp_ssh1_3des(void); - extern void ssh1_3des_iv(EVP_CIPHER_CTX *, int, u_char *, int); - - struct Cipher { -@@ -66,17 +68,17 @@ struct Cipher { - u_int auth_len; - u_int discard_len; - u_int flags; - #define CFLAG_CBC (1<<0) - #define CFLAG_CHACHAPOLY (1<<1) - const EVP_CIPHER *(*evptype)(void); - }; - --static const struct Cipher ciphers[] = { -+static const struct Cipher ciphers_all[] = { - { "none", SSH_CIPHER_NONE, 8, 0, 0, 0, 0, 0, EVP_enc_null }, - { "des", SSH_CIPHER_DES, 8, 8, 0, 0, 0, 1, EVP_des_cbc }, - { "3des", SSH_CIPHER_3DES, 8, 16, 0, 0, 0, 1, evp_ssh1_3des }, - { "blowfish", SSH_CIPHER_BLOWFISH, 8, 32, 0, 0, 0, 1, evp_ssh1_bf }, - - { "3des-cbc", SSH_CIPHER_SSH2, 8, 24, 0, 0, 0, 1, EVP_des_ede3_cbc }, - { "blowfish-cbc", - SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_bf_cbc }, -@@ -99,27 +101,67 @@ static const struct Cipher ciphers[] = { - { "aes256-gcm@openssh.com", - SSH_CIPHER_SSH2, 16, 32, 12, 16, 0, 0, EVP_aes_256_gcm }, - #endif - { "chacha20-poly1305@openssh.com", - SSH_CIPHER_SSH2, 8, 64, 0, 16, 0, CFLAG_CHACHAPOLY, NULL }, - { NULL, SSH_CIPHER_INVALID, 0, 0, 0, 0, 0, 0, NULL } - }; - -+static const struct Cipher ciphers_fips140_2[] = { -+ { "none", SSH_CIPHER_NONE, 8, 0, 0, 0, 0, 0, EVP_enc_null }, -+ { "3des", SSH_CIPHER_3DES, 8, 16, 0, 0, 0, 1, evp_ssh1_3des }, -+ -+ { "3des-cbc", SSH_CIPHER_SSH2, 8, 24, 0, 0, 0, 1, EVP_des_ede3_cbc }, -+ { "aes128-cbc", SSH_CIPHER_SSH2, 16, 16, 0, 0, 0, 1, EVP_aes_128_cbc }, -+ { "aes192-cbc", SSH_CIPHER_SSH2, 16, 24, 0, 0, 0, 1, EVP_aes_192_cbc }, -+ { "aes256-cbc", SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 1, EVP_aes_256_cbc }, -+ { "rijndael-cbc@lysator.liu.se", -+ SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 1, EVP_aes_256_cbc }, -+ { "aes128-ctr", SSH_CIPHER_SSH2, 16, 16, 0, 0, 0, 0, EVP_aes_128_ctr }, -+ { "aes192-ctr", SSH_CIPHER_SSH2, 16, 24, 0, 0, 0, 0, EVP_aes_192_ctr }, -+ { "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 0, EVP_aes_256_ctr }, -+#ifdef OPENSSL_HAVE_EVPGCM -+ { "aes128-gcm@openssh.com", -+ SSH_CIPHER_SSH2, 16, 16, 12, 16, 0, 0, EVP_aes_128_gcm }, -+ { "aes256-gcm@openssh.com", -+ SSH_CIPHER_SSH2, 16, 32, 12, 16, 0, 0, EVP_aes_256_gcm }, -+#endif -+ { NULL, SSH_CIPHER_INVALID, 0, 0, 0, 0, 0, 0, NULL } -+}; -+ - /*--*/ - -+/* Returns array of ciphers available depending on selected FIPS mode */ -+static struct Cipher * -+fips_select_ciphers(void) -+{ -+ int fips = fips_mode(); -+ switch (fips) { -+ case 0: -+ return ciphers_all; -+ case 1: -+ return ciphers_fips140_2; -+ default: -+ /* should not be reached */ -+ fatal("Fatal error: incorrect FIPS mode '%i' at %s:%u", -+ fips, __FILE__, __LINE__); -+ return NULL; -+ } -+} -+ - /* Returns a list of supported ciphers separated by the specified char. */ - char * - cipher_alg_list(char sep, int auth_only) - { - char *ret = NULL; - size_t nlen, rlen = 0; - const Cipher *c; - -- for (c = ciphers; c->name != NULL; c++) { -+ for (c = fips_select_ciphers(); c->name != NULL; c++) { - if (c->number != SSH_CIPHER_SSH2) - continue; - if (auth_only && c->auth_len == 0) - continue; - if (ret != NULL) - ret[rlen++] = sep; - nlen = strlen(c->name); - ret = xrealloc(ret, 1, rlen + nlen + 2); -@@ -189,27 +231,27 @@ cipher_mask_ssh1(int client) - } - return mask; - } - - const Cipher * - cipher_by_name(const char *name) - { - const Cipher *c; -- for (c = ciphers; c->name != NULL; c++) -+ for (c = fips_select_ciphers(); c->name != NULL; c++) - if (strcmp(c->name, name) == 0) - return c; - return NULL; - } - - const Cipher * - cipher_by_number(int id) - { - const Cipher *c; -- for (c = ciphers; c->name != NULL; c++) -+ for (c = fips_select_ciphers(); c->name != NULL; c++) - if (c->number == id) - return c; - return NULL; - } - - #define CIPHER_SEP "," - int - ciphers_valid(const char *names) -@@ -241,17 +283,17 @@ ciphers_valid(const char *names) - */ - - int - cipher_number(const char *name) - { - const Cipher *c; - if (name == NULL) - return -1; -- for (c = ciphers; c->name != NULL; c++) -+ for (c = fips_select_ciphers(); c->name != NULL; c++) - if (strcasecmp(c->name, name) == 0) - return c->number; - return -1; - } - - char * - cipher_name(int id) - { -@@ -429,23 +471,24 @@ cipher_cleanup(CipherContext *cc) - * Selects the cipher, and keys if by computing the MD5 checksum of the - * passphrase and using the resulting 16 bytes as the key. - */ - - void - cipher_set_key_string(CipherContext *cc, const Cipher *cipher, - const char *passphrase, int do_encrypt) - { -- u_char digest[16]; -+ u_char digest[SSH_DIGEST_MAX_LENGTH]; -+ int dgst = fips_correct_dgst(SSH_DIGEST_MD5); - -- if (ssh_digest_memory(SSH_DIGEST_MD5, passphrase, strlen(passphrase), -+ if (ssh_digest_memory(dgst, passphrase, strlen(passphrase), - digest, sizeof(digest)) < 0) - fatal("%s: md5 failed", __func__); - -- cipher_init(cc, cipher, digest, 16, NULL, 0, do_encrypt); -+ cipher_init(cc, cipher, digest, ssh_digest_bytes(dgst), NULL, 0, do_encrypt); - - explicit_bzero(digest, sizeof(digest)); - } - - /* - * Exports an IV from the CipherContext required to export the key - * state back from the unprivileged child to the privileged parent - * process. -diff --git a/openssh-6.6p1/fips.c b/openssh-6.6p1/fips.c -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/fips.c -@@ -0,0 +1,128 @@ -+/* -+ * Copyright (c) 2012 Petr Cerny. 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. -+ */ -+ -+#include "includes.h" -+ -+#include "fips.h" -+ -+#include "digest.h" -+#include "key.h" -+#include "log.h" -+ -+#include -+ -+static int fips_state = -1; -+ -+int -+fips_mode() -+{ -+ if (-1 == fips_state) { -+ fips_state = FIPS_mode(); -+ if (fips_state) -+ debug("FIPS mode initialized"); -+ } -+ return fips_state; -+} -+ -+enum fp_type -+fips_correct_fp_type(enum fp_type fp) -+{ -+ int fips; -+ enum fp_type fp_fix = fp; -+ -+ fips = fips_mode(); -+ switch (fips) { -+ case 0: -+ break; -+ case 1: -+ if (SSH_FP_MD5 == fp) { -+ fp_fix = SSH_FP_SHA1; -+ debug("MD5 not allowed in FIPS 140-2 mode, " -+ "using SHA-1 for key fingerprints instead."); -+ } -+ break; -+ default: -+ /* should not be reached */ -+ fatal("Fatal error: incorrect FIPS mode '%i' at %s:%u", -+ fips, __FILE__, __LINE__); -+ } -+ -+ return fp_fix; -+} -+ -+int -+fips_correct_dgst(int digest) -+{ -+ int fips; -+ int rv = -1; -+ -+ fips = fips_mode(); -+ switch (fips) { -+ case 0: -+ rv = digest; -+ break; -+ case 1: -+ switch (digest) { -+ case SSH_DIGEST_MD5: -+ case SSH_DIGEST_RIPEMD160: -+ debug("MD5/RIPEMD160 digests not allowed in FIPS 140-2 mode" -+ "using SHA-1 instead."); -+ rv = SSH_DIGEST_SHA1; -+ break; -+ default: -+ rv = digest; -+ break; -+ } -+ break; -+ default: -+ /* should not be reached */ -+ fatal("Fatal error: incorrect FIPS mode '%i' at %s:%u", -+ fips, __FILE__, __LINE__); -+ } -+ -+ return rv; -+} -+ -+int -+fips_dgst_min(void) -+{ -+ int fips; -+ int dgst; -+ -+ fips = fips_mode(); -+ switch (fips) { -+ case 0: -+ dgst = SSH_DIGEST_MD5; -+ break; -+ case 1: -+ dgst = SSH_DIGEST_SHA1; -+ break; -+ default: -+ /* should not be reached */ -+ fatal("Fatal error: incorrect FIPS mode '%i' at %s:%u", -+ fips, __FILE__, __LINE__); -+ } -+ return dgst; -+} -+ -diff --git a/openssh-6.6p1/fips.h b/openssh-6.6p1/fips.h -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/fips.h -@@ -0,0 +1,33 @@ -+/* -+ * Copyright (c) 2012 Petr Cerny. 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. -+ */ -+#ifndef FIPS_H -+#define FIPS_H -+ -+int fips_mode(void); -+int fips_correct_dgst(int); -+int fips_dgst_min(void); -+enum fp_type fips_correct_fp_type(enum fp_type); -+ -+#endif -+ -diff --git a/openssh-6.6p1/hmac.c b/openssh-6.6p1/hmac.c ---- a/openssh-6.6p1/hmac.c -+++ b/openssh-6.6p1/hmac.c -@@ -139,17 +139,17 @@ ssh_hmac_free(struct ssh_hmac_ctx *ctx) - /* cc -DTEST hmac.c digest.c buffer.c cleanup.c fatal.c log.c xmalloc.c -lcrypto */ - static void - hmac_test(void *key, size_t klen, void *m, size_t mlen, u_char *e, size_t elen) - { - struct ssh_hmac_ctx *ctx; - size_t i; - u_char digest[16]; - -- if ((ctx = ssh_hmac_start(SSH_DIGEST_MD5)) == NULL) -+ if ((ctx = ssh_hmac_start(fips_correct_dgst(SSH_DIGEST_MD5))) == NULL) - printf("ssh_hmac_start failed"); - if (ssh_hmac_init(ctx, key, klen) < 0 || - ssh_hmac_update(ctx, m, mlen) < 0 || - ssh_hmac_final(ctx, digest, sizeof(digest)) < 0) - printf("ssh_hmac_xxx failed"); - ssh_hmac_free(ctx); - - if (memcmp(e, digest, elen)) { -diff --git a/openssh-6.6p1/kex.c b/openssh-6.6p1/kex.c ---- a/openssh-6.6p1/kex.c -+++ b/openssh-6.6p1/kex.c -@@ -638,19 +638,21 @@ kex_get_newkeys(int mode) - } - - void - derive_ssh1_session_id(BIGNUM *host_modulus, BIGNUM *server_modulus, - u_int8_t cookie[8], u_int8_t id[16]) - { - u_int8_t nbuf[2048], obuf[SSH_DIGEST_MAX_LENGTH]; - int len; -+ int digest; - struct ssh_digest_ctx *hashctx; - -- if ((hashctx = ssh_digest_start(SSH_DIGEST_MD5)) == NULL) -+ digest = fips_correct_dgst(SSH_DIGEST_MD5); -+ if ((hashctx = ssh_digest_start(digest)) == NULL) - fatal("%s: ssh_digest_start", __func__); - - len = BN_num_bytes(host_modulus); - if (len < (512 / 8) || (u_int)len > sizeof(nbuf)) - fatal("%s: bad host modulus (len %d)", __func__, len); - BN_bn2bin(host_modulus, nbuf); - if (ssh_digest_update(hashctx, nbuf, len) != 0) - fatal("%s: ssh_digest_update failed", __func__); -@@ -659,17 +661,17 @@ derive_ssh1_session_id(BIGNUM *host_modu - if (len < (512 / 8) || (u_int)len > sizeof(nbuf)) - fatal("%s: bad server modulus (len %d)", __func__, len); - BN_bn2bin(server_modulus, nbuf); - if (ssh_digest_update(hashctx, nbuf, len) != 0 || - ssh_digest_update(hashctx, cookie, 8) != 0) - fatal("%s: ssh_digest_update failed", __func__); - if (ssh_digest_final(hashctx, obuf, sizeof(obuf)) != 0) - fatal("%s: ssh_digest_final failed", __func__); -- memcpy(id, obuf, ssh_digest_bytes(SSH_DIGEST_MD5)); -+ memcpy(id, obuf, ssh_digest_bytes(digest)); - - explicit_bzero(nbuf, sizeof(nbuf)); - explicit_bzero(obuf, sizeof(obuf)); - } - - #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH) || defined(DEBUG_KEXECDH) - void - dump_digest(char *msg, u_char *digest, int len) -diff --git a/openssh-6.6p1/key.c b/openssh-6.6p1/key.c ---- a/openssh-6.6p1/key.c -+++ b/openssh-6.6p1/key.c -@@ -53,16 +53,18 @@ - #include "rsa.h" - #include "uuencode.h" - #include "buffer.h" - #include "log.h" - #include "misc.h" - #include "ssh2.h" - #include "digest.h" - -+#include "fips.h" -+ - static int to_blob(const Key *, u_char **, u_int *, int); - static Key *key_from_blob2(const u_char *, u_int, int); - - static struct KeyCert * - cert_new(void) - { - struct KeyCert *cert; - -@@ -664,16 +666,19 @@ key_fp_type_select(void) - error("invalid key type in environment variable " - SSH_FP_TYPE_ENVVAR ": '%s' - falling back to MD5.", - env); - fp = SSH_FP_MD5; - } - } else - fp = SSH_FP_MD5; - -+ if (fips_mode()) -+ fp = fips_correct_fp_type(fp); -+ - fp_defined = 1; - } - return fp; - } - - /* - * string lengths must be less or equal to SSH_FP_TYPE_STRLEN (defined in - * key.h) as to fit into the fingerprint string buffer -diff --git a/openssh-6.6p1/mac.c b/openssh-6.6p1/mac.c ---- a/openssh-6.6p1/mac.c -+++ b/openssh-6.6p1/mac.c -@@ -39,33 +39,35 @@ - #include "kex.h" - #include "mac.h" - #include "misc.h" - - #include "digest.h" - #include "hmac.h" - #include "umac.h" - -+#include "fips.h" -+ - #include "openbsd-compat/openssl-compat.h" - - #define SSH_DIGEST 1 /* SSH_DIGEST_XXX */ - #define SSH_UMAC 2 /* UMAC (not integrated with OpenSSL) */ - #define SSH_UMAC128 3 - - struct macalg { - char *name; - int type; - int alg; - int truncatebits; /* truncate digest if != 0 */ - int key_len; /* just for UMAC */ - int len; /* just for UMAC */ - int etm; /* Encrypt-then-MAC */ - }; - --static const struct macalg macs[] = { -+static const struct macalg macs_all[] = { - /* Encrypt-and-MAC (encrypt-and-authenticate) variants */ - { "hmac-sha1", SSH_DIGEST, SSH_DIGEST_SHA1, 0, 0, 0, 0 }, - { "hmac-sha1-96", SSH_DIGEST, SSH_DIGEST_SHA1, 96, 0, 0, 0 }, - #ifdef HAVE_EVP_SHA256 - { "hmac-sha2-256", SSH_DIGEST, SSH_DIGEST_SHA256, 0, 0, 0, 0 }, - { "hmac-sha2-512", SSH_DIGEST, SSH_DIGEST_SHA512, 0, 0, 0, 0 }, - #endif - { "hmac-md5", SSH_DIGEST, SSH_DIGEST_MD5, 0, 0, 0, 0 }, -@@ -86,25 +88,59 @@ static const struct macalg macs[] = { - { "hmac-md5-96-etm@openssh.com", SSH_DIGEST, SSH_DIGEST_MD5, 96, 0, 0, 1 }, - { "hmac-ripemd160-etm@openssh.com", SSH_DIGEST, SSH_DIGEST_RIPEMD160, 0, 0, 0, 1 }, - { "umac-64-etm@openssh.com", SSH_UMAC, 0, 0, 128, 64, 1 }, - { "umac-128-etm@openssh.com", SSH_UMAC128, 0, 0, 128, 128, 1 }, - - { NULL, 0, 0, 0, 0, 0, 0 } - }; - -+static const struct macalg macs_fips140_2[] = { -+ /* Encrypt-and-MAC (encrypt-and-authenticate) variants */ -+ { "hmac-sha1", SSH_DIGEST, SSH_DIGEST_SHA1, 0, 0, 0, 0 }, -+#ifdef HAVE_EVP_SHA256 -+ { "hmac-sha2-256", SSH_DIGEST, SSH_DIGEST_SHA256, 0, 0, 0, 0 }, -+ { "hmac-sha2-512", SSH_DIGEST, SSH_DIGEST_SHA512, 0, 0, 0, 0 }, -+#endif -+ -+ /* Encrypt-then-MAC variants */ -+#ifdef HAVE_EVP_SHA256 -+ { "hmac-sha2-256-etm@openssh.com", SSH_DIGEST, SSH_DIGEST_SHA256, 0, 0, 0, 1 }, -+ { "hmac-sha2-512-etm@openssh.com", SSH_DIGEST, SSH_DIGEST_SHA512, 0, 0, 0, 1 }, -+#endif -+ { NULL, 0, 0, 0, 0, 0, 0 } -+}; -+ -+/* Returns array of macs available depending on selected FIPS mode */ -+static struct macalg * -+fips_select_macs(void) -+{ -+ int fips = fips_mode(); -+ switch (fips) { -+ case 0: -+ return macs_all; -+ case 1: -+ return macs_fips140_2; -+ default: -+ /* should not be reached */ -+ fatal("Fatal error: incorrect FIPS mode '%i' at %s:%u", -+ fips, __FILE__, __LINE__); -+// return NULL; -+ } -+} -+ - /* Returns a list of supported MACs separated by the specified char. */ - char * - mac_alg_list(char sep) - { - char *ret = NULL; - size_t nlen, rlen = 0; - const struct macalg *m; - -- for (m = macs; m->name != NULL; m++) { -+ for (m = fips_select_macs(); m->name != NULL; m++) { - if (ret != NULL) - ret[rlen++] = sep; - nlen = strlen(m->name); - ret = xrealloc(ret, 1, rlen + nlen + 2); - memcpy(ret + rlen, m->name, nlen + 1); - rlen += nlen; - } - return ret; -@@ -128,17 +164,17 @@ mac_setup_by_alg(Mac *mac, const struct - mac->etm = macalg->etm; - } - - int - mac_setup(Mac *mac, char *name) - { - const struct macalg *m; - -- for (m = macs; m->name != NULL; m++) { -+ for (m = fips_select_macs(); m->name != NULL; m++) { - if (strcmp(name, m->name) != 0) - continue; - if (mac != NULL) { - mac_setup_by_alg(mac, m); - debug2("mac_setup: setup %s", name); - } - return (0); - } -diff --git a/openssh-6.6p1/myproposal.h b/openssh-6.6p1/myproposal.h ---- a/openssh-6.6p1/myproposal.h -+++ b/openssh-6.6p1/myproposal.h -@@ -104,16 +104,20 @@ - - #define KEX_DEFAULT_ENCRYPT \ - "aes128-ctr,aes192-ctr,aes256-ctr," \ - "arcfour256,arcfour128," \ - AESGCM_CIPHER_MODES \ - "chacha20-poly1305@openssh.com," \ - "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ - "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" -+#define KEX_FIPS_140_2_ENCRYPT \ -+ "aes128-ctr,aes192-ctr,aes256-ctr," \ -+ "aes128-cbc,3des-cbc," \ -+ "aes192-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se" - - #define KEX_DEFAULT_MAC \ - "hmac-md5-etm@openssh.com," \ - "hmac-sha1-etm@openssh.com," \ - "umac-64-etm@openssh.com," \ - "umac-128-etm@openssh.com," \ - "hmac-sha2-256-etm@openssh.com," \ - "hmac-sha2-512-etm@openssh.com," \ -@@ -124,16 +128,19 @@ - "hmac-sha1," \ - "umac-64@openssh.com," \ - "umac-128@openssh.com," \ - SHA2_HMAC_MODES \ - "hmac-ripemd160," \ - "hmac-ripemd160@openssh.com," \ - "hmac-sha1-96," \ - "hmac-md5-96" -+#define KEX_FIPS_140_2_MAC \ -+ "hmac-sha1," \ -+ SHA2_HMAC_MODES \ - - #define KEX_DEFAULT_COMP "none,zlib@openssh.com,zlib" - #define KEX_DEFAULT_LANG "" - - - static char *myproposal[PROPOSAL_MAX] = { - KEX_DEFAULT_KEX, - KEX_DEFAULT_PK_ALG, -diff --git a/openssh-6.6p1/ssh.c b/openssh-6.6p1/ssh.c ---- a/openssh-6.6p1/ssh.c -+++ b/openssh-6.6p1/ssh.c -@@ -100,16 +100,18 @@ - #include "mac.h" - #include "sshpty.h" - #include "match.h" - #include "msg.h" - #include "uidswap.h" - #include "roaming.h" - #include "version.h" - -+#include "fips.h" -+ - #ifdef ENABLE_PKCS11 - #include "ssh-pkcs11.h" - #endif - - extern char *__progname; - - /* Saves a copy of argv for setproctitle emulation */ - #ifndef HAVE_SETPROCTITLE -@@ -499,16 +501,18 @@ main(int ac, char **av) - logfile = NULL; - argv0 = av[0]; - - again: - while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx" - "ACD:E:F:I:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) { - switch (opt) { - case '1': -+ if (fips_mode()) -+ fatal("Protocol 1 not allowed in the FIPS mode."); - options.protocol = SSH_PROTO_1; - break; - case '2': - options.protocol = SSH_PROTO_2; - break; - case '4': - options.address_family = AF_INET; - break; -@@ -826,16 +830,22 @@ main(int ac, char **av) - if (!host) - usage(); - - host_arg = xstrdup(host); - - OpenSSL_add_all_algorithms(); - ERR_load_crypto_strings(); - -+ if (FIPS_mode()) { -+ options.protocol &= SSH_PROTO_2; -+ if (options.protocol == 0) -+ fatal("Protocol 2 disabled by configuration but required in the FIPS mode"); -+ } -+ - /* Initialize the command to execute on remote host. */ - buffer_init(&command); - - /* - * Save the command to execute on the remote host in a buffer. There - * is no limit on the length of the command, except by the maximum - * packet size. Also sets the tty flag if there is no command. - */ -diff --git a/openssh-6.6p1/sshconnect2.c b/openssh-6.6p1/sshconnect2.c ---- a/openssh-6.6p1/sshconnect2.c -+++ b/openssh-6.6p1/sshconnect2.c -@@ -66,16 +66,18 @@ - #include "match.h" - #include "dispatch.h" - #include "canohost.h" - #include "msg.h" - #include "pathnames.h" - #include "uidswap.h" - #include "hostfile.h" - -+#include "fips.h" -+ - #ifdef GSSAPI - #include "ssh-gss.h" - #endif - - /* import */ - extern char *client_version_string; - extern char *server_version_string; - extern Options options; -@@ -163,31 +165,41 @@ ssh_kex2(char *host, struct sockaddr *ho - - if (options.ciphers == (char *)-1) { - logit("No valid ciphers for protocol version 2 given, using defaults."); - options.ciphers = NULL; - } - if (options.ciphers != NULL) { - myproposal[PROPOSAL_ENC_ALGS_CTOS] = - myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; -+ } else if (fips_mode()) { -+ /* TODO: use intersection of FIPS ciphers and those requested in -+ * configuration */ -+ myproposal[PROPOSAL_ENC_ALGS_CTOS] = -+ myproposal[PROPOSAL_ENC_ALGS_STOC] = KEX_FIPS_140_2_ENCRYPT; - } - myproposal[PROPOSAL_ENC_ALGS_CTOS] = - compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]); - myproposal[PROPOSAL_ENC_ALGS_STOC] = - compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]); - if (options.compression) { - myproposal[PROPOSAL_COMP_ALGS_CTOS] = - myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib@openssh.com,zlib,none"; - } else { - myproposal[PROPOSAL_COMP_ALGS_CTOS] = - myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib@openssh.com,zlib"; - } - if (options.macs != NULL) { - myproposal[PROPOSAL_MAC_ALGS_CTOS] = - myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; -+ } else if (fips_mode()) { -+ /* TODO: use intersection of FIPS macs and those requested in -+ * configuration */ -+ myproposal[PROPOSAL_MAC_ALGS_CTOS] = -+ myproposal[PROPOSAL_MAC_ALGS_STOC] = KEX_FIPS_140_2_MAC; - } - if (options.hostkeyalgorithms != NULL) - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = - compat_pkalg_proposal(options.hostkeyalgorithms); - else { - /* Prefer algorithms that we already have keys for */ - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = - compat_pkalg_proposal( -diff --git a/openssh-6.6p1/sshd.c b/openssh-6.6p1/sshd.c ---- a/openssh-6.6p1/sshd.c -+++ b/openssh-6.6p1/sshd.c -@@ -117,16 +117,18 @@ - #ifdef GSSAPI - #include "ssh-gss.h" - #endif - #include "monitor_wrap.h" - #include "roaming.h" - #include "ssh-sandbox.h" - #include "version.h" - -+#include "fips.h" -+ - #ifdef LIBWRAP - #include - #include - int allow_severity; - int deny_severity; - #endif /* LIBWRAP */ - - #ifndef O_NOCTTY -@@ -1723,16 +1725,20 @@ main(int ac, char **av) - case KEY_ECDSA: - case KEY_ED25519: - sensitive_data.have_ssh2_key = 1; - break; - } - debug("private host key: #%d type %d %s", i, keytype, - key_type(key ? key : pubkey)); - } -+ if ((options.protocol & SSH_PROTO_1) && fips_mode()) { -+ logit("Disabling protocol version 1. Not allowed in the FIPS mode."); -+ options.protocol &= ~SSH_PROTO_1; -+ } - if ((options.protocol & SSH_PROTO_1) && !sensitive_data.have_ssh1_key) { - logit("Disabling protocol version 1. Could not load host key"); - options.protocol &= ~SSH_PROTO_1; - } - if ((options.protocol & SSH_PROTO_2) && !sensitive_data.have_ssh2_key) { - logit("Disabling protocol version 2. Could not load host key"); - options.protocol &= ~SSH_PROTO_2; - } -@@ -2370,30 +2376,30 @@ do_ssh1_kex(void) - } - if (rsafail) { - int bytes = BN_num_bytes(session_key_int); - u_char *buf = xmalloc(bytes); - struct ssh_digest_ctx *md; - - logit("do_connection: generating a fake encryption key"); - BN_bn2bin(session_key_int, buf); -- if ((md = ssh_digest_start(SSH_DIGEST_MD5)) == NULL || -+ if ((md = ssh_digest_start(fips_correct_dgst(SSH_DIGEST_MD5))) == NULL || - ssh_digest_update(md, buf, bytes) < 0 || - ssh_digest_update(md, sensitive_data.ssh1_cookie, - SSH_SESSION_KEY_LENGTH) < 0 || - ssh_digest_final(md, session_key, sizeof(session_key)) < 0) -- fatal("%s: md5 failed", __func__); -+ fatal("%s: hash failed", __func__); - ssh_digest_free(md); -- if ((md = ssh_digest_start(SSH_DIGEST_MD5)) == NULL || -+ if ((md = ssh_digest_start(fips_correct_dgst(SSH_DIGEST_MD5))) == NULL || - ssh_digest_update(md, session_key, 16) < 0 || - ssh_digest_update(md, sensitive_data.ssh1_cookie, - SSH_SESSION_KEY_LENGTH) < 0 || - ssh_digest_final(md, session_key + 16, - sizeof(session_key) - 16) < 0) -- fatal("%s: md5 failed", __func__); -+ fatal("%s: hash failed", __func__); - ssh_digest_free(md); - explicit_bzero(buf, bytes); - free(buf); - for (i = 0; i < 16; i++) - session_id[i] = session_key[i] ^ session_key[i + 16]; - } - /* Destroy the private and public keys. No longer. */ - destroy_sensitive_data(); -@@ -2441,25 +2447,31 @@ sshd_hostkey_sign(Key *privkey, Key *pub - static void - do_ssh2_kex(void) - { - Kex *kex; - - if (options.ciphers != NULL) { - myproposal[PROPOSAL_ENC_ALGS_CTOS] = - myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; -+ } else if (fips_mode()) { -+ myproposal[PROPOSAL_ENC_ALGS_CTOS] = -+ myproposal[PROPOSAL_ENC_ALGS_STOC] = KEX_FIPS_140_2_ENCRYPT; - } - myproposal[PROPOSAL_ENC_ALGS_CTOS] = - compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]); - myproposal[PROPOSAL_ENC_ALGS_STOC] = - compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]); - - if (options.macs != NULL) { - myproposal[PROPOSAL_MAC_ALGS_CTOS] = - myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; -+ } else if (fips_mode()) { -+ myproposal[PROPOSAL_MAC_ALGS_CTOS] = -+ myproposal[PROPOSAL_MAC_ALGS_STOC] = KEX_FIPS_140_2_MAC; - } - if (options.compression == COMP_NONE) { - myproposal[PROPOSAL_COMP_ALGS_CTOS] = - myproposal[PROPOSAL_COMP_ALGS_STOC] = "none"; - } else if (options.compression == COMP_DELAYED) { - myproposal[PROPOSAL_COMP_ALGS_CTOS] = - myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib@openssh.com"; - } diff --git a/openssh-6.6p1-gssapi_key_exchange.patch b/openssh-6.6p1-gssapi_key_exchange.patch deleted file mode 100644 index dc2fb22..0000000 --- a/openssh-6.6p1-gssapi_key_exchange.patch +++ /dev/null @@ -1,3807 +0,0 @@ -# HG changeset patch -# Parent 0b2761bdc8c2071a11ca24387c3f58be2fdbaa5e - -diff --git a/openssh-6.6p1/ChangeLog.gssapi b/openssh-6.6p1/ChangeLog.gssapi -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/ChangeLog.gssapi -@@ -0,0 +1,113 @@ -+20110101 -+ - Finally update for OpenSSH 5.6p1 -+ - Add GSSAPIServerIdentity option from Jim Basney -+ -+20100308 -+ - [ Makefile.in, key.c, key.h ] -+ Updates for OpenSSH 5.4p1 -+ - [ servconf.c ] -+ Include GSSAPI options in the sshd -T configuration dump, and flag -+ some older configuration options as being unsupported. Thanks to Colin -+ Watson. -+ - -+ -+20100124 -+ - [ sshconnect2.c ] -+ Adapt to deal with additional element in Authmethod structure. Thanks to -+ Colin Watson -+ -+20090615 -+ - [ gss-genr.c gss-serv.c kexgssc.c kexgsss.c monitor.c sshconnect2.c -+ sshd.c ] -+ Fix issues identified by Greg Hudson following a code review -+ Check return value of gss_indicate_mechs -+ Protect GSSAPI calls in monitor, so they can only be used if enabled -+ Check return values of bignum functions in key exchange -+ Use BN_clear_free to clear other side's DH value -+ Make ssh_gssapi_id_kex more robust -+ Only configure kex table pointers if GSSAPI is enabled -+ Don't leak mechanism list, or gss mechanism list -+ Cast data.length before printing -+ If serverkey isn't provided, use an empty string, rather than NULL -+ -+20090201 -+ - [ gss-genr.c gss-serv.c kex.h kexgssc.c readconf.c readconf.h ssh-gss.h -+ ssh_config.5 sshconnet2.c ] -+ Add support for the GSSAPIClientIdentity option, which allows the user -+ to specify which GSSAPI identity to use to contact a given server -+ -+20080404 -+ - [ gss-serv.c ] -+ Add code to actually implement GSSAPIStrictAcceptCheck, which had somehow -+ been omitted from a previous version of this patch. Reported by Borislav -+ Stoichkov -+ -+20070317 -+ - [ gss-serv-krb5.c ] -+ Remove C99ism, where new_ccname was being declared in the middle of a -+ function -+ -+20061220 -+ - [ servconf.c ] -+ Make default for GSSAPIStrictAcceptorCheck be Yes, to match previous, and -+ documented, behaviour. Reported by Dan Watson. -+ -+20060910 -+ - [ gss-genr.c kexgssc.c kexgsss.c kex.h monitor.c sshconnect2.c sshd.c -+ ssh-gss.h ] -+ add support for gss-group14-sha1 key exchange mechanisms -+ - [ gss-serv.c servconf.c servconf.h sshd_config sshd_config.5 ] -+ Add GSSAPIStrictAcceptorCheck option to allow the disabling of -+ acceptor principal checking on multi-homed machines. -+ -+ - [ sshd_config ssh_config ] -+ Add settings for GSSAPIKeyExchange and GSSAPITrustDNS to the sample -+ configuration files -+ - [ kexgss.c kegsss.c sshconnect2.c sshd.c ] -+ Code cleanup. Replace strlen/xmalloc/snprintf sequences with xasprintf() -+ Limit length of error messages displayed by client -+ -+20060909 -+ - [ gss-genr.c gss-serv.c ] -+ move ssh_gssapi_acquire_cred() and ssh_gssapi_server_ctx to be server -+ only, where they belong -+ -+ -+20060829 -+ - [ gss-serv-krb5.c ] -+ Fix CCAPI credentials cache name when creating KRB5CCNAME environment -+ variable -+ -+20060828 -+ - [ gss-genr.c ] -+ Avoid Heimdal context freeing problem -+ -+ -+20060818 -+ - [ gss-genr.c ssh-gss.h sshconnect2.c ] -+ Make sure that SPENGO is disabled -+ -+ -+20060421 -+ - [ gssgenr.c, sshconnect2.c ] -+ a few type changes (signed versus unsigned, int versus size_t) to -+ fix compiler errors/warnings -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ kexgssc.c, sshconnect2.c ] -+ fix uninitialized variable warnings -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ gssgenr.c ] -+ pass oid to gss_display_status (helpful when using GSSAPI mechglue) -+ (from jbasney AT ncsa.uiuc.edu) -+ -+ - [ gss-serv-krb5.c ] -+ #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H -+ (from jbasney AT ncsa.uiuc.edu) -+ -+ - [ readconf.c, readconf.h, ssh_config.5, sshconnect2.c -+ add client-side GssapiKeyExchange option -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ sshconnect2.c ] -+ add support for GssapiTrustDns option for gssapi-with-mic -+ (from jbasney AT ncsa.uiuc.edu) -+ -diff --git a/openssh-6.6p1/Makefile.in b/openssh-6.6p1/Makefile.in ---- a/openssh-6.6p1/Makefile.in -+++ b/openssh-6.6p1/Makefile.in -@@ -67,16 +67,17 @@ LIBSSH_OBJS=authfd.o authfile.o bufaux.o - canohost.o channels.o cipher.o cipher-aes.o \ - cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \ - compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \ - log.o match.o md-sha256.o moduli.o nchan.o packet.o \ - readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \ - atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ - monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ - kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \ -+ kexgssc.o \ - msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \ - ssh-pkcs11.o krl.o smult_curve25519_ref.o \ - kexc25519.o kexc25519c.o poly1305.o chacha.o cipher-chachapoly.o \ - ssh-ed25519.o digest-openssl.o hmac.o \ - sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o \ - fips.o \ - auditstub.o - -@@ -86,17 +87,17 @@ SSHOBJS= ssh.o readconf.o clientloop.o s - - SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ - audit.o audit-bsm.o audit-linux.o platform.o \ - sshpty.o sshlogin.o servconf.o serverloop.o \ - auth.o auth1.o auth2.o auth-options.o session.o \ - auth-chall.o auth2-chall.o groupaccess.o \ - auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \ - auth2-none.o auth2-passwd.o auth2-pubkey.o \ -- monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o kexecdhs.o \ -+ monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o kexecdhs.o kexgsss.o \ - kexc25519s.o auth-krb5.o \ - auth2-gss.o gss-serv.o gss-serv-krb5.o \ - loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ - sftp-server.o sftp-common.o \ - roaming_common.o roaming_serv.o \ - sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \ - sandbox-seccomp-filter.o sandbox-capsicum.o - -diff --git a/openssh-6.6p1/auth-krb5.c b/openssh-6.6p1/auth-krb5.c ---- a/openssh-6.6p1/auth-krb5.c -+++ b/openssh-6.6p1/auth-krb5.c -@@ -177,18 +177,23 @@ auth_krb5_password(Authctxt *authctxt, c - if (problem) - goto out; - #endif - - authctxt->krb5_ticket_file = (char *)krb5_cc_get_name(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache); - - len = strlen(authctxt->krb5_ticket_file) + 6; - authctxt->krb5_ccname = xmalloc(len); -+#ifdef USE_CCAPI -+ snprintf(authctxt->krb5_ccname, len, "API:%s", -+ authctxt->krb5_ticket_file); -+#else - snprintf(authctxt->krb5_ccname, len, "FILE:%s", - authctxt->krb5_ticket_file); -+#endif - - #ifdef USE_PAM - if (options.use_pam) - do_pam_putenv("KRB5CCNAME", authctxt->krb5_ccname); - #endif - - out: - restore_uid(); -@@ -238,35 +243,42 @@ krb5_cleanup_proc(Authctxt *authctxt) - } - - #ifndef HEIMDAL - krb5_error_code - ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) { - int tmpfd, ret, oerrno; - char ccname[40]; - mode_t old_umask; -+#ifdef USE_CCAPI -+ char cctemplate[] = "API:krb5cc_%d"; -+#else -+ char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX"; -+#endif - - ret = snprintf(ccname, sizeof(ccname), -- "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid()); -+ cctemplate, geteuid()); - if (ret < 0 || (size_t)ret >= sizeof(ccname)) - return ENOMEM; - -+#ifndef USE_CCAPI - old_umask = umask(0177); - tmpfd = mkstemp(ccname + strlen("FILE:")); - oerrno = errno; - umask(old_umask); - if (tmpfd == -1) { - logit("mkstemp(): %.100s", strerror(oerrno)); - return oerrno; - } - - if (fchmod(tmpfd,S_IRUSR | S_IWUSR) == -1) { - oerrno = errno; - logit("fchmod(): %.100s", strerror(oerrno)); - close(tmpfd); - return oerrno; - } - close(tmpfd); -+#endif - - return (krb5_cc_resolve(ctx, ccname, ccache)); - } - #endif /* !HEIMDAL */ - #endif /* KRB5 */ -diff --git a/openssh-6.6p1/auth2-gss.c b/openssh-6.6p1/auth2-gss.c ---- a/openssh-6.6p1/auth2-gss.c -+++ b/openssh-6.6p1/auth2-gss.c -@@ -1,12 +1,12 @@ - /* $OpenBSD: auth2-gss.c,v 1.21 2014/02/26 20:28:44 djm Exp $ */ - - /* -- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2007 Simon Wilkinson. 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 -@@ -47,16 +47,50 @@ - - extern ServerOptions options; - - static void input_gssapi_token(int type, u_int32_t plen, void *ctxt); - static void input_gssapi_mic(int type, u_int32_t plen, void *ctxt); - static void input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt); - static void input_gssapi_errtok(int, u_int32_t, void *); - -+/* -+ * The 'gssapi_keyex' userauth mechanism. -+ */ -+static int -+userauth_gsskeyex(Authctxt *authctxt) -+{ -+ int authenticated = 0; -+ Buffer b; -+ gss_buffer_desc mic, gssbuf; -+ u_int len; -+ -+ mic.value = packet_get_string(&len); -+ mic.length = len; -+ -+ packet_check_eom(); -+ -+ ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service, -+ "gssapi-keyex"); -+ -+ gssbuf.value = buffer_ptr(&b); -+ gssbuf.length = buffer_len(&b); -+ -+ /* gss_kex_context is NULL with privsep, so we can't check it here */ -+ if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context, -+ &gssbuf, &mic)))) -+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user, -+ authctxt->pw)); -+ -+ buffer_free(&b); -+ free(mic.value); -+ -+ return (authenticated); -+} -+ - /* - * We only support those mechanisms that we know about (ie ones that we know - * how to check local user kuserok and the like) - */ - static int - userauth_gssapi(Authctxt *authctxt) - { - gss_OID_desc goid = {0, NULL}; -@@ -239,17 +273,18 @@ input_gssapi_exchange_complete(int type, - - /* - * We don't need to check the status, because we're only enabled in - * the dispatcher once the exchange is complete - */ - - packet_check_eom(); - -- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); -+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user, -+ authctxt->pw)); - - authctxt->postponed = 0; - dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL); - dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_ERRTOK, NULL); - dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_MIC, NULL); - dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE, NULL); - userauth_finish(authctxt, authenticated, "gssapi-with-mic", NULL); - } -@@ -274,31 +309,38 @@ input_gssapi_mic(int type, u_int32_t ple - - ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service, - "gssapi-with-mic"); - - gssbuf.value = buffer_ptr(&b); - gssbuf.length = buffer_len(&b); - - if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gssctxt, &gssbuf, &mic)))) -- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); -+ authenticated = -+ PRIVSEP(ssh_gssapi_userok(authctxt->user, authctxt->pw)); - else - logit("GSSAPI MIC check failed"); - - buffer_free(&b); - free(mic.value); - - authctxt->postponed = 0; - dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL); - dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_ERRTOK, NULL); - dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_MIC, NULL); - dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE, NULL); - userauth_finish(authctxt, authenticated, "gssapi-with-mic", NULL); - } - -+Authmethod method_gsskeyex = { -+ "gssapi-keyex", -+ userauth_gsskeyex, -+ &options.gss_authentication -+}; -+ - Authmethod method_gssapi = { - "gssapi-with-mic", - userauth_gssapi, - &options.gss_authentication - }; - - Authmethod method_gssapi_old = { - "gssapi", -diff --git a/openssh-6.6p1/auth2.c b/openssh-6.6p1/auth2.c ---- a/openssh-6.6p1/auth2.c -+++ b/openssh-6.6p1/auth2.c -@@ -64,24 +64,26 @@ extern Buffer loginmsg; - /* methods */ - - extern Authmethod method_none; - extern Authmethod method_pubkey; - extern Authmethod method_passwd; - extern Authmethod method_kbdint; - extern Authmethod method_hostbased; - #ifdef GSSAPI -+extern Authmethod method_gsskeyex; - extern Authmethod method_gssapi; - extern Authmethod method_gssapi_old; - #endif - - Authmethod *authmethods[] = { - &method_none, - &method_pubkey, - #ifdef GSSAPI -+ &method_gsskeyex, - &method_gssapi, - &method_gssapi_old, - #endif - &method_passwd, - &method_kbdint, - &method_hostbased, - NULL - }; -diff --git a/openssh-6.6p1/clientloop.c b/openssh-6.6p1/clientloop.c ---- a/openssh-6.6p1/clientloop.c -+++ b/openssh-6.6p1/clientloop.c -@@ -106,16 +106,20 @@ - #include "authfd.h" - #include "atomicio.h" - #include "sshpty.h" - #include "misc.h" - #include "match.h" - #include "msg.h" - #include "roaming.h" - -+#ifdef GSSAPI -+#include "ssh-gss.h" -+#endif -+ - /* import options */ - extern Options options; - - /* Flag indicating that stdin should be redirected from /dev/null. */ - extern int stdin_null_flag; - - /* Flag indicating that no shell has been requested */ - extern int no_shell_flag; -@@ -1603,16 +1607,25 @@ client_loop(int have_pty, int escape_cha - &max_fd2, &nalloc, rekeying); - - if (quit_pending) - break; - - /* Do channel operations unless rekeying in progress. */ - if (!rekeying) { - channel_after_select(readset, writeset); -+ -+#ifdef GSSAPI -+ if (options.gss_renewal_rekey && -+ ssh_gssapi_credentials_updated(GSS_C_NO_CONTEXT)) { -+ debug("credentials updated - forcing rekey"); -+ need_rekeying = 1; -+ } -+#endif -+ - if (need_rekeying || packet_need_rekeying()) { - debug("need rekeying"); - xxx_kex->done = 0; - kex_send_kexinit(xxx_kex); - need_rekeying = 0; - } - } - -diff --git a/openssh-6.6p1/configure.ac b/openssh-6.6p1/configure.ac ---- a/openssh-6.6p1/configure.ac -+++ b/openssh-6.6p1/configure.ac -@@ -579,16 +579,40 @@ main() { if (NSVersionOfRunTimeLibrary(" - AC_DEFINE([BROKEN_GLOB], [1], [OS X glob does not do what we expect]) - AC_DEFINE_UNQUOTED([BIND_8_COMPAT], [1], - [Define if your resolver libs need this for getrrsetbyname]) - AC_DEFINE([SSH_TUN_FREEBSD], [1], [Open tunnel devices the FreeBSD way]) - AC_DEFINE([SSH_TUN_COMPAT_AF], [1], - [Use tunnel device compatibility to OpenBSD]) - AC_DEFINE([SSH_TUN_PREPEND_AF], [1], - [Prepend the address family to IP tunnel traffic]) -+ AC_MSG_CHECKING(if we have the Security Authorization Session API) -+ AC_TRY_COMPILE([#include ], -+ [SessionCreate(0, 0);], -+ [ac_cv_use_security_session_api="yes" -+ AC_DEFINE(USE_SECURITY_SESSION_API, 1, -+ [platform has the Security Authorization Session API]) -+ LIBS="$LIBS -framework Security" -+ AC_MSG_RESULT(yes)], -+ [ac_cv_use_security_session_api="no" -+ AC_MSG_RESULT(no)]) -+ AC_MSG_CHECKING(if we have an in-memory credentials cache) -+ AC_TRY_COMPILE( -+ [#include ], -+ [cc_context_t c; -+ (void) cc_initialize (&c, 0, NULL, NULL);], -+ [AC_DEFINE(USE_CCAPI, 1, -+ [platform uses an in-memory credentials cache]) -+ LIBS="$LIBS -framework Security" -+ AC_MSG_RESULT(yes) -+ if test "x$ac_cv_use_security_session_api" = "xno"; then -+ AC_MSG_ERROR(*** Need a security framework to use the credentials cache API ***) -+ fi], -+ [AC_MSG_RESULT(no)] -+ ) - m4_pattern_allow([AU_IPv]) - AC_CHECK_DECL([AU_IPv4], [], - AC_DEFINE([AU_IPv4], [0], [System only supports IPv4 audit records]) - [#include ] - AC_DEFINE([LASTLOG_WRITE_PUTUTXLINE], [1], - [Define if pututxline updates lastlog too]) - ) - AC_DEFINE([SPT_TYPE], [SPT_REUSEARGV], -diff --git a/openssh-6.6p1/gss-genr.c b/openssh-6.6p1/gss-genr.c ---- a/openssh-6.6p1/gss-genr.c -+++ b/openssh-6.6p1/gss-genr.c -@@ -1,12 +1,12 @@ - /* $OpenBSD: gss-genr.c,v 1.22 2013/11/08 00:39:15 djm Exp $ */ - - /* -- * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2009 Simon Wilkinson. 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 -@@ -34,22 +34,177 @@ - #include - #include - #include - - #include "xmalloc.h" - #include "buffer.h" - #include "log.h" - #include "ssh2.h" -+#include "cipher.h" -+#include "key.h" -+#include "kex.h" -+#include - - #include "ssh-gss.h" - - extern u_char *session_id2; - extern u_int session_id2_len; - -+typedef struct { -+ char *encoded; -+ gss_OID oid; -+} ssh_gss_kex_mapping; -+ -+/* -+ * XXX - It would be nice to find a more elegant way of handling the -+ * XXX passing of the key exchange context to the userauth routines -+ */ -+ -+Gssctxt *gss_kex_context = NULL; -+ -+static ssh_gss_kex_mapping *gss_enc2oid = NULL; -+ -+int -+ssh_gssapi_oid_table_ok() { -+ return (gss_enc2oid != NULL); -+} -+ -+/* -+ * Return a list of the gss-group1-sha1 mechanisms supported by this program -+ * -+ * We test mechanisms to ensure that we can use them, to avoid starting -+ * a key exchange with a bad mechanism -+ */ -+ -+char * -+ssh_gssapi_client_mechanisms(const char *host, const char *client) { -+ gss_OID_set gss_supported; -+ OM_uint32 min_status; -+ -+ if (GSS_ERROR(gss_indicate_mechs(&min_status, &gss_supported))) -+ return NULL; -+ -+ return(ssh_gssapi_kex_mechs(gss_supported, ssh_gssapi_check_mechanism, -+ host, client)); -+} -+ -+char * -+ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check, -+ const char *host, const char *client) { -+ Buffer buf; -+ size_t i; -+ int oidpos, enclen; -+ char *mechs, *encoded; -+ u_char digest[EVP_MAX_MD_SIZE]; -+ char deroid[2]; -+ const EVP_MD *evp_md = EVP_md5(); -+ EVP_MD_CTX md; -+ -+ if (gss_enc2oid != NULL) { -+ for (i = 0; gss_enc2oid[i].encoded != NULL; i++) -+ free(gss_enc2oid[i].encoded); -+ free(gss_enc2oid); -+ } -+ -+ gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) * -+ (gss_supported->count + 1)); -+ -+ buffer_init(&buf); -+ -+ oidpos = 0; -+ for (i = 0; i < gss_supported->count; i++) { -+ if (gss_supported->elements[i].length < 128 && -+ (*check)(NULL, &(gss_supported->elements[i]), host, client)) { -+ -+ deroid[0] = SSH_GSS_OIDTYPE; -+ deroid[1] = gss_supported->elements[i].length; -+ -+ EVP_DigestInit(&md, evp_md); -+ EVP_DigestUpdate(&md, deroid, 2); -+ EVP_DigestUpdate(&md, -+ gss_supported->elements[i].elements, -+ gss_supported->elements[i].length); -+ EVP_DigestFinal(&md, digest, NULL); -+ -+ encoded = xmalloc(EVP_MD_size(evp_md) * 2); -+ enclen = __b64_ntop(digest, EVP_MD_size(evp_md), -+ encoded, EVP_MD_size(evp_md) * 2); -+ -+ if (oidpos != 0) -+ buffer_put_char(&buf, ','); -+ -+ buffer_append(&buf, KEX_GSS_GEX_SHA1_ID, -+ sizeof(KEX_GSS_GEX_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ buffer_put_char(&buf, ','); -+ buffer_append(&buf, KEX_GSS_GRP1_SHA1_ID, -+ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ buffer_put_char(&buf, ','); -+ buffer_append(&buf, KEX_GSS_GRP14_SHA1_ID, -+ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ -+ gss_enc2oid[oidpos].oid = &(gss_supported->elements[i]); -+ gss_enc2oid[oidpos].encoded = encoded; -+ oidpos++; -+ } -+ } -+ gss_enc2oid[oidpos].oid = NULL; -+ gss_enc2oid[oidpos].encoded = NULL; -+ -+ buffer_put_char(&buf, '\0'); -+ -+ mechs = xmalloc(buffer_len(&buf)); -+ buffer_get(&buf, mechs, buffer_len(&buf)); -+ buffer_free(&buf); -+ -+ if (strlen(mechs) == 0) { -+ free(mechs); -+ mechs = NULL; -+ } -+ -+ return (mechs); -+} -+ -+gss_OID -+ssh_gssapi_id_kex(Gssctxt *ctx, char *name, int kex_type) { -+ int i = 0; -+ -+ switch (kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ if (strlen(name) < sizeof(KEX_GSS_GRP1_SHA1_ID)) -+ return GSS_C_NO_OID; -+ name += sizeof(KEX_GSS_GRP1_SHA1_ID) - 1; -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ if (strlen(name) < sizeof(KEX_GSS_GRP14_SHA1_ID)) -+ return GSS_C_NO_OID; -+ name += sizeof(KEX_GSS_GRP14_SHA1_ID) - 1; -+ break; -+ case KEX_GSS_GEX_SHA1: -+ if (strlen(name) < sizeof(KEX_GSS_GEX_SHA1_ID)) -+ return GSS_C_NO_OID; -+ name += sizeof(KEX_GSS_GEX_SHA1_ID) - 1; -+ break; -+ default: -+ return GSS_C_NO_OID; -+ } -+ -+ while (gss_enc2oid[i].encoded != NULL && -+ strcmp(name, gss_enc2oid[i].encoded) != 0) -+ i++; -+ -+ if (gss_enc2oid[i].oid != NULL && ctx != NULL) -+ ssh_gssapi_set_oid(ctx, gss_enc2oid[i].oid); -+ -+ return gss_enc2oid[i].oid; -+} -+ - /* Check that the OID in a data stream matches that in the context */ - int - ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len) - { - return (ctx != NULL && ctx->oid != GSS_C_NO_OID && - ctx->oid->length == len && - memcmp(ctx->oid->elements, data, len) == 0); - } -@@ -192,17 +347,17 @@ ssh_gssapi_init_ctx(Gssctxt *ctx, int de - int deleg_flag = 0; - - if (deleg_creds) { - deleg_flag = GSS_C_DELEG_FLAG; - debug("Delegating credentials"); - } - - ctx->major = gss_init_sec_context(&ctx->minor, -- GSS_C_NO_CREDENTIAL, &ctx->context, ctx->name, ctx->oid, -+ ctx->client_creds, &ctx->context, ctx->name, ctx->oid, - GSS_C_MUTUAL_FLAG | GSS_C_INTEG_FLAG | deleg_flag, - 0, NULL, recv_tok, NULL, send_tok, flags, NULL); - - if (GSS_ERROR(ctx->major)) - ssh_gssapi_error(ctx); - - return (ctx->major); - } -@@ -222,60 +377,173 @@ ssh_gssapi_import_name(Gssctxt *ctx, con - &gssbuf, GSS_C_NT_HOSTBASED_SERVICE, &ctx->name))) - ssh_gssapi_error(ctx); - - free(gssbuf.value); - return (ctx->major); - } - - OM_uint32 -+ssh_gssapi_client_identity(Gssctxt *ctx, const char *name) -+{ -+ gss_buffer_desc gssbuf; -+ gss_name_t gssname; -+ OM_uint32 status; -+ gss_OID_set oidset; -+ -+ gssbuf.value = (void *) name; -+ gssbuf.length = strlen(gssbuf.value); -+ -+ gss_create_empty_oid_set(&status, &oidset); -+ gss_add_oid_set_member(&status, ctx->oid, &oidset); -+ -+ ctx->major = gss_import_name(&ctx->minor, &gssbuf, -+ GSS_C_NT_USER_NAME, &gssname); -+ -+ if (!ctx->major) -+ ctx->major = gss_acquire_cred(&ctx->minor, -+ gssname, 0, oidset, GSS_C_INITIATE, -+ &ctx->client_creds, NULL, NULL); -+ -+ gss_release_name(&status, &gssname); -+ gss_release_oid_set(&status, &oidset); -+ -+ if (ctx->major) -+ ssh_gssapi_error(ctx); -+ -+ return(ctx->major); -+} -+ -+OM_uint32 - ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash) - { -+ if (ctx == NULL) -+ return -1; -+ - if ((ctx->major = gss_get_mic(&ctx->minor, ctx->context, - GSS_C_QOP_DEFAULT, buffer, hash))) - ssh_gssapi_error(ctx); - - return (ctx->major); - } - -+/* Priviledged when used by server */ -+OM_uint32 -+ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) -+{ -+ if (ctx == NULL) -+ return -1; -+ -+ ctx->major = gss_verify_mic(&ctx->minor, ctx->context, -+ gssbuf, gssmic, NULL); -+ -+ return (ctx->major); -+} -+ - void - ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service, - const char *context) - { - buffer_init(b); - buffer_put_string(b, session_id2, session_id2_len); - buffer_put_char(b, SSH2_MSG_USERAUTH_REQUEST); - buffer_put_cstring(b, user); - buffer_put_cstring(b, service); - buffer_put_cstring(b, context); - } - - int --ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host) -+ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host, -+ const char *client) - { - gss_buffer_desc token = GSS_C_EMPTY_BUFFER; - OM_uint32 major, minor; - gss_OID_desc spnego_oid = {6, (void *)"\x2B\x06\x01\x05\x05\x02"}; -+ Gssctxt *intctx = NULL; -+ -+ if (ctx == NULL) -+ ctx = &intctx; - - /* RFC 4462 says we MUST NOT do SPNEGO */ - if (oid->length == spnego_oid.length && - (memcmp(oid->elements, spnego_oid.elements, oid->length) == 0)) - return 0; /* false */ - - ssh_gssapi_build_ctx(ctx); - ssh_gssapi_set_oid(*ctx, oid); - major = ssh_gssapi_import_name(*ctx, host); -+ -+ if (!GSS_ERROR(major) && client) -+ major = ssh_gssapi_client_identity(*ctx, client); -+ - if (!GSS_ERROR(major)) { - major = ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token, - NULL); - gss_release_buffer(&minor, &token); - if ((*ctx)->context != GSS_C_NO_CONTEXT) - gss_delete_sec_context(&minor, &(*ctx)->context, - GSS_C_NO_BUFFER); - } - -- if (GSS_ERROR(major)) -+ if (GSS_ERROR(major) || intctx != NULL) - ssh_gssapi_delete_ctx(ctx); - - return (!GSS_ERROR(major)); - } - -+int -+ssh_gssapi_credentials_updated(Gssctxt *ctxt) { -+ static gss_name_t saved_name = GSS_C_NO_NAME; -+ static OM_uint32 saved_lifetime = 0; -+ static gss_OID saved_mech = GSS_C_NO_OID; -+ static gss_name_t name; -+ static OM_uint32 last_call = 0; -+ OM_uint32 lifetime, now, major, minor; -+ int equal; -+ gss_cred_usage_t usage = GSS_C_INITIATE; -+ -+ now = time(NULL); -+ -+ if (ctxt) { -+ debug("Rekey has happened - updating saved versions"); -+ -+ if (saved_name != GSS_C_NO_NAME) -+ gss_release_name(&minor, &saved_name); -+ -+ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL, -+ &saved_name, &saved_lifetime, NULL, NULL); -+ -+ if (!GSS_ERROR(major)) { -+ saved_mech = ctxt->oid; -+ saved_lifetime+= now; -+ } else { -+ /* Handle the error */ -+ } -+ return 0; -+ } -+ -+ if (now - last_call < 10) -+ return 0; -+ -+ last_call = now; -+ -+ if (saved_mech == GSS_C_NO_OID) -+ return 0; -+ -+ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL, -+ &name, &lifetime, NULL, NULL); -+ if (major == GSS_S_CREDENTIALS_EXPIRED) -+ return 0; -+ else if (GSS_ERROR(major)) -+ return 0; -+ -+ major = gss_compare_name(&minor, saved_name, name, &equal); -+ gss_release_name(&minor, &name); -+ if (GSS_ERROR(major)) -+ return 0; -+ -+ if (equal && (saved_lifetime < lifetime + now - 10)) -+ return 1; -+ -+ return 0; -+} -+ - #endif /* GSSAPI */ -diff --git a/openssh-6.6p1/gss-serv-krb5.c b/openssh-6.6p1/gss-serv-krb5.c ---- a/openssh-6.6p1/gss-serv-krb5.c -+++ b/openssh-6.6p1/gss-serv-krb5.c -@@ -1,12 +1,12 @@ - /* $OpenBSD: gss-serv-krb5.c,v 1.8 2013/07/20 01:55:13 djm Exp $ */ - - /* -- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2007 Simon Wilkinson. 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 -@@ -117,16 +117,17 @@ static void - ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client) - { - krb5_ccache ccache; - krb5_error_code problem; - krb5_principal princ; - OM_uint32 maj_status, min_status; - int len; - const char *errmsg; -+ const char *new_ccname; - - if (client->creds == NULL) { - debug("No credentials stored"); - return; - } - - if (ssh_gssapi_krb5_init() == 0) - return; -@@ -175,37 +176,108 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_cl - - if ((maj_status = gss_krb5_copy_ccache(&min_status, - client->creds, ccache))) { - logit("gss_krb5_copy_ccache() failed"); - krb5_cc_destroy(krb_context, ccache); - return; - } - -- client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache)); -+ new_ccname = krb5_cc_get_name(krb_context, ccache); -+ - client->store.envvar = "KRB5CCNAME"; -- len = strlen(client->store.filename) + 6; -- client->store.envval = xmalloc(len); -- snprintf(client->store.envval, len, "FILE:%s", client->store.filename); -+#ifdef USE_CCAPI -+ xasprintf(&client->store.envval, "API:%s", new_ccname); -+ client->store.filename = NULL; -+#else -+ xasprintf(&client->store.envval, "FILE:%s", new_ccname); -+ client->store.filename = xstrdup(new_ccname); -+#endif - - #ifdef USE_PAM - if (options.use_pam) - do_pam_putenv(client->store.envvar, client->store.envval); - #endif - - krb5_cc_close(krb_context, ccache); - - return; - } - -+int -+ssh_gssapi_krb5_updatecreds(ssh_gssapi_ccache *store, -+ ssh_gssapi_client *client) -+{ -+ krb5_ccache ccache = NULL; -+ krb5_principal principal = NULL; -+ char *name = NULL; -+ krb5_error_code problem; -+ OM_uint32 maj_status, min_status; -+ -+ if ((problem = krb5_cc_resolve(krb_context, store->envval, &ccache))) { -+ logit("krb5_cc_resolve(): %.100s", -+ krb5_get_err_text(krb_context, problem)); -+ return 0; -+ } -+ -+ /* Find out who the principal in this cache is */ -+ if ((problem = krb5_cc_get_principal(krb_context, ccache, -+ &principal))) { -+ logit("krb5_cc_get_principal(): %.100s", -+ krb5_get_err_text(krb_context, problem)); -+ krb5_cc_close(krb_context, ccache); -+ return 0; -+ } -+ -+ if ((problem = krb5_unparse_name(krb_context, principal, &name))) { -+ logit("krb5_unparse_name(): %.100s", -+ krb5_get_err_text(krb_context, problem)); -+ krb5_free_principal(krb_context, principal); -+ krb5_cc_close(krb_context, ccache); -+ return 0; -+ } -+ -+ -+ if (strcmp(name,client->exportedname.value)!=0) { -+ debug("Name in local credentials cache differs. Not storing"); -+ krb5_free_principal(krb_context, principal); -+ krb5_cc_close(krb_context, ccache); -+ krb5_free_unparsed_name(krb_context, name); -+ return 0; -+ } -+ krb5_free_unparsed_name(krb_context, name); -+ -+ /* Name matches, so lets get on with it! */ -+ -+ if ((problem = krb5_cc_initialize(krb_context, ccache, principal))) { -+ logit("krb5_cc_initialize(): %.100s", -+ krb5_get_err_text(krb_context, problem)); -+ krb5_free_principal(krb_context, principal); -+ krb5_cc_close(krb_context, ccache); -+ return 0; -+ } -+ -+ krb5_free_principal(krb_context, principal); -+ -+ if ((maj_status = gss_krb5_copy_ccache(&min_status, client->creds, -+ ccache))) { -+ logit("gss_krb5_copy_ccache() failed. Sorry!"); -+ krb5_cc_close(krb_context, ccache); -+ return 0; -+ } -+ -+ return 1; -+} -+ - ssh_gssapi_mech gssapi_kerberos_mech = { - "toWM5Slw5Ew8Mqkay+al2g==", - "Kerberos", - {9, "\x2A\x86\x48\x86\xF7\x12\x01\x02\x02"}, - NULL, - &ssh_gssapi_krb5_userok, - NULL, -- &ssh_gssapi_krb5_storecreds -+ &ssh_gssapi_krb5_storecreds, -+ &ssh_gssapi_krb5_updatecreds - }; - - #endif /* KRB5 */ - - #endif /* GSSAPI */ -diff --git a/openssh-6.6p1/gss-serv.c b/openssh-6.6p1/gss-serv.c ---- a/openssh-6.6p1/gss-serv.c -+++ b/openssh-6.6p1/gss-serv.c -@@ -1,12 +1,12 @@ - /* $OpenBSD: gss-serv.c,v 1.26 2014/02/26 20:28:44 djm Exp $ */ - - /* -- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2009 Simon Wilkinson. 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 -@@ -40,25 +40,30 @@ - #include "buffer.h" - #include "key.h" - #include "hostfile.h" - #include "auth.h" - #include "log.h" - #include "channels.h" - #include "session.h" - #include "misc.h" -+#include "servconf.h" -+#include "uidswap.h" - - #include "ssh-gss.h" -+#include "monitor_wrap.h" -+ -+extern ServerOptions options; - - static ssh_gssapi_client gssapi_client = - { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER, -- GSS_C_NO_CREDENTIAL, NULL, {NULL, NULL, NULL, NULL}}; -+ GSS_C_NO_CREDENTIAL, GSS_C_NO_NAME, NULL, {NULL, NULL, NULL, NULL, NULL}, 0, 0}; - - ssh_gssapi_mech gssapi_null_mech = -- { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL}; -+ { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL, NULL}; - - #ifdef KRB5 - extern ssh_gssapi_mech gssapi_kerberos_mech; - #endif - - ssh_gssapi_mech* supported_mechs[]= { - #ifdef KRB5 - &gssapi_kerberos_mech, -@@ -95,59 +100,91 @@ ssh_gssapi_test_oid_supported(OM_uint32 - /* Privileged (called from ssh_gssapi_server_ctx) */ - static OM_uint32 - ssh_gssapi_acquire_cred(Gssctxt *ctx) - { - OM_uint32 status; - char lname[MAXHOSTNAMELEN]; - gss_OID_set oidset; - -- gss_create_empty_oid_set(&status, &oidset); -- gss_add_oid_set_member(&status, ctx->oid, &oidset); -+ if (options.gss_strict_acceptor) { -+ gss_create_empty_oid_set(&status, &oidset); -+ gss_add_oid_set_member(&status, ctx->oid, &oidset); - -- if (gethostname(lname, MAXHOSTNAMELEN)) { -- gss_release_oid_set(&status, &oidset); -- return (-1); -- } -+ if (gethostname(lname, MAXHOSTNAMELEN)) { -+ gss_release_oid_set(&status, &oidset); -+ return (-1); -+ } - -- if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { -+ if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { -+ gss_release_oid_set(&status, &oidset); -+ return (ctx->major); -+ } -+ -+ if ((ctx->major = gss_acquire_cred(&ctx->minor, -+ ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, -+ NULL, NULL))) -+ ssh_gssapi_error(ctx); -+ - gss_release_oid_set(&status, &oidset); - return (ctx->major); -+ } else { -+ ctx->name = GSS_C_NO_NAME; -+ ctx->creds = GSS_C_NO_CREDENTIAL; - } -- -- if ((ctx->major = gss_acquire_cred(&ctx->minor, -- ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, NULL, NULL))) -- ssh_gssapi_error(ctx); -- -- gss_release_oid_set(&status, &oidset); -- return (ctx->major); -+ return GSS_S_COMPLETE; - } - - /* Privileged */ - OM_uint32 - ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID oid) - { - if (*ctx) - ssh_gssapi_delete_ctx(ctx); - ssh_gssapi_build_ctx(ctx); - ssh_gssapi_set_oid(*ctx, oid); - return (ssh_gssapi_acquire_cred(*ctx)); - } - - /* Unprivileged */ -+char * -+ssh_gssapi_server_mechanisms() { -+ gss_OID_set supported; -+ -+ ssh_gssapi_supported_oids(&supported); -+ return (ssh_gssapi_kex_mechs(supported, &ssh_gssapi_server_check_mech, -+ NULL, NULL)); -+} -+ -+/* Unprivileged */ -+int -+ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data, -+ const char *dummy) { -+ Gssctxt *ctx = NULL; -+ int res; -+ -+ res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid))); -+ ssh_gssapi_delete_ctx(&ctx); -+ -+ return (res); -+} -+ -+/* Unprivileged */ - void - ssh_gssapi_supported_oids(gss_OID_set *oidset) - { - int i = 0; - OM_uint32 min_status; - int present; - gss_OID_set supported; - - gss_create_empty_oid_set(&min_status, oidset); -- gss_indicate_mechs(&min_status, &supported); -+ -+ if (GSS_ERROR(gss_indicate_mechs(&min_status, &supported))) -+ return; - - while (supported_mechs[i]->name != NULL) { - if (GSS_ERROR(gss_test_oid_set_member(&min_status, - &supported_mechs[i]->oid, supported, &present))) - present = 0; - if (present) - gss_add_oid_set_member(&min_status, - &supported_mechs[i]->oid, oidset); -@@ -263,32 +300,79 @@ ssh_gssapi_parse_ename(Gssctxt *ctx, gss - /* Extract the client details from a given context. This can only reliably - * be called once for a context */ - - /* Privileged (called from accept_secure_ctx) */ - OM_uint32 - ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client) - { - int i = 0; -+ int equal = 0; -+ gss_name_t new_name = GSS_C_NO_NAME; -+ gss_buffer_desc ename = GSS_C_EMPTY_BUFFER; - -- gss_buffer_desc ename; -+ if (options.gss_store_rekey && client->used && ctx->client_creds) { -+ if (client->mech->oid.length != ctx->oid->length || -+ (memcmp(client->mech->oid.elements, -+ ctx->oid->elements, ctx->oid->length) !=0)) { -+ debug("Rekeyed credentials have different mechanism"); -+ return GSS_S_COMPLETE; -+ } -+ -+ if ((ctx->major = gss_inquire_cred_by_mech(&ctx->minor, -+ ctx->client_creds, ctx->oid, &new_name, -+ NULL, NULL, NULL))) { -+ ssh_gssapi_error(ctx); -+ return (ctx->major); -+ } -+ -+ ctx->major = gss_compare_name(&ctx->minor, client->name, -+ new_name, &equal); -+ -+ if (GSS_ERROR(ctx->major)) { -+ ssh_gssapi_error(ctx); -+ return (ctx->major); -+ } -+ -+ if (!equal) { -+ debug("Rekeyed credentials have different name"); -+ return GSS_S_COMPLETE; -+ } -+ -+ debug("Marking rekeyed credentials for export"); -+ -+ gss_release_name(&ctx->minor, &client->name); -+ gss_release_cred(&ctx->minor, &client->creds); -+ client->name = new_name; -+ client->creds = ctx->client_creds; -+ ctx->client_creds = GSS_C_NO_CREDENTIAL; -+ client->updated = 1; -+ return GSS_S_COMPLETE; -+ } - - client->mech = NULL; - - while (supported_mechs[i]->name != NULL) { - if (supported_mechs[i]->oid.length == ctx->oid->length && - (memcmp(supported_mechs[i]->oid.elements, - ctx->oid->elements, ctx->oid->length) == 0)) - client->mech = supported_mechs[i]; - i++; - } - - if (client->mech == NULL) - return GSS_S_FAILURE; - -+ if (ctx->client_creds && -+ (ctx->major = gss_inquire_cred_by_mech(&ctx->minor, -+ ctx->client_creds, ctx->oid, &client->name, NULL, NULL, NULL))) { -+ ssh_gssapi_error(ctx); -+ return (ctx->major); -+ } -+ - if ((ctx->major = gss_display_name(&ctx->minor, ctx->client, - &client->displayname, NULL))) { - ssh_gssapi_error(ctx); - return (ctx->major); - } - - if ((ctx->major = gss_export_name(&ctx->minor, ctx->client, - &ename))) { -@@ -296,16 +380,18 @@ ssh_gssapi_getclient(Gssctxt *ctx, ssh_g - return (ctx->major); - } - - if ((ctx->major = ssh_gssapi_parse_ename(ctx,&ename, - &client->exportedname))) { - return (ctx->major); - } - -+ gss_release_buffer(&ctx->minor, &ename); -+ - /* We can't copy this structure, so we just move the pointer to it */ - client->creds = ctx->client_creds; - ctx->client_creds = GSS_C_NO_CREDENTIAL; - return (ctx->major); - } - - /* As user - called on fatal/exit */ - void -@@ -343,45 +429,124 @@ ssh_gssapi_do_child(char ***envp, u_int - gssapi_client.store.envval); - child_set_env(envp, envsizep, gssapi_client.store.envvar, - gssapi_client.store.envval); - } - } - - /* Privileged */ - int --ssh_gssapi_userok(char *user) -+ssh_gssapi_userok(char *user, struct passwd *pw) - { - OM_uint32 lmin; - - if (gssapi_client.exportedname.length == 0 || - gssapi_client.exportedname.value == NULL) { - debug("No suitable client data"); - return 0; - } - if (gssapi_client.mech && gssapi_client.mech->userok) -- if ((*gssapi_client.mech->userok)(&gssapi_client, user)) -+ if ((*gssapi_client.mech->userok)(&gssapi_client, user)) { -+ gssapi_client.used = 1; -+ gssapi_client.store.owner = pw; - return 1; -- else { -+ } else { - /* Destroy delegated credentials if userok fails */ - gss_release_buffer(&lmin, &gssapi_client.displayname); - gss_release_buffer(&lmin, &gssapi_client.exportedname); - gss_release_cred(&lmin, &gssapi_client.creds); - explicit_bzero(&gssapi_client, - sizeof(ssh_gssapi_client)); - return 0; - } - else - debug("ssh_gssapi_userok: Unknown GSSAPI mechanism"); - return (0); - } - - /* Privileged */ --OM_uint32 --ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) -+/* These bits are only used for rekeying. The unpriviledged child is running -+ * as the user, the monitor is root. -+ * -+ * In the child, we want to : -+ * *) Ask the monitor to store our credentials into the store we specify -+ * *) If it succeeds, maybe do a PAM update -+ */ -+ -+/* Stuff for PAM */ -+ -+#ifdef USE_PAM -+static int ssh_gssapi_simple_conv(int n, const struct pam_message **msg, -+ struct pam_response **resp, void *data) - { -- ctx->major = gss_verify_mic(&ctx->minor, ctx->context, -- gssbuf, gssmic, NULL); -+ return (PAM_CONV_ERR); -+} -+#endif - -- return (ctx->major); -+void -+ssh_gssapi_rekey_creds() { -+ int ok; -+ int ret; -+#ifdef USE_PAM -+ pam_handle_t *pamh = NULL; -+ struct pam_conv pamconv = {ssh_gssapi_simple_conv, NULL}; -+ char *envstr; -+#endif -+ -+ if (gssapi_client.store.filename == NULL && -+ gssapi_client.store.envval == NULL && -+ gssapi_client.store.envvar == NULL) -+ return; -+ -+ ok = PRIVSEP(ssh_gssapi_update_creds(&gssapi_client.store)); -+ -+ if (!ok) -+ return; -+ -+ debug("Rekeyed credentials stored successfully"); -+ -+ /* Actually managing to play with the ssh pam stack from here will -+ * be next to impossible. In any case, we may want different options -+ * for rekeying. So, use our own :) -+ */ -+#ifdef USE_PAM -+ if (!use_privsep) { -+ debug("Not even going to try and do PAM with privsep disabled"); -+ return; -+ } -+ -+ ret = pam_start("sshd-rekey", gssapi_client.store.owner->pw_name, -+ &pamconv, &pamh); -+ if (ret) -+ return; -+ -+ xasprintf(&envstr, "%s=%s", gssapi_client.store.envvar, -+ gssapi_client.store.envval); -+ -+ ret = pam_putenv(pamh, envstr); -+ if (!ret) -+ pam_setcred(pamh, PAM_REINITIALIZE_CRED); -+ pam_end(pamh, PAM_SUCCESS); -+#endif -+} -+ -+int -+ssh_gssapi_update_creds(ssh_gssapi_ccache *store) { -+ int ok = 0; -+ -+ /* Check we've got credentials to store */ -+ if (!gssapi_client.updated) -+ return 0; -+ -+ gssapi_client.updated = 0; -+ -+ temporarily_use_uid(gssapi_client.store.owner); -+ if (gssapi_client.mech && gssapi_client.mech->updatecreds) -+ ok = (*gssapi_client.mech->updatecreds)(store, &gssapi_client); -+ else -+ debug("No update function for this mechanism"); -+ -+ restore_uid(); -+ -+ return ok; - } - - #endif -diff --git a/openssh-6.6p1/kex.c b/openssh-6.6p1/kex.c ---- a/openssh-6.6p1/kex.c -+++ b/openssh-6.6p1/kex.c -@@ -47,16 +47,20 @@ - #include "mac.h" - #include "match.h" - #include "dispatch.h" - #include "monitor.h" - #include "roaming.h" - #include "digest.h" - #include "audit.h" - -+#ifdef GSSAPI -+#include "ssh-gss.h" -+#endif -+ - #if OPENSSL_VERSION_NUMBER >= 0x00907000L - # if defined(HAVE_EVP_SHA256) - # define evp_ssh_sha256 EVP_sha256 - # else - extern const EVP_MD *evp_ssh_sha256(void); - # endif - #endif - -@@ -86,16 +90,21 @@ static const struct kexalg kexalgs[] = { - { KEX_ECDH_SHA2_NISTP521, KEX_ECDH_SHA2, NID_secp521r1, - SSH_DIGEST_SHA512 }, - # endif - #endif - { KEX_DH1, KEX_DH_GRP1_SHA1, 0, SSH_DIGEST_SHA1 }, - #ifdef HAVE_EVP_SHA256 - { KEX_CURVE25519_SHA256, KEX_C25519_SHA256, 0, SSH_DIGEST_SHA256 }, - #endif -+#ifdef GSSAPI -+ { KEX_GSS_GEX_SHA1_ID, KEX_GSS_GEX_SHA1, 0, SSH_DIGEST_SHA1 }, -+ { KEX_GSS_GRP1_SHA1_ID, KEX_GSS_GRP1_SHA1, 0, SSH_DIGEST_SHA1 }, -+ { KEX_GSS_GRP14_SHA1_ID, KEX_GSS_GRP14_SHA1, 0, SSH_DIGEST_SHA1 }, -+#endif - { NULL, -1, -1, -1}, - }; - - char * - kex_alg_list(char sep) - { - char *ret = NULL; - size_t nlen, rlen = 0; -diff --git a/openssh-6.6p1/kex.h b/openssh-6.6p1/kex.h ---- a/openssh-6.6p1/kex.h -+++ b/openssh-6.6p1/kex.h -@@ -71,16 +71,19 @@ enum kex_modes { - - enum kex_exchange { - KEX_DH_GRP1_SHA1, - KEX_DH_GRP14_SHA1, - KEX_DH_GEX_SHA1, - KEX_DH_GEX_SHA256, - KEX_ECDH_SHA2, - KEX_C25519_SHA256, -+ KEX_GSS_GRP1_SHA1, -+ KEX_GSS_GRP14_SHA1, -+ KEX_GSS_GEX_SHA1, - KEX_MAX - }; - - #define KEX_INIT_SENT 0x0001 - - typedef struct Kex Kex; - typedef struct Mac Mac; - typedef struct Comp Comp; -@@ -130,16 +133,22 @@ struct Kex { - int kex_type; - int roaming; - Buffer my; - Buffer peer; - sig_atomic_t done; - int flags; - int hash_alg; - int ec_nid; -+#ifdef GSSAPI -+ int gss_deleg_creds; -+ int gss_trust_dns; -+ char *gss_host; -+ char *gss_client; -+#endif - char *client_version_string; - char *server_version_string; - int (*verify_host_key)(Key *); - Key *(*load_host_public_key)(int); - Key *(*load_host_private_key)(int); - int (*host_key_index)(Key *); - void (*sign)(Key *, Key *, u_char **, u_int *, u_char *, u_int); - void (*kex[KEX_MAX])(Kex *); -@@ -163,16 +172,21 @@ void kexdh_server(Kex *); - void kexgex_client(Kex *); - void kexgex_server(Kex *); - void kexecdh_client(Kex *); - void kexecdh_server(Kex *); - void kexc25519_client(Kex *); - void kexc25519_server(Kex *); - - void newkeys_destroy(Newkeys *newkeys); -+ -+#ifdef GSSAPI -+void kexgss_client(Kex *); -+void kexgss_server(Kex *); -+#endif - - void - kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int, - BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *); - void - kexgex_hash(int, char *, char *, char *, int, char *, - int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, - BIGNUM *, BIGNUM *, u_char **, u_int *); -diff --git a/openssh-6.6p1/kexgssc.c b/openssh-6.6p1/kexgssc.c -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/kexgssc.c -@@ -0,0 +1,334 @@ -+/* -+ * Copyright (c) 2001-2009 Simon Wilkinson. 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. -+ */ -+ -+#include "includes.h" -+ -+#ifdef GSSAPI -+ -+#include "includes.h" -+ -+#include -+#include -+ -+#include -+ -+#include "xmalloc.h" -+#include "buffer.h" -+#include "ssh2.h" -+#include "key.h" -+#include "cipher.h" -+#include "kex.h" -+#include "log.h" -+#include "packet.h" -+#include "dh.h" -+ -+#include "ssh-gss.h" -+ -+void -+kexgss_client(Kex *kex) { -+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc recv_tok, gssbuf, msg_tok, *token_ptr; -+ Gssctxt *ctxt; -+ OM_uint32 maj_status, min_status, ret_flags; -+ u_int klen, kout, slen = 0, hashlen, strlen; -+ DH *dh; -+ BIGNUM *dh_server_pub = NULL; -+ BIGNUM *shared_secret = NULL; -+ BIGNUM *p = NULL; -+ BIGNUM *g = NULL; -+ u_char *kbuf, *hash; -+ u_char *serverhostkey = NULL; -+ u_char *empty = ""; -+ char *msg; -+ char *lang; -+ int type = 0; -+ int first = 1; -+ int nbits = 0, min = DH_GRP_MIN, max = DH_GRP_MAX; -+ -+ /* Initialise our GSSAPI world */ -+ ssh_gssapi_build_ctx(&ctxt); -+ if (ssh_gssapi_id_kex(ctxt, kex->name, kex->kex_type) -+ == GSS_C_NO_OID) -+ fatal("Couldn't identify host exchange"); -+ -+ if (ssh_gssapi_import_name(ctxt, kex->gss_host)) -+ fatal("Couldn't import hostname"); -+ -+ if (kex->gss_client && -+ ssh_gssapi_client_identity(ctxt, kex->gss_client)) -+ fatal("Couldn't acquire client credentials"); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ dh = dh_new_group1(); -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ dh = dh_new_group14(); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ debug("Doing group exchange\n"); -+ nbits = dh_estimate(kex->we_need * 8); -+ packet_start(SSH2_MSG_KEXGSS_GROUPREQ); -+ packet_put_int(min); -+ packet_put_int(nbits); -+ packet_put_int(max); -+ -+ packet_send(); -+ -+ packet_read_expect(SSH2_MSG_KEXGSS_GROUP); -+ -+ if ((p = BN_new()) == NULL) -+ fatal("BN_new() failed"); -+ packet_get_bignum2(p); -+ if ((g = BN_new()) == NULL) -+ fatal("BN_new() failed"); -+ packet_get_bignum2(g); -+ packet_check_eom(); -+ -+ if (BN_num_bits(p) < min || BN_num_bits(p) > max) -+ fatal("GSSGRP_GEX group out of range: %d !< %d !< %d", -+ min, BN_num_bits(p), max); -+ -+ dh = dh_new_group(g, p); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ /* Step 1 - e is dh->pub_key */ -+ dh_gen_key(dh, kex->we_need * 8); -+ -+ /* This is f, we initialise it now to make life easier */ -+ dh_server_pub = BN_new(); -+ if (dh_server_pub == NULL) -+ fatal("dh_server_pub == NULL"); -+ -+ token_ptr = GSS_C_NO_BUFFER; -+ -+ do { -+ debug("Calling gss_init_sec_context"); -+ -+ maj_status = ssh_gssapi_init_ctx(ctxt, -+ kex->gss_deleg_creds, token_ptr, &send_tok, -+ &ret_flags); -+ -+ if (GSS_ERROR(maj_status)) { -+ if (send_tok.length != 0) { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ } -+ fatal("gss_init_context failed"); -+ } -+ -+ /* If we've got an old receive buffer get rid of it */ -+ if (token_ptr != GSS_C_NO_BUFFER) -+ free(recv_tok.value); -+ -+ if (maj_status == GSS_S_COMPLETE) { -+ /* If mutual state flag is not true, kex fails */ -+ if (!(ret_flags & GSS_C_MUTUAL_FLAG)) -+ fatal("Mutual authentication failed"); -+ -+ /* If integ avail flag is not true kex fails */ -+ if (!(ret_flags & GSS_C_INTEG_FLAG)) -+ fatal("Integrity check failed"); -+ } -+ -+ /* -+ * If we have data to send, then the last message that we -+ * received cannot have been a 'complete'. -+ */ -+ if (send_tok.length != 0) { -+ if (first) { -+ packet_start(SSH2_MSG_KEXGSS_INIT); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ packet_put_bignum2(dh->pub_key); -+ first = 0; -+ } else { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ } -+ packet_send(); -+ gss_release_buffer(&min_status, &send_tok); -+ -+ /* If we've sent them data, they should reply */ -+ do { -+ type = packet_read(); -+ if (type == SSH2_MSG_KEXGSS_HOSTKEY) { -+ debug("Received KEXGSS_HOSTKEY"); -+ if (serverhostkey) -+ fatal("Server host key received more than once"); -+ serverhostkey = -+ packet_get_string(&slen); -+ } -+ } while (type == SSH2_MSG_KEXGSS_HOSTKEY); -+ -+ switch (type) { -+ case SSH2_MSG_KEXGSS_CONTINUE: -+ debug("Received GSSAPI_CONTINUE"); -+ if (maj_status == GSS_S_COMPLETE) -+ fatal("GSSAPI Continue received from server when complete"); -+ recv_tok.value = packet_get_string(&strlen); -+ recv_tok.length = strlen; -+ break; -+ case SSH2_MSG_KEXGSS_COMPLETE: -+ debug("Received GSSAPI_COMPLETE"); -+ packet_get_bignum2(dh_server_pub); -+ msg_tok.value = packet_get_string(&strlen); -+ msg_tok.length = strlen; -+ -+ /* Is there a token included? */ -+ if (packet_get_char()) { -+ recv_tok.value= -+ packet_get_string(&strlen); -+ recv_tok.length = strlen; -+ /* If we're already complete - protocol error */ -+ if (maj_status == GSS_S_COMPLETE) -+ packet_disconnect("Protocol error: received token when complete"); -+ } else { -+ /* No token included */ -+ if (maj_status != GSS_S_COMPLETE) -+ packet_disconnect("Protocol error: did not receive final token"); -+ } -+ break; -+ case SSH2_MSG_KEXGSS_ERROR: -+ debug("Received Error"); -+ maj_status = packet_get_int(); -+ min_status = packet_get_int(); -+ msg = packet_get_string(NULL); -+ lang = packet_get_string(NULL); -+ fatal("GSSAPI Error: \n%.400s",msg); -+ default: -+ packet_disconnect("Protocol error: didn't expect packet type %d", -+ type); -+ } -+ token_ptr = &recv_tok; -+ } else { -+ /* No data, and not complete */ -+ if (maj_status != GSS_S_COMPLETE) -+ fatal("Not complete, and no token output"); -+ } -+ } while (maj_status & GSS_S_CONTINUE_NEEDED); -+ -+ /* -+ * We _must_ have received a COMPLETE message in reply from the -+ * server, which will have set dh_server_pub and msg_tok -+ */ -+ -+ if (type != SSH2_MSG_KEXGSS_COMPLETE) -+ fatal("Didn't receive a SSH2_MSG_KEXGSS_COMPLETE when I expected it"); -+ -+ /* Check f in range [1, p-1] */ -+ if (!dh_pub_is_valid(dh, dh_server_pub)) -+ packet_disconnect("bad server public DH value"); -+ -+ /* compute K=f^x mod p */ -+ klen = DH_size(dh); -+ kbuf = xmalloc(klen); -+ kout = DH_compute_key(kbuf, dh_server_pub, dh); -+ if (kout < 0) -+ fatal("DH_compute_key: failed"); -+ -+ shared_secret = BN_new(); -+ if (shared_secret == NULL) -+ fatal("kexgss_client: BN_new failed"); -+ -+ if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) -+ fatal("kexdh_client: BN_bin2bn failed"); -+ -+ memset(kbuf, 0, klen); -+ free(kbuf); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ case KEX_GSS_GRP14_SHA1: -+ kex_dh_hash( kex->client_version_string, -+ kex->server_version_string, -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ (serverhostkey ? serverhostkey : empty), slen, -+ dh->pub_key, /* e */ -+ dh_server_pub, /* f */ -+ shared_secret, /* K */ -+ &hash, &hashlen -+ ); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ kexgex_hash( -+ kex->hash_alg, -+ kex->client_version_string, -+ kex->server_version_string, -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ (serverhostkey ? serverhostkey : empty), slen, -+ min, nbits, max, -+ dh->p, dh->g, -+ dh->pub_key, -+ dh_server_pub, -+ shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ gssbuf.value = hash; -+ gssbuf.length = hashlen; -+ -+ /* Verify that the hash matches the MIC we just got. */ -+ if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok))) -+ packet_disconnect("Hash's MIC didn't verify"); -+ -+ free(msg_tok.value); -+ -+ DH_free(dh); -+ if (serverhostkey) -+ free(serverhostkey); -+ BN_clear_free(dh_server_pub); -+ -+ /* save session id */ -+ if (kex->session_id == NULL) { -+ kex->session_id_len = hashlen; -+ kex->session_id = xmalloc(kex->session_id_len); -+ memcpy(kex->session_id, hash, kex->session_id_len); -+ } -+ -+ if (kex->gss_deleg_creds) -+ ssh_gssapi_credentials_updated(ctxt); -+ -+ if (gss_kex_context == NULL) -+ gss_kex_context = ctxt; -+ else -+ ssh_gssapi_delete_ctx(&ctxt); -+ -+ kex_derive_keys_bn(kex, hash, hashlen, shared_secret); -+ BN_clear_free(shared_secret); -+ kex_finish(kex); -+} -+ -+#endif /* GSSAPI */ -diff --git a/openssh-6.6p1/kexgsss.c b/openssh-6.6p1/kexgsss.c -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/kexgsss.c -@@ -0,0 +1,288 @@ -+/* -+ * Copyright (c) 2001-2009 Simon Wilkinson. 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. -+ */ -+ -+#include "includes.h" -+ -+#ifdef GSSAPI -+ -+#include -+ -+#include -+#include -+ -+#include "xmalloc.h" -+#include "buffer.h" -+#include "ssh2.h" -+#include "key.h" -+#include "cipher.h" -+#include "kex.h" -+#include "log.h" -+#include "packet.h" -+#include "dh.h" -+#include "ssh-gss.h" -+#include "monitor_wrap.h" -+#include "servconf.h" -+ -+extern ServerOptions options; -+ -+void -+kexgss_server(Kex *kex) -+{ -+ OM_uint32 maj_status, min_status; -+ -+ /* -+ * Some GSSAPI implementations use the input value of ret_flags (an -+ * output variable) as a means of triggering mechanism specific -+ * features. Initializing it to zero avoids inadvertently -+ * activating this non-standard behaviour. -+ */ -+ -+ OM_uint32 ret_flags = 0; -+ gss_buffer_desc gssbuf, recv_tok, msg_tok; -+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; -+ Gssctxt *ctxt = NULL; -+ u_int slen, klen, kout, hashlen; -+ u_char *kbuf, *hash; -+ DH *dh; -+ int min = -1, max = -1, nbits = -1; -+ BIGNUM *shared_secret = NULL; -+ BIGNUM *dh_client_pub = NULL; -+ int type = 0; -+ gss_OID oid; -+ char *mechs; -+ -+ /* Initialise GSSAPI */ -+ -+ /* If we're rekeying, privsep means that some of the private structures -+ * in the GSSAPI code are no longer available. This kludges them back -+ * into life -+ */ -+ if (!ssh_gssapi_oid_table_ok()) -+ if ((mechs = ssh_gssapi_server_mechanisms())) -+ free(mechs); -+ -+ debug2("%s: Identifying %s", __func__, kex->name); -+ oid = ssh_gssapi_id_kex(NULL, kex->name, kex->kex_type); -+ if (oid == GSS_C_NO_OID) -+ fatal("Unknown gssapi mechanism"); -+ -+ debug2("%s: Acquiring credentials", __func__); -+ -+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, oid)))) -+ fatal("Unable to acquire credentials for the server"); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ dh = dh_new_group1(); -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ dh = dh_new_group14(); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ debug("Doing group exchange"); -+ packet_read_expect(SSH2_MSG_KEXGSS_GROUPREQ); -+ min = packet_get_int(); -+ nbits = packet_get_int(); -+ max = packet_get_int(); -+ min = MAX(DH_GRP_MIN, min); -+ max = MIN(DH_GRP_MAX, max); -+ packet_check_eom(); -+ if (max < min || nbits < min || max < nbits) -+ fatal("GSS_GEX, bad parameters: %d !< %d !< %d", -+ min, nbits, max); -+ dh = PRIVSEP(choose_dh(min, nbits, max)); -+ if (dh == NULL) -+ packet_disconnect("Protocol error: no matching group found"); -+ -+ packet_start(SSH2_MSG_KEXGSS_GROUP); -+ packet_put_bignum2(dh->p); -+ packet_put_bignum2(dh->g); -+ packet_send(); -+ -+ packet_write_wait(); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ dh_gen_key(dh, kex->we_need * 8); -+ -+ do { -+ debug("Wait SSH2_MSG_GSSAPI_INIT"); -+ type = packet_read(); -+ switch(type) { -+ case SSH2_MSG_KEXGSS_INIT: -+ if (dh_client_pub != NULL) -+ fatal("Received KEXGSS_INIT after initialising"); -+ recv_tok.value = packet_get_string(&slen); -+ recv_tok.length = slen; -+ -+ if ((dh_client_pub = BN_new()) == NULL) -+ fatal("dh_client_pub == NULL"); -+ -+ packet_get_bignum2(dh_client_pub); -+ -+ /* Send SSH_MSG_KEXGSS_HOSTKEY here, if we want */ -+ break; -+ case SSH2_MSG_KEXGSS_CONTINUE: -+ recv_tok.value = packet_get_string(&slen); -+ recv_tok.length = slen; -+ break; -+ default: -+ packet_disconnect( -+ "Protocol error: didn't expect packet type %d", -+ type); -+ } -+ -+ maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok, -+ &send_tok, &ret_flags)); -+ -+ free(recv_tok.value); -+ -+ if (maj_status != GSS_S_COMPLETE && send_tok.length == 0) -+ fatal("Zero length token output when incomplete"); -+ -+ if (dh_client_pub == NULL) -+ fatal("No client public key"); -+ -+ if (maj_status & GSS_S_CONTINUE_NEEDED) { -+ debug("Sending GSSAPI_CONTINUE"); -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, send_tok.length); -+ packet_send(); -+ gss_release_buffer(&min_status, &send_tok); -+ } -+ } while (maj_status & GSS_S_CONTINUE_NEEDED); -+ -+ if (GSS_ERROR(maj_status)) { -+ if (send_tok.length > 0) { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, send_tok.length); -+ packet_send(); -+ } -+ fatal("accept_ctx died"); -+ } -+ -+ if (!(ret_flags & GSS_C_MUTUAL_FLAG)) -+ fatal("Mutual Authentication flag wasn't set"); -+ -+ if (!(ret_flags & GSS_C_INTEG_FLAG)) -+ fatal("Integrity flag wasn't set"); -+ -+ if (!dh_pub_is_valid(dh, dh_client_pub)) -+ packet_disconnect("bad client public DH value"); -+ -+ klen = DH_size(dh); -+ kbuf = xmalloc(klen); -+ kout = DH_compute_key(kbuf, dh_client_pub, dh); -+ if (kout < 0) -+ fatal("DH_compute_key: failed"); -+ -+ shared_secret = BN_new(); -+ if (shared_secret == NULL) -+ fatal("kexgss_server: BN_new failed"); -+ -+ if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) -+ fatal("kexgss_server: BN_bin2bn failed"); -+ -+ memset(kbuf, 0, klen); -+ free(kbuf); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ case KEX_GSS_GRP14_SHA1: -+ kex_dh_hash( -+ kex->client_version_string, kex->server_version_string, -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ NULL, 0, /* Change this if we start sending host keys */ -+ dh_client_pub, dh->pub_key, shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ kexgex_hash( -+ kex->hash_alg, -+ kex->client_version_string, kex->server_version_string, -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ NULL, 0, -+ min, nbits, max, -+ dh->p, dh->g, -+ dh_client_pub, -+ dh->pub_key, -+ shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ BN_clear_free(dh_client_pub); -+ -+ if (kex->session_id == NULL) { -+ kex->session_id_len = hashlen; -+ kex->session_id = xmalloc(kex->session_id_len); -+ memcpy(kex->session_id, hash, kex->session_id_len); -+ } -+ -+ gssbuf.value = hash; -+ gssbuf.length = hashlen; -+ -+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt,&gssbuf,&msg_tok)))) -+ fatal("Couldn't get MIC"); -+ -+ packet_start(SSH2_MSG_KEXGSS_COMPLETE); -+ packet_put_bignum2(dh->pub_key); -+ packet_put_string(msg_tok.value,msg_tok.length); -+ -+ if (send_tok.length != 0) { -+ packet_put_char(1); /* true */ -+ packet_put_string(send_tok.value, send_tok.length); -+ } else { -+ packet_put_char(0); /* false */ -+ } -+ packet_send(); -+ -+ gss_release_buffer(&min_status, &send_tok); -+ gss_release_buffer(&min_status, &msg_tok); -+ -+ if (gss_kex_context == NULL) -+ gss_kex_context = ctxt; -+ else -+ ssh_gssapi_delete_ctx(&ctxt); -+ -+ DH_free(dh); -+ -+ kex_derive_keys_bn(kex, hash, hashlen, shared_secret); -+ BN_clear_free(shared_secret); -+ kex_finish(kex); -+ -+ /* If this was a rekey, then save out any delegated credentials we -+ * just exchanged. */ -+ if (options.gss_store_rekey) -+ ssh_gssapi_rekey_creds(); -+} -+#endif /* GSSAPI */ -diff --git a/openssh-6.6p1/key.c b/openssh-6.6p1/key.c ---- a/openssh-6.6p1/key.c -+++ b/openssh-6.6p1/key.c -@@ -1053,16 +1053,18 @@ static const struct keytype keytypes[] = - # endif - #endif /* OPENSSL_HAS_ECC */ - { "ssh-rsa-cert-v00@openssh.com", "RSA-CERT-V00", - KEY_RSA_CERT_V00, 0, 1 }, - { "ssh-dss-cert-v00@openssh.com", "DSA-CERT-V00", - KEY_DSA_CERT_V00, 0, 1 }, - { "ssh-ed25519-cert-v01@openssh.com", "ED25519-CERT", - KEY_ED25519_CERT, 0, 1 }, -+ { "null", "null", -+ KEY_NULL, 0, 0 }, - { NULL, NULL, -1, -1, 0 } - }; - - const char * - key_type(const Key *k) - { - const struct keytype *kt; - -diff --git a/openssh-6.6p1/key.h b/openssh-6.6p1/key.h ---- a/openssh-6.6p1/key.h -+++ b/openssh-6.6p1/key.h -@@ -41,16 +41,17 @@ enum types { - KEY_ECDSA, - KEY_ED25519, - KEY_RSA_CERT, - KEY_DSA_CERT, - KEY_ECDSA_CERT, - KEY_ED25519_CERT, - KEY_RSA_CERT_V00, - KEY_DSA_CERT_V00, -+ KEY_NULL, - KEY_UNSPEC - }; - enum fp_type { - SSH_FP_SHA1, - SSH_FP_MD5, - SSH_FP_SHA256 - }; - enum fp_rep { -diff --git a/openssh-6.6p1/monitor.c b/openssh-6.6p1/monitor.c ---- a/openssh-6.6p1/monitor.c -+++ b/openssh-6.6p1/monitor.c -@@ -173,16 +173,18 @@ int mm_answer_pam_respond(int, Buffer *) - int mm_answer_pam_free_ctx(int, Buffer *); - #endif - - #ifdef GSSAPI - int mm_answer_gss_setup_ctx(int, Buffer *); - int mm_answer_gss_accept_ctx(int, Buffer *); - int mm_answer_gss_userok(int, Buffer *); - int mm_answer_gss_checkmic(int, Buffer *); -+int mm_answer_gss_sign(int, Buffer *); -+int mm_answer_gss_updatecreds(int, Buffer *); - #endif - - #ifdef SSH_AUDIT_EVENTS - int mm_answer_audit_event(int, Buffer *); - int mm_answer_audit_command(int, Buffer *); - int mm_answer_audit_end_command(int, Buffer *); - int mm_answer_audit_unsupported_body(int, Buffer *); - int mm_answer_audit_kex_body(int, Buffer *); -@@ -254,21 +256,28 @@ struct mon_table mon_dispatch_proto20[] - #endif - {MONITOR_REQ_KEYALLOWED, MON_ISAUTH, mm_answer_keyallowed}, - {MONITOR_REQ_KEYVERIFY, MON_AUTH, mm_answer_keyverify}, - #ifdef GSSAPI - {MONITOR_REQ_GSSSETUP, MON_ISAUTH, mm_answer_gss_setup_ctx}, - {MONITOR_REQ_GSSSTEP, MON_ISAUTH, mm_answer_gss_accept_ctx}, - {MONITOR_REQ_GSSUSEROK, MON_AUTH, mm_answer_gss_userok}, - {MONITOR_REQ_GSSCHECKMIC, MON_ISAUTH, mm_answer_gss_checkmic}, -+ {MONITOR_REQ_GSSSIGN, MON_ONCE, mm_answer_gss_sign}, - #endif - {0, 0, NULL} - }; - - struct mon_table mon_dispatch_postauth20[] = { -+#ifdef GSSAPI -+ {MONITOR_REQ_GSSSETUP, 0, mm_answer_gss_setup_ctx}, -+ {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx}, -+ {MONITOR_REQ_GSSSIGN, 0, mm_answer_gss_sign}, -+ {MONITOR_REQ_GSSUPCREDS, 0, mm_answer_gss_updatecreds}, -+#endif - {MONITOR_REQ_MODULI, 0, mm_answer_moduli}, - {MONITOR_REQ_SIGN, 0, mm_answer_sign}, - {MONITOR_REQ_PTY, 0, mm_answer_pty}, - {MONITOR_REQ_PTYCLEANUP, 0, mm_answer_pty_cleanup}, - {MONITOR_REQ_TERM, 0, mm_answer_term}, - #ifdef SSH_AUDIT_EVENTS - {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event}, - {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT, mm_answer_audit_command}, -@@ -381,16 +390,20 @@ monitor_child_preauth(Authctxt *_authctx - authctxt->loginmsg = &loginmsg; - - if (compat20) { - mon_dispatch = mon_dispatch_proto20; - - /* Permit requests for moduli and signatures */ - monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1); -+#ifdef GSSAPI -+ /* and for the GSSAPI key exchange */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1); -+#endif - } else { - mon_dispatch = mon_dispatch_proto15; - - monitor_permit(mon_dispatch, MONITOR_REQ_SESSKEY, 1); - } - - /* The first few requests do not require asynchronous access */ - while (!authenticated) { -@@ -486,16 +499,20 @@ monitor_child_postauth(struct monitor *p - - if (compat20) { - mon_dispatch = mon_dispatch_postauth20; - - /* Permit requests for moduli and signatures */ - monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1); -+#ifdef GSSAPI -+ /* and for the GSSAPI key exchange */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1); -+#endif - } else { - mon_dispatch = mon_dispatch_postauth15; - monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1); - } - if (!no_pty_flag) { - monitor_permit(mon_dispatch, MONITOR_REQ_PTY, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_PTYCLEANUP, 1); - } -@@ -1909,16 +1926,23 @@ mm_get_kex(Buffer *m) - fatal("mm_get_get: internal error: bad session id"); - kex->we_need = buffer_get_int(m); - kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; - kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; - kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; - kex->kex[KEX_ECDH_SHA2] = kexecdh_server; - kex->kex[KEX_C25519_SHA256] = kexc25519_server; -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server; -+ } -+#endif - kex->server = 1; - kex->hostkey_type = buffer_get_int(m); - kex->kex_type = buffer_get_int(m); - blob = buffer_get_string(m, &bloblen); - buffer_init(&kex->my); - buffer_append(&kex->my, blob, bloblen); - free(blob); - blob = buffer_get_string(m, &bloblen); -@@ -2133,16 +2157,19 @@ monitor_reinit(struct monitor *mon) - #ifdef GSSAPI - int - mm_answer_gss_setup_ctx(int sock, Buffer *m) - { - gss_OID_desc goid; - OM_uint32 major; - u_int len; - -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ - goid.elements = buffer_get_string(m, &len); - goid.length = len; - - major = ssh_gssapi_server_ctx(&gsscontext, &goid); - - free(goid.elements); - - buffer_clear(m); -@@ -2160,16 +2187,19 @@ int - mm_answer_gss_accept_ctx(int sock, Buffer *m) - { - gss_buffer_desc in; - gss_buffer_desc out = GSS_C_EMPTY_BUFFER; - OM_uint32 major, minor; - OM_uint32 flags = 0; /* GSI needs this */ - u_int len; - -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ - in.value = buffer_get_string(m, &len); - in.length = len; - major = ssh_gssapi_accept_ctx(gsscontext, &in, &out, &flags); - free(in.value); - - buffer_clear(m); - buffer_put_int(m, major); - buffer_put_string(m, out.value, out.length); -@@ -2177,27 +2207,31 @@ mm_answer_gss_accept_ctx(int sock, Buffe - mm_request_send(sock, MONITOR_ANS_GSSSTEP, m); - - gss_release_buffer(&minor, &out); - - if (major == GSS_S_COMPLETE) { - monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0); - monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1); -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSIGN, 1); - } - return (0); - } - - int - mm_answer_gss_checkmic(int sock, Buffer *m) - { - gss_buffer_desc gssbuf, mic; - OM_uint32 ret; - u_int len; - -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ - gssbuf.value = buffer_get_string(m, &len); - gssbuf.length = len; - mic.value = buffer_get_string(m, &len); - mic.length = len; - - ret = ssh_gssapi_checkmic(gsscontext, &gssbuf, &mic); - - free(gssbuf.value); -@@ -2214,29 +2248,101 @@ mm_answer_gss_checkmic(int sock, Buffer - return (0); - } - - int - mm_answer_gss_userok(int sock, Buffer *m) - { - int authenticated; - -- authenticated = authctxt->valid && ssh_gssapi_userok(authctxt->user); -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ -+ authenticated = authctxt->valid && -+ ssh_gssapi_userok(authctxt->user, authctxt->pw); - - buffer_clear(m); - buffer_put_int(m, authenticated); - - debug3("%s: sending result %d", __func__, authenticated); - mm_request_send(sock, MONITOR_ANS_GSSUSEROK, m); - - auth_method = "gssapi-with-mic"; - - /* Monitor loop will terminate if authenticated */ - return (authenticated); - } -+ -+int -+mm_answer_gss_sign(int socket, Buffer *m) -+{ -+ gss_buffer_desc data; -+ gss_buffer_desc hash = GSS_C_EMPTY_BUFFER; -+ OM_uint32 major, minor; -+ u_int len; -+ -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ -+ data.value = buffer_get_string(m, &len); -+ data.length = len; -+ if (data.length != 20) -+ fatal("%s: data length incorrect: %d", __func__, -+ (int) data.length); -+ -+ /* Save the session ID on the first time around */ -+ if (session_id2_len == 0) { -+ session_id2_len = data.length; -+ session_id2 = xmalloc(session_id2_len); -+ memcpy(session_id2, data.value, session_id2_len); -+ } -+ major = ssh_gssapi_sign(gsscontext, &data, &hash); -+ -+ free(data.value); -+ -+ buffer_clear(m); -+ buffer_put_int(m, major); -+ buffer_put_string(m, hash.value, hash.length); -+ -+ mm_request_send(socket, MONITOR_ANS_GSSSIGN, m); -+ -+ gss_release_buffer(&minor, &hash); -+ -+ /* Turn on getpwnam permissions */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1); -+ -+ /* And credential updating, for when rekeying */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSUPCREDS, 1); -+ -+ return (0); -+} -+ -+int -+mm_answer_gss_updatecreds(int socket, Buffer *m) { -+ ssh_gssapi_ccache store; -+ int ok; -+ -+ store.filename = buffer_get_string(m, NULL); -+ store.envvar = buffer_get_string(m, NULL); -+ store.envval = buffer_get_string(m, NULL); -+ -+ ok = ssh_gssapi_update_creds(&store); -+ -+ free(store.filename); -+ free(store.envvar); -+ free(store.envval); -+ -+ buffer_clear(m); -+ buffer_put_int(m, ok); -+ -+ mm_request_send(socket, MONITOR_ANS_GSSUPCREDS, m); -+ -+ return(0); -+} -+ - #endif /* GSSAPI */ - - #ifdef SSH_AUDIT_EVENTS - int - mm_answer_audit_unsupported_body(int sock, Buffer *m) - { - int what; - -diff --git a/openssh-6.6p1/monitor.h b/openssh-6.6p1/monitor.h ---- a/openssh-6.6p1/monitor.h -+++ b/openssh-6.6p1/monitor.h -@@ -65,16 +65,19 @@ enum monitor_reqtype { - MONITOR_REQ_PAM_FREE_CTX = 110, MONITOR_ANS_PAM_FREE_CTX = 111, - MONITOR_REQ_AUDIT_EVENT = 112, MONITOR_REQ_AUDIT_COMMAND = 113, - MONITOR_ANS_AUDIT_COMMAND = 114, MONITOR_REQ_AUDIT_END_COMMAND = 115, - MONITOR_REQ_AUDIT_UNSUPPORTED = 116, MONITOR_ANS_AUDIT_UNSUPPORTED = 117, - MONITOR_REQ_AUDIT_KEX = 118, MONITOR_ANS_AUDIT_KEX = 119, - MONITOR_REQ_AUDIT_SESSION_KEY_FREE = 120, MONITOR_ANS_AUDIT_SESSION_KEY_FREE = 121, - MONITOR_REQ_AUDIT_SERVER_KEY_FREE = 122, MONITOR_ANS_AUDIT_SERVER_KEY_FREE = 123, - -+ MONITOR_REQ_GSSSIGN = 201, MONITOR_ANS_GSSSIGN = 202, -+ MONITOR_REQ_GSSUPCREDS = 203, MONITOR_ANS_GSSUPCREDS = 204, -+ - }; - - struct mm_master; - struct monitor { - int m_recvfd; - int m_sendfd; - int m_log_recvfd; - int m_log_sendfd; -diff --git a/openssh-6.6p1/monitor_wrap.c b/openssh-6.6p1/monitor_wrap.c ---- a/openssh-6.6p1/monitor_wrap.c -+++ b/openssh-6.6p1/monitor_wrap.c -@@ -1303,33 +1303,78 @@ mm_ssh_gssapi_checkmic(Gssctxt *ctx, gss - &m); - - major = buffer_get_int(&m); - buffer_free(&m); - return(major); - } - - int --mm_ssh_gssapi_userok(char *user) -+mm_ssh_gssapi_userok(char *user, struct passwd *pw) - { - Buffer m; - int authenticated = 0; - - buffer_init(&m); - - mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSUSEROK, &m); - mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSUSEROK, - &m); - - authenticated = buffer_get_int(&m); - - buffer_free(&m); - debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not "); - return (authenticated); - } -+ -+OM_uint32 -+mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash) -+{ -+ Buffer m; -+ OM_uint32 major; -+ u_int len; -+ -+ buffer_init(&m); -+ buffer_put_string(&m, data->value, data->length); -+ -+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSIGN, &m); -+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSIGN, &m); -+ -+ major = buffer_get_int(&m); -+ hash->value = buffer_get_string(&m, &len); -+ hash->length = len; -+ -+ buffer_free(&m); -+ -+ return(major); -+} -+ -+int -+mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *store) -+{ -+ Buffer m; -+ int ok; -+ -+ buffer_init(&m); -+ -+ buffer_put_cstring(&m, store->filename ? store->filename : ""); -+ buffer_put_cstring(&m, store->envvar ? store->envvar : ""); -+ buffer_put_cstring(&m, store->envval ? store->envval : ""); -+ -+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSUPCREDS, &m); -+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSUPCREDS, &m); -+ -+ ok = buffer_get_int(&m); -+ -+ buffer_free(&m); -+ -+ return (ok); -+} -+ - #endif /* GSSAPI */ - - #ifdef SSH_AUDIT_EVENTS - void - mm_audit_unsupported_body(int what) - { - Buffer m; - -diff --git a/openssh-6.6p1/monitor_wrap.h b/openssh-6.6p1/monitor_wrap.h ---- a/openssh-6.6p1/monitor_wrap.h -+++ b/openssh-6.6p1/monitor_wrap.h -@@ -54,18 +54,20 @@ int mm_user_key_verify(Key *, u_char *, - int mm_auth_rsa_key_allowed(struct passwd *, BIGNUM *, Key **); - int mm_auth_rsa_verify_response(Key *, BIGNUM *, u_char *); - BIGNUM *mm_auth_rsa_generate_challenge(Key *); - - #ifdef GSSAPI - OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); - OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *, - gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); --int mm_ssh_gssapi_userok(char *user); -+int mm_ssh_gssapi_userok(char *user, struct passwd *); - OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); -+OM_uint32 mm_ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); -+int mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *); - #endif - - #ifdef USE_PAM - void mm_start_pam(struct Authctxt *); - u_int mm_do_pam_account(void); - void *mm_sshpam_init_ctx(struct Authctxt *); - int mm_sshpam_query(void *, char **, char **, u_int *, char ***, u_int **); - int mm_sshpam_respond(void *, u_int, char **); -diff --git a/openssh-6.6p1/readconf.c b/openssh-6.6p1/readconf.c ---- a/openssh-6.6p1/readconf.c -+++ b/openssh-6.6p1/readconf.c -@@ -136,16 +136,18 @@ typedef enum { - oUsePrivilegedPort, oLogLevel, oCiphers, oProtocol, oMacs, - oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication, - oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias, - oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication, - oHostKeyAlgorithms, oBindAddress, oPKCS11Provider, - oClearAllForwardings, oNoHostAuthenticationForLocalhost, - oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, - oAddressFamily, oGssAuthentication, oGssDelegateCreds, oGssEnableMITM, -+ oGssTrustDns, oGssKeyEx, oGssClientIdentity, oGssRenewalRekey, -+ oGssServerIdentity, - oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, - oSendEnv, oControlPath, oControlMaster, oControlPersist, - oHashKnownHosts, - oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, - oVisualHostKey, oUseRoaming, - oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass, - oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots, - oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs, -@@ -178,22 +180,31 @@ static struct { - { "challengeresponseauthentication", oChallengeResponseAuthentication }, - { "skeyauthentication", oChallengeResponseAuthentication }, /* alias */ - { "tisauthentication", oChallengeResponseAuthentication }, /* alias */ - { "kerberosauthentication", oUnsupported }, - { "kerberostgtpassing", oUnsupported }, - { "afstokenpassing", oUnsupported }, - #if defined(GSSAPI) - { "gssapiauthentication", oGssAuthentication }, -+ { "gssapikeyexchange", oGssKeyEx }, - { "gssapidelegatecredentials", oGssDelegateCreds }, - { "gssapienablemitmattack", oGssEnableMITM }, -+ { "gssapitrustdns", oGssTrustDns }, -+ { "gssapiclientidentity", oGssClientIdentity }, -+ { "gssapiserveridentity", oGssServerIdentity }, -+ { "gssapirenewalforcesrekey", oGssRenewalRekey }, - #else - { "gssapiauthentication", oUnsupported }, -+ { "gssapikeyexchange", oUnsupported }, - { "gssapidelegatecredentials", oUnsupported }, - { "gssapienablemitmattack", oUnsupported }, -+ { "gssapitrustdns", oUnsupported }, -+ { "gssapiclientidentity", oUnsupported }, -+ { "gssapirenewalforcesrekey", oUnsupported }, - #endif - { "fallbacktorsh", oDeprecated }, - { "usersh", oDeprecated }, - { "identityfile", oIdentityFile }, - { "identityfile2", oIdentityFile }, /* obsolete */ - { "identitiesonly", oIdentitiesOnly }, - { "hostname", oHostName }, - { "hostkeyalias", oHostKeyAlias }, -@@ -838,24 +849,44 @@ parse_time: - case oChallengeResponseAuthentication: - intptr = &options->challenge_response_authentication; - goto parse_flag; - - case oGssAuthentication: - intptr = &options->gss_authentication; - goto parse_flag; - -+ case oGssKeyEx: -+ intptr = &options->gss_keyex; -+ goto parse_flag; -+ - case oGssDelegateCreds: - intptr = &options->gss_deleg_creds; - goto parse_flag; - - case oGssEnableMITM: - intptr = &options->gss_enable_mitm; - goto parse_flag; - -+ case oGssTrustDns: -+ intptr = &options->gss_trust_dns; -+ goto parse_flag; -+ -+ case oGssClientIdentity: -+ charptr = &options->gss_client_identity; -+ goto parse_string; -+ -+ case oGssServerIdentity: -+ charptr = &options->gss_server_identity; -+ goto parse_string; -+ -+ case oGssRenewalRekey: -+ intptr = &options->gss_renewal_rekey; -+ goto parse_flag; -+ - case oBatchMode: - intptr = &options->batch_mode; - goto parse_flag; - - case oCheckHostIP: - intptr = &options->check_host_ip; - goto parse_flag; - -@@ -1498,18 +1529,23 @@ initialize_options(Options * options) - options->exit_on_forward_failure = -1; - options->xauth_location = NULL; - options->gateway_ports = -1; - options->use_privileged_port = -1; - options->rsa_authentication = -1; - options->pubkey_authentication = -1; - options->challenge_response_authentication = -1; - options->gss_authentication = -1; -+ options->gss_keyex = -1; - options->gss_deleg_creds = -1; - options->gss_enable_mitm = -1; -+ options->gss_trust_dns = -1; -+ options->gss_renewal_rekey = -1; -+ options->gss_client_identity = NULL; -+ options->gss_server_identity = NULL; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->kbd_interactive_devices = NULL; - options->rhosts_rsa_authentication = -1; - options->hostbased_authentication = -1; - options->batch_mode = -1; - options->check_host_ip = -1; - options->strict_host_key_checking = -1; -@@ -1618,20 +1654,26 @@ fill_default_options(Options * options) - if (options->rsa_authentication == -1) - options->rsa_authentication = 1; - if (options->pubkey_authentication == -1) - options->pubkey_authentication = 1; - if (options->challenge_response_authentication == -1) - options->challenge_response_authentication = 1; - if (options->gss_authentication == -1) - options->gss_authentication = 0; -+ if (options->gss_keyex == -1) -+ options->gss_keyex = 0; - if (options->gss_deleg_creds == -1) - options->gss_deleg_creds = 0; - if (options->gss_enable_mitm == -1) - options->gss_enable_mitm = 0; -+ if (options->gss_trust_dns == -1) -+ options->gss_trust_dns = 0; -+ if (options->gss_renewal_rekey == -1) -+ options->gss_renewal_rekey = 0; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) - options->kbd_interactive_authentication = 1; - if (options->rhosts_rsa_authentication == -1) - options->rhosts_rsa_authentication = 0; - if (options->hostbased_authentication == -1) - options->hostbased_authentication = 0; -diff --git a/openssh-6.6p1/readconf.h b/openssh-6.6p1/readconf.h ---- a/openssh-6.6p1/readconf.h -+++ b/openssh-6.6p1/readconf.h -@@ -49,18 +49,23 @@ typedef struct { - int rhosts_rsa_authentication; /* Try rhosts with RSA - * authentication. */ - int rsa_authentication; /* Try RSA authentication. */ - int pubkey_authentication; /* Try ssh2 pubkey authentication. */ - int hostbased_authentication; /* ssh2's rhosts_rsa */ - int challenge_response_authentication; - /* Try S/Key or TIS, authentication. */ - int gss_authentication; /* Try GSS authentication */ -+ int gss_keyex; /* Try GSS key exchange */ - int gss_deleg_creds; /* Delegate GSS credentials */ - int gss_enable_mitm; /* Enable old style gssapi auth */ -+ int gss_trust_dns; /* Trust DNS for GSS canonicalization */ -+ int gss_renewal_rekey; /* Credential renewal forces rekey */ -+ char *gss_client_identity; /* Principal to initiate GSSAPI with */ -+ char *gss_server_identity; /* GSSAPI target principal */ - int password_authentication; /* Try password - * authentication. */ - int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ - char *kbd_interactive_devices; /* Keyboard-interactive auth devices. */ - int batch_mode; /* Batch mode: do not ask for passwords. */ - int check_host_ip; /* Also keep track of keys for IP address */ - int strict_host_key_checking; /* Strict host key checking. */ - int compression; /* Compress packets in both directions. */ -diff --git a/openssh-6.6p1/servconf.c b/openssh-6.6p1/servconf.c ---- a/openssh-6.6p1/servconf.c -+++ b/openssh-6.6p1/servconf.c -@@ -104,18 +104,21 @@ initialize_server_options(ServerOptions - options->hostbased_uses_name_from_packet_only = -1; - options->rsa_authentication = -1; - options->pubkey_authentication = -1; - options->kerberos_authentication = -1; - options->kerberos_or_local_passwd = -1; - options->kerberos_ticket_cleanup = -1; - options->kerberos_get_afs_token = -1; - options->gss_authentication=-1; -+ options->gss_keyex = -1; - options->gss_cleanup_creds = -1; - options->gss_enable_mitm = -1; -+ options->gss_strict_acceptor = -1; -+ options->gss_store_rekey = -1; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->challenge_response_authentication = -1; - options->permit_empty_passwd = -1; - options->permit_user_env = -1; - options->use_login = -1; - options->compression = -1; - options->rekey_limit = -1; -@@ -243,20 +246,26 @@ fill_default_server_options(ServerOption - if (options->kerberos_or_local_passwd == -1) - options->kerberos_or_local_passwd = 1; - if (options->kerberos_ticket_cleanup == -1) - options->kerberos_ticket_cleanup = 1; - if (options->kerberos_get_afs_token == -1) - options->kerberos_get_afs_token = 0; - if (options->gss_authentication == -1) - options->gss_authentication = 0; -+ if (options->gss_keyex == -1) -+ options->gss_keyex = 0; - if (options->gss_cleanup_creds == -1) - options->gss_cleanup_creds = 1; - if (options->gss_enable_mitm == -1) - options->gss_enable_mitm = 0; -+ if (options->gss_strict_acceptor == -1) -+ options->gss_strict_acceptor = 1; -+ if (options->gss_store_rekey == -1) -+ options->gss_store_rekey = 0; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) - options->kbd_interactive_authentication = 0; - if (options->challenge_response_authentication == -1) - options->challenge_response_authentication = 1; - if (options->permit_empty_passwd == -1) - options->permit_empty_passwd = 0; -@@ -342,16 +351,17 @@ typedef enum { - sRekeyLimit, sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups, - sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile, - sGatewayPorts, sPubkeyAuthentication, sXAuthLocation, sSubsystem, - sMaxStartups, sMaxAuthTries, sMaxSessions, - sBanner, sUseDNS, sHostbasedAuthentication, - sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, - sClientAliveCountMax, sAuthorizedKeysFile, - sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, sGssEnableMITM, -+ sGssStrictAcceptor, sGssKeyEx, sGssStoreRekey, - sMatch, sPermitOpen, sForceCommand, sChrootDirectory, - sUsePrivilegeSeparation, sAllowAgentForwarding, - sHostCertificate, - sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile, - sKexAlgorithms, sIPQoS, sVersionAddendum, - sAuthorizedKeysCommand, sAuthorizedKeysCommandUser, - sAuthenticationMethods, sHostKeyAgent, - sDeprecated, sUnsupported -@@ -411,21 +421,31 @@ static struct { - { "kerberosgetafstoken", sUnsupported, SSHCFG_GLOBAL }, - #endif - { "kerberostgtpassing", sUnsupported, SSHCFG_GLOBAL }, - { "afstokenpassing", sUnsupported, SSHCFG_GLOBAL }, - #ifdef GSSAPI - { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL }, - { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL }, - { "gssapienablemitmattack", sGssEnableMITM }, -+ { "gssapicleanupcreds", sGssCleanupCreds, SSHCFG_GLOBAL }, -+ { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL }, -+ { "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL }, -+ { "gssapistorecredentialsonrekey", sGssStoreRekey, SSHCFG_GLOBAL }, - #else - { "gssapiauthentication", sUnsupported, SSHCFG_ALL }, - { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL }, - { "gssapienablemitmattack", sUnsupported }, -+ { "gssapicleanupcreds", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapistorecredentialsonrekey", sUnsupported, SSHCFG_GLOBAL }, - #endif -+ { "gssusesessionccache", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapiusesessioncredcache", sUnsupported, SSHCFG_GLOBAL }, - { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL }, - { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL }, - { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL }, - { "skeyauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL }, /* alias */ - { "checkmail", sDeprecated, SSHCFG_GLOBAL }, - { "listenaddress", sListenAddress, SSHCFG_GLOBAL }, - { "addressfamily", sAddressFamily, SSHCFG_GLOBAL }, - { "printmotd", sPrintMotd, SSHCFG_GLOBAL }, -@@ -1094,24 +1114,36 @@ process_server_config_line(ServerOptions - case sKerberosGetAFSToken: - intptr = &options->kerberos_get_afs_token; - goto parse_flag; - - case sGssAuthentication: - intptr = &options->gss_authentication; - goto parse_flag; - -+ case sGssKeyEx: -+ intptr = &options->gss_keyex; -+ goto parse_flag; -+ - case sGssCleanupCreds: - intptr = &options->gss_cleanup_creds; - goto parse_flag; - - case sGssEnableMITM: - intptr = &options->gss_enable_mitm; - goto parse_flag; - -+ case sGssStrictAcceptor: -+ intptr = &options->gss_strict_acceptor; -+ goto parse_flag; -+ -+ case sGssStoreRekey: -+ intptr = &options->gss_store_rekey; -+ goto parse_flag; -+ - case sPasswordAuthentication: - intptr = &options->password_authentication; - goto parse_flag; - - case sKbdInteractiveAuthentication: - intptr = &options->kbd_interactive_authentication; - goto parse_flag; - -@@ -2007,17 +2039,20 @@ dump_config(ServerOptions *o) - dump_cfg_fmtint(sKerberosOrLocalPasswd, o->kerberos_or_local_passwd); - dump_cfg_fmtint(sKerberosTicketCleanup, o->kerberos_ticket_cleanup); - # ifdef USE_AFS - dump_cfg_fmtint(sKerberosGetAFSToken, o->kerberos_get_afs_token); - # endif - #endif - #ifdef GSSAPI - dump_cfg_fmtint(sGssAuthentication, o->gss_authentication); -+ dump_cfg_fmtint(sGssKeyEx, o->gss_keyex); - dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds); -+ dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor); -+ dump_cfg_fmtint(sGssStoreRekey, o->gss_store_rekey); - #endif - dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication); - dump_cfg_fmtint(sKbdInteractiveAuthentication, - o->kbd_interactive_authentication); - dump_cfg_fmtint(sChallengeResponseAuthentication, - o->challenge_response_authentication); - dump_cfg_fmtint(sPrintMotd, o->print_motd); - dump_cfg_fmtint(sPrintLastLog, o->print_lastlog); -diff --git a/openssh-6.6p1/servconf.h b/openssh-6.6p1/servconf.h ---- a/openssh-6.6p1/servconf.h -+++ b/openssh-6.6p1/servconf.h -@@ -107,18 +107,21 @@ typedef struct { - * authentication mechanism, - * such as SecurID or - * /etc/passwd */ - int kerberos_ticket_cleanup; /* If true, destroy ticket - * file on logout. */ - int kerberos_get_afs_token; /* If true, try to get AFS token if - * authenticated with Kerberos. */ - int gss_authentication; /* If true, permit GSSAPI authentication */ -+ int gss_keyex; /* If true, permit GSSAPI key exchange */ - int gss_cleanup_creds; /* If true, destroy cred cache on logout */ - int gss_enable_mitm; /* If true, enable old style GSSAPI */ -+ int gss_strict_acceptor; /* If true, restrict the GSSAPI acceptor name */ -+ int gss_store_rekey; - int password_authentication; /* If true, permit password - * authentication. */ - int kbd_interactive_authentication; /* If true, permit */ - int challenge_response_authentication; - int permit_empty_passwd; /* If false, do not permit empty - * passwords. */ - int permit_user_env; /* If true, read ~/.ssh/environment */ - int use_login; /* If true, login(1) is used */ -diff --git a/openssh-6.6p1/ssh-gss.h b/openssh-6.6p1/ssh-gss.h ---- a/openssh-6.6p1/ssh-gss.h -+++ b/openssh-6.6p1/ssh-gss.h -@@ -1,11 +1,11 @@ - /* $OpenBSD: ssh-gss.h,v 1.11 2014/02/26 20:28:44 djm Exp $ */ - /* -- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2009 Simon Wilkinson. 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 -@@ -56,53 +56,70 @@ - #define SSH2_MSG_USERAUTH_GSSAPI_TOKEN 61 - #define SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE 63 - #define SSH2_MSG_USERAUTH_GSSAPI_ERROR 64 - #define SSH2_MSG_USERAUTH_GSSAPI_ERRTOK 65 - #define SSH2_MSG_USERAUTH_GSSAPI_MIC 66 - - #define SSH_GSS_OIDTYPE 0x06 - -+#define SSH2_MSG_KEXGSS_INIT 30 -+#define SSH2_MSG_KEXGSS_CONTINUE 31 -+#define SSH2_MSG_KEXGSS_COMPLETE 32 -+#define SSH2_MSG_KEXGSS_HOSTKEY 33 -+#define SSH2_MSG_KEXGSS_ERROR 34 -+#define SSH2_MSG_KEXGSS_GROUPREQ 40 -+#define SSH2_MSG_KEXGSS_GROUP 41 -+#define KEX_GSS_GRP1_SHA1_ID "gss-group1-sha1-" -+#define KEX_GSS_GRP14_SHA1_ID "gss-group14-sha1-" -+#define KEX_GSS_GEX_SHA1_ID "gss-gex-sha1-" -+ - typedef struct { - char *filename; - char *envvar; - char *envval; -+ struct passwd *owner; - void *data; - } ssh_gssapi_ccache; - - typedef struct { - gss_buffer_desc displayname; - gss_buffer_desc exportedname; - gss_cred_id_t creds; -+ gss_name_t name; - struct ssh_gssapi_mech_struct *mech; - ssh_gssapi_ccache store; -+ int used; -+ int updated; - } ssh_gssapi_client; - - typedef struct ssh_gssapi_mech_struct { - char *enc_name; - char *name; - gss_OID_desc oid; - int (*dochild) (ssh_gssapi_client *); - int (*userok) (ssh_gssapi_client *, char *); - int (*localname) (ssh_gssapi_client *, char **); - void (*storecreds) (ssh_gssapi_client *); -+ int (*updatecreds) (ssh_gssapi_ccache *, ssh_gssapi_client *); - } ssh_gssapi_mech; - - typedef struct { - OM_uint32 major; /* both */ - OM_uint32 minor; /* both */ - gss_ctx_id_t context; /* both */ - gss_name_t name; /* both */ - gss_OID oid; /* client */ - gss_cred_id_t creds; /* server */ - gss_name_t client; /* server */ -- gss_cred_id_t client_creds; /* server */ -+ gss_cred_id_t client_creds; /* both */ - } Gssctxt; - - extern ssh_gssapi_mech *supported_mechs[]; -+extern Gssctxt *gss_kex_context; - - int ssh_gssapi_check_oid(Gssctxt *, void *, size_t); - void ssh_gssapi_set_oid_data(Gssctxt *, void *, size_t); - void ssh_gssapi_set_oid(Gssctxt *, gss_OID); - void ssh_gssapi_supported_oids(gss_OID_set *); - ssh_gssapi_mech *ssh_gssapi_get_ctype(Gssctxt *); - void ssh_gssapi_prepare_supported_oids(void); - OM_uint32 ssh_gssapi_test_oid_supported(OM_uint32 *, gss_OID, int *); -@@ -114,21 +131,35 @@ OM_uint32 ssh_gssapi_accept_ctx(Gssctxt - gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); - OM_uint32 ssh_gssapi_getclient(Gssctxt *, ssh_gssapi_client *); - void ssh_gssapi_error(Gssctxt *); - char *ssh_gssapi_last_error(Gssctxt *, OM_uint32 *, OM_uint32 *); - void ssh_gssapi_build_ctx(Gssctxt **); - void ssh_gssapi_delete_ctx(Gssctxt **); - OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); - void ssh_gssapi_buildmic(Buffer *, const char *, const char *, const char *); --int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *); -+int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *, const char *); -+OM_uint32 ssh_gssapi_client_identity(Gssctxt *, const char *); -+int ssh_gssapi_credentials_updated(Gssctxt *); - - /* In the server */ -+typedef int ssh_gssapi_check_fn(Gssctxt **, gss_OID, const char *, -+ const char *); -+char *ssh_gssapi_client_mechanisms(const char *, const char *); -+char *ssh_gssapi_kex_mechs(gss_OID_set, ssh_gssapi_check_fn *, const char *, -+ const char *); -+gss_OID ssh_gssapi_id_kex(Gssctxt *, char *, int); -+int ssh_gssapi_server_check_mech(Gssctxt **,gss_OID, const char *, -+ const char *); - OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID); --int ssh_gssapi_userok(char *name); -+int ssh_gssapi_userok(char *name, struct passwd *); - OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); - void ssh_gssapi_do_child(char ***, u_int *); - void ssh_gssapi_cleanup_creds(void); - void ssh_gssapi_storecreds(void); - -+char *ssh_gssapi_server_mechanisms(void); -+int ssh_gssapi_oid_table_ok(); -+ -+int ssh_gssapi_update_creds(ssh_gssapi_ccache *store); - #endif /* GSSAPI */ - - #endif /* _SSH_GSS_H */ -diff --git a/openssh-6.6p1/ssh_config b/openssh-6.6p1/ssh_config ---- a/openssh-6.6p1/ssh_config -+++ b/openssh-6.6p1/ssh_config -@@ -32,16 +32,18 @@ Host * - ForwardX11Trusted yes - - # RhostsRSAAuthentication no - # RSAAuthentication yes - # PasswordAuthentication yes - # HostbasedAuthentication no - # GSSAPIAuthentication no - # GSSAPIDelegateCredentials no -+# GSSAPIKeyExchange no -+# GSSAPITrustDNS no - # BatchMode no - # CheckHostIP yes - # AddressFamily any - # ConnectTimeout 0 - # StrictHostKeyChecking ask - # IdentityFile ~/.ssh/identity - # IdentityFile ~/.ssh/id_rsa - # IdentityFile ~/.ssh/id_dsa -diff --git a/openssh-6.6p1/ssh_config.5 b/openssh-6.6p1/ssh_config.5 ---- a/openssh-6.6p1/ssh_config.5 -+++ b/openssh-6.6p1/ssh_config.5 -@@ -677,21 +677,53 @@ host key database, separated by whitespa - The default is - .Pa /etc/ssh/ssh_known_hosts , - .Pa /etc/ssh/ssh_known_hosts2 . - .It Cm GSSAPIAuthentication - Specifies whether user authentication based on GSSAPI is allowed. - The default is - .Dq no . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIKeyExchange -+Specifies whether key exchange based on GSSAPI may be used. When using -+GSSAPI key exchange the server need not have a host key. -+The default is -+.Dq no . -+Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIClientIdentity -+If set, specifies the GSSAPI client identity that ssh should use when -+connecting to the server. The default is unset, which means that the default -+identity will be used. -+.It Cm GSSAPIServerIdentity -+If set, specifies the GSSAPI server identity that ssh should expect when -+connecting to the server. The default is unset, which means that the -+expected GSSAPI server identity will be determined from the target -+hostname. - .It Cm GSSAPIDelegateCredentials - Forward (delegate) credentials to the server. - The default is - .Dq no . --Note that this option applies to protocol version 2 only. -+Note that this option applies to protocol version 2 connections using GSSAPI. -+.It Cm GSSAPIRenewalForcesRekey -+If set to -+.Dq yes -+then renewal of the client's GSSAPI credentials will force the rekeying of the -+ssh connection. With a compatible server, this can delegate the renewed -+credentials to a session on the server. -+The default is -+.Dq no . -+.It Cm GSSAPITrustDns -+Set to -+.Dq yes to indicate that the DNS is trusted to securely canonicalize -+the name of the host being connected to. If -+.Dq no, the hostname entered on the -+command line will be passed untouched to the GSSAPI library. -+The default is -+.Dq no . -+This option only applies to protocol version 2 connections using GSSAPI. - .It Cm HashKnownHosts - Indicates that - .Xr ssh 1 - should hash host names and addresses when they are added to - .Pa ~/.ssh/known_hosts . - These hashed names may be used normally by - .Xr ssh 1 - and -diff --git a/openssh-6.6p1/sshconnect2.c b/openssh-6.6p1/sshconnect2.c ---- a/openssh-6.6p1/sshconnect2.c -+++ b/openssh-6.6p1/sshconnect2.c -@@ -155,19 +155,44 @@ order_hostkeyalgs(char *host, struct soc - return ret; - } - - void - ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) - { - Kex *kex; - -+#ifdef GSSAPI -+ char *orig = NULL, *gss = NULL; -+ char *gss_host = NULL; -+#endif -+ - xxx_host = host; - xxx_hostaddr = hostaddr; - -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ /* Add the GSSAPI mechanisms currently supported on this -+ * client to the key exchange algorithm proposal */ -+ orig = myproposal[PROPOSAL_KEX_ALGS]; -+ -+ if (options.gss_trust_dns) -+ gss_host = (char *)get_canonical_hostname(1); -+ else -+ gss_host = host; -+ -+ gss = ssh_gssapi_client_mechanisms(gss_host, options.gss_client_identity); -+ if (gss) { -+ debug("Offering GSSAPI proposal: %s", gss); -+ xasprintf(&myproposal[PROPOSAL_KEX_ALGS], -+ "%s,%s", gss, orig); -+ } -+ } -+#endif -+ - if (options.ciphers == (char *)-1) { - logit("No valid ciphers for protocol version 2 given, using defaults."); - options.ciphers = NULL; - } - if (options.ciphers != NULL) { - myproposal[PROPOSAL_ENC_ALGS_CTOS] = - myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; - } else if (fips_mode()) { -@@ -205,32 +230,63 @@ ssh_kex2(char *host, struct sockaddr *ho - compat_pkalg_proposal( - order_hostkeyalgs(host, hostaddr, port)); - } - if (options.kex_algorithms != NULL) - myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; - myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal( - myproposal[PROPOSAL_KEX_ALGS]); - -+#ifdef GSSAPI -+ /* If we've got GSSAPI algorithms, then we also support the -+ * 'null' hostkey, as a last resort */ -+ if (options.gss_keyex && gss) { -+ orig = myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]; -+ xasprintf(&myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS], -+ "%s,null", orig); -+ free(gss); -+ } -+#endif -+ - if (options.rekey_limit || options.rekey_interval) - packet_set_rekey_limits((u_int32_t)options.rekey_limit, - (time_t)options.rekey_interval); - - /* start key exchange */ - kex = kex_setup(myproposal); - kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; - kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; - kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; - kex->kex[KEX_ECDH_SHA2] = kexecdh_client; - kex->kex[KEX_C25519_SHA256] = kexc25519_client; -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_client; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_client; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_client; -+ } -+#endif - kex->client_version_string=client_version_string; - kex->server_version_string=server_version_string; - kex->verify_host_key=&verify_host_key_callback; - -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ kex->gss_deleg_creds = options.gss_deleg_creds; -+ kex->gss_trust_dns = options.gss_trust_dns; -+ kex->gss_client = options.gss_client_identity; -+ if (options.gss_server_identity) { -+ kex->gss_host = options.gss_server_identity; -+ } else { -+ kex->gss_host = gss_host; -+ } -+ } -+#endif -+ - xxx_kex = kex; - - dispatch_run(DISPATCH_BLOCK, &kex->done, kex); - - if (options.use_roaming && !kex->roaming) { - debug("Roaming not allowed by server"); - options.use_roaming = 0; - } -@@ -310,31 +366,37 @@ int userauth_hostbased(Authctxt *); - - #ifdef GSSAPI - int userauth_gssapi(Authctxt *authctxt); - void input_gssapi_response(int type, u_int32_t, void *); - void input_gssapi_token(int type, u_int32_t, void *); - void input_gssapi_hash(int type, u_int32_t, void *); - void input_gssapi_error(int, u_int32_t, void *); - void input_gssapi_errtok(int, u_int32_t, void *); -+int userauth_gsskeyex(Authctxt *authctxt); - #endif - - void userauth(Authctxt *, char *); - - static int sign_and_send_pubkey(Authctxt *, Identity *); - static void pubkey_prepare(Authctxt *); - static void pubkey_cleanup(Authctxt *); - static Key *load_identity_file(char *, int); - - static Authmethod *authmethod_get(char *authlist); - static Authmethod *authmethod_lookup(const char *name); - static char *authmethods_get(void); - - Authmethod authmethods[] = { - #ifdef GSSAPI -+ {"gssapi-keyex", -+ userauth_gsskeyex, -+ NULL, -+ &options.gss_authentication, -+ NULL}, - {"gssapi-with-mic", - userauth_gssapi, - NULL, - &options.gss_authentication, - NULL}, - {"gssapi", - userauth_gssapi, - NULL, -@@ -626,29 +688,41 @@ done: - int - userauth_gssapi(Authctxt *authctxt) - { - Gssctxt *gssctxt = NULL; - static gss_OID_set gss_supported = NULL; - static u_int mech = 0; - OM_uint32 min; - int ok = 0; -+ const char *gss_host; -+ -+ if (options.gss_server_identity) -+ gss_host = options.gss_server_identity; -+ else if (options.gss_trust_dns) -+ gss_host = get_canonical_hostname(1); -+ else -+ gss_host = authctxt->host; - - /* Try one GSSAPI method at a time, rather than sending them all at - * once. */ - - if (gss_supported == NULL) -- gss_indicate_mechs(&min, &gss_supported); -+ if (GSS_ERROR(gss_indicate_mechs(&min, &gss_supported))) { -+ gss_supported = NULL; -+ return 0; -+ } - - /* Check to see if the mechanism is usable before we offer it */ - while (mech < gss_supported->count && !ok) { - /* My DER encoding requires length<128 */ - if (gss_supported->elements[mech].length < 128 && - ssh_gssapi_check_mechanism(&gssctxt, -- &gss_supported->elements[mech], authctxt->host)) { -+ &gss_supported->elements[mech], gss_host, -+ options.gss_client_identity)) { - ok = 1; /* Mechanism works */ - } else { - mech++; - } - } - - if (!ok) - return 0; -@@ -737,18 +811,18 @@ process_gssapi_token(void *ctxt, gss_buf - } - - /* ARGSUSED */ - void - input_gssapi_response(int type, u_int32_t plen, void *ctxt) - { - Authctxt *authctxt = ctxt; - Gssctxt *gssctxt; -- int oidlen; -- char *oidv; -+ u_int oidlen; -+ u_char *oidv; - - if (authctxt == NULL) - fatal("input_gssapi_response: no authentication context"); - gssctxt = authctxt->methoddata; - - /* Setup our OID */ - oidv = packet_get_string(&oidlen); - -@@ -847,16 +921,58 @@ input_gssapi_error(int type, u_int32_t p - lang=packet_get_string(NULL); - - packet_check_eom(); - - debug("Server GSSAPI Error:\n%s", msg); - free(msg); - free(lang); - } -+ -+int -+userauth_gsskeyex(Authctxt *authctxt) -+{ -+ Buffer b; -+ gss_buffer_desc gssbuf; -+ gss_buffer_desc mic = GSS_C_EMPTY_BUFFER; -+ OM_uint32 ms; -+ -+ static int attempt = 0; -+ if (attempt++ >= 1) -+ return (0); -+ -+ if (gss_kex_context == NULL) { -+ debug("No valid Key exchange context"); -+ return (0); -+ } -+ -+ ssh_gssapi_buildmic(&b, authctxt->server_user, authctxt->service, -+ "gssapi-keyex"); -+ -+ gssbuf.value = buffer_ptr(&b); -+ gssbuf.length = buffer_len(&b); -+ -+ if (GSS_ERROR(ssh_gssapi_sign(gss_kex_context, &gssbuf, &mic))) { -+ buffer_free(&b); -+ return (0); -+ } -+ -+ packet_start(SSH2_MSG_USERAUTH_REQUEST); -+ packet_put_cstring(authctxt->server_user); -+ packet_put_cstring(authctxt->service); -+ packet_put_cstring(authctxt->method->name); -+ packet_put_string(mic.value, mic.length); -+ packet_send(); -+ -+ buffer_free(&b); -+ gss_release_buffer(&ms, &mic); -+ -+ return (1); -+} -+ - #endif /* GSSAPI */ - - int - userauth_none(Authctxt *authctxt) - { - /* initial userauth request */ - packet_start(SSH2_MSG_USERAUTH_REQUEST); - packet_put_cstring(authctxt->server_user); -diff --git a/openssh-6.6p1/sshd.c b/openssh-6.6p1/sshd.c ---- a/openssh-6.6p1/sshd.c -+++ b/openssh-6.6p1/sshd.c -@@ -123,16 +123,20 @@ - #include "roaming.h" - #include "ssh-sandbox.h" - #include "version.h" - - #include "fips.h" - - #include "audit.h" - -+#ifdef USE_SECURITY_SESSION_API -+#include -+#endif -+ - #ifdef LIBWRAP - #include - #include - int allow_severity; - int deny_severity; - #endif /* LIBWRAP */ - - #ifndef O_NOCTTY -@@ -1804,20 +1808,23 @@ main(int ac, char **av) - if ((options.protocol & SSH_PROTO_1) && fips_mode()) { - logit("Disabling protocol version 1. Not allowed in the FIPS mode."); - options.protocol &= ~SSH_PROTO_1; - } - if ((options.protocol & SSH_PROTO_1) && !sensitive_data.have_ssh1_key) { - logit("Disabling protocol version 1. Could not load host key"); - options.protocol &= ~SSH_PROTO_1; - } -+#ifndef GSSAPI -+ /* The GSSAPI key exchange can run without a host key */ - if ((options.protocol & SSH_PROTO_2) && !sensitive_data.have_ssh2_key) { - logit("Disabling protocol version 2. Could not load host key"); - options.protocol &= ~SSH_PROTO_2; - } -+#endif - if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) { - logit("sshd: no hostkeys available -- exiting."); - exit(1); - } - - /* - * Load certificates. They are stored in an array at identical - * indices to the public keys that they relate to. -@@ -2007,16 +2014,70 @@ main(int ac, char **av) - /* Accept a connection and return in a forked child */ - server_accept_loop(&sock_in, &sock_out, - &newsock, config_s); - } - - /* This is the child processing a new connection. */ - setproctitle("%s", "[accepted]"); - -+#ifdef USE_SECURITY_SESSION_API -+ /* -+ * Create a new security session for use by the new user login if -+ * the current session is the root session or we are not launched -+ * by inetd (eg: debugging mode or server mode). We do not -+ * necessarily need to create a session if we are launched from -+ * inetd because Panther xinetd will create a session for us. -+ * -+ * The only case where this logic will fail is if there is an -+ * inetd running in a non-root session which is not creating -+ * new sessions for us. Then all the users will end up in the -+ * same session (bad). -+ * -+ * When the client exits, the session will be destroyed for us -+ * automatically. -+ * -+ * We must create the session before any credentials are stored -+ * (including AFS pags, which happens a few lines below). -+ */ -+ { -+ OSStatus err = 0; -+ SecuritySessionId sid = 0; -+ SessionAttributeBits sattrs = 0; -+ -+ err = SessionGetInfo(callerSecuritySession, &sid, &sattrs); -+ if (err) -+ error("SessionGetInfo() failed with error %.8X", -+ (unsigned) err); -+ else -+ debug("Current Session ID is %.8X / Session Attributes are %.8X", -+ (unsigned) sid, (unsigned) sattrs); -+ -+ if (inetd_flag && !(sattrs & sessionIsRoot)) -+ debug("Running in inetd mode in a non-root session... " -+ "assuming inetd created the session for us."); -+ else { -+ debug("Creating new security session..."); -+ err = SessionCreate(0, sessionHasTTY | sessionIsRemote); -+ if (err) -+ error("SessionCreate() failed with error %.8X", -+ (unsigned) err); -+ -+ err = SessionGetInfo(callerSecuritySession, &sid, -+ &sattrs); -+ if (err) -+ error("SessionGetInfo() failed with error %.8X", -+ (unsigned) err); -+ else -+ debug("New Session ID is %.8X / Session Attributes are %.8X", -+ (unsigned) sid, (unsigned) sattrs); -+ } -+ } -+#endif -+ - /* - * Create a new session and process group since the 4.4BSD - * setlogin() affects the entire process group. We don't - * want the child to be able to affect the parent. - */ - #if !defined(SSHD_ACQUIRES_CTTY) - /* - * If setsid is called, on some platforms sshd will later acquire a -@@ -2134,16 +2195,70 @@ main(int ac, char **av) - } - #endif /* LIBWRAP */ - - /* Log the connection. */ - verbose("Connection from %s port %d on %s port %d", - remote_ip, remote_port, - get_local_ipaddr(sock_in), get_local_port()); - -+#ifdef USE_SECURITY_SESSION_API -+ /* -+ * Create a new security session for use by the new user login if -+ * the current session is the root session or we are not launched -+ * by inetd (eg: debugging mode or server mode). We do not -+ * necessarily need to create a session if we are launched from -+ * inetd because Panther xinetd will create a session for us. -+ * -+ * The only case where this logic will fail is if there is an -+ * inetd running in a non-root session which is not creating -+ * new sessions for us. Then all the users will end up in the -+ * same session (bad). -+ * -+ * When the client exits, the session will be destroyed for us -+ * automatically. -+ * -+ * We must create the session before any credentials are stored -+ * (including AFS pags, which happens a few lines below). -+ */ -+ { -+ OSStatus err = 0; -+ SecuritySessionId sid = 0; -+ SessionAttributeBits sattrs = 0; -+ -+ err = SessionGetInfo(callerSecuritySession, &sid, &sattrs); -+ if (err) -+ error("SessionGetInfo() failed with error %.8X", -+ (unsigned) err); -+ else -+ debug("Current Session ID is %.8X / Session Attributes are %.8X", -+ (unsigned) sid, (unsigned) sattrs); -+ -+ if (inetd_flag && !(sattrs & sessionIsRoot)) -+ debug("Running in inetd mode in a non-root session... " -+ "assuming inetd created the session for us."); -+ else { -+ debug("Creating new security session..."); -+ err = SessionCreate(0, sessionHasTTY | sessionIsRemote); -+ if (err) -+ error("SessionCreate() failed with error %.8X", -+ (unsigned) err); -+ -+ err = SessionGetInfo(callerSecuritySession, &sid, -+ &sattrs); -+ if (err) -+ error("SessionGetInfo() failed with error %.8X", -+ (unsigned) err); -+ else -+ debug("New Session ID is %.8X / Session Attributes are %.8X", -+ (unsigned) sid, (unsigned) sattrs); -+ } -+ } -+#endif -+ - /* - * We don't want to listen forever unless the other side - * successfully authenticates itself. So we set up an alarm which is - * cleared after successful authentication. A limit of zero - * indicates no limit. Note that we don't set the alarm in debugging - * mode; it is just annoying to have the server exit just when you - * are about to discover the bug. - */ -@@ -2562,24 +2677,73 @@ do_ssh2_kex(void) - - if (options.rekey_limit || options.rekey_interval) - packet_set_rekey_limits((u_int32_t)options.rekey_limit, - (time_t)options.rekey_interval); - - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal( - list_hostkey_types()); - -+#ifdef GSSAPI -+ { -+ char *orig; -+ char *gss = NULL; -+ char *newstr = NULL; -+ orig = myproposal[PROPOSAL_KEX_ALGS]; -+ -+ /* -+ * If we don't have a host key, then there's no point advertising -+ * the other key exchange algorithms -+ */ -+ -+ if (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]) == 0) -+ orig = NULL; -+ -+ if (options.gss_keyex) -+ gss = ssh_gssapi_server_mechanisms(); -+ else -+ gss = NULL; -+ -+ if (gss && orig) -+ xasprintf(&newstr, "%s,%s", gss, orig); -+ else if (gss) -+ newstr = gss; -+ else if (orig) -+ newstr = orig; -+ -+ /* -+ * If we've got GSSAPI mechanisms, then we've got the 'null' host -+ * key alg, but we can't tell people about it unless its the only -+ * host key algorithm we support -+ */ -+ if (gss && (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS])) == 0) -+ myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = "null"; -+ -+ if (newstr) -+ myproposal[PROPOSAL_KEX_ALGS] = newstr; -+ else -+ fatal("No supported key exchange algorithms"); -+ } -+#endif -+ - /* start key exchange */ - kex = kex_setup(myproposal); - kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; - kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; - kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; - kex->kex[KEX_ECDH_SHA2] = kexecdh_server; - kex->kex[KEX_C25519_SHA256] = kexc25519_server; -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server; -+ } -+#endif - kex->server = 1; - kex->client_version_string=client_version_string; - kex->server_version_string=server_version_string; - kex->load_host_public_key=&get_hostkey_public_by_type; - kex->load_host_private_key=&get_hostkey_private_by_type; - kex->host_key_index=&get_hostkey_index; - kex->sign = sshd_hostkey_sign; - -diff --git a/openssh-6.6p1/sshd_config b/openssh-6.6p1/sshd_config ---- a/openssh-6.6p1/sshd_config -+++ b/openssh-6.6p1/sshd_config -@@ -79,16 +79,18 @@ PasswordAuthentication no - #KerberosAuthentication no - #KerberosOrLocalPasswd yes - #KerberosTicketCleanup yes - #KerberosGetAFSToken no - - # GSSAPI options - #GSSAPIAuthentication no - #GSSAPICleanupCredentials yes -+#GSSAPIStrictAcceptorCheck yes -+#GSSAPIKeyExchange no - - # Set this to 'yes' to enable support for the deprecated 'gssapi' authentication - # mechanism to OpenSSH 3.8p1. The newer 'gssapi-with-mic' mechanism is included - # in this release. The use of 'gssapi' is deprecated due to the presence of - # potential man-in-the-middle attacks, which 'gssapi-with-mic' is not susceptible to. - #GSSAPIEnableMITMAttack no - - -diff --git a/openssh-6.6p1/sshd_config.5 b/openssh-6.6p1/sshd_config.5 ---- a/openssh-6.6p1/sshd_config.5 -+++ b/openssh-6.6p1/sshd_config.5 -@@ -487,22 +487,50 @@ to force remote port forwardings to bind - to allow the client to select the address to which the forwarding is bound. - The default is - .Dq no . - .It Cm GSSAPIAuthentication - Specifies whether user authentication based on GSSAPI is allowed. - The default is - .Dq no . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIKeyExchange -+Specifies whether key exchange based on GSSAPI is allowed. GSSAPI key exchange -+doesn't rely on ssh keys to verify host identity. -+The default is -+.Dq no . -+Note that this option applies to protocol version 2 only. - .It Cm GSSAPICleanupCredentials - Specifies whether to automatically destroy the user's credentials cache - on logout. - The default is - .Dq yes . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIStrictAcceptorCheck -+Determines whether to be strict about the identity of the GSSAPI acceptor -+a client authenticates against. If -+.Dq yes -+then the client must authenticate against the -+.Pa host -+service on the current hostname. If -+.Dq no -+then the client may authenticate against any service key stored in the -+machine's default store. This facility is provided to assist with operation -+on multi homed machines. -+The default is -+.Dq yes . -+Note that this option applies only to protocol version 2 GSSAPI connections, -+and setting it to -+.Dq no -+may only work with recent Kerberos GSSAPI libraries. -+.It Cm GSSAPIStoreCredentialsOnRekey -+Controls whether the user's GSSAPI credentials should be updated following a -+successful connection rekeying. This option can be used to accepted renewed -+or updated credentials from a compatible client. The default is -+.Dq no . - .It Cm HostbasedAuthentication - Specifies whether rhosts or /etc/hosts.equiv authentication together - with successful public key client host authentication is allowed - (host-based authentication). - This option is similar to - .Cm RhostsRSAAuthentication - and applies to protocol version 2 only. - The default is diff --git a/openssh-6.6p1-gssapimitm.patch b/openssh-6.6p1-gssapimitm.patch deleted file mode 100644 index 8684527..0000000 --- a/openssh-6.6p1-gssapimitm.patch +++ /dev/null @@ -1,428 +0,0 @@ -# The patch below adds support for the deprecated 'gssapi' authentication -# mechanism to OpenSSH 3.8p1. The newer 'gssapi-with-mic' mechanism is included -# in this release. The use of 'gssapi' is deprecated due to the presence of -# potential man-in-the-middle attacks, which 'gssapi-with-mic' is not -# susceptible to. -# -# To use the patch apply it to a OpenSSH 3.8p1 source tree. After compiling, -# backwards compatibility may be obtained by supplying the -# 'GssapiEnableMitmAttack yes' option to either the client or server. -# -# It should be noted that this patch is being made available purely as a means -# of easing the process of moving to OpenSSH 3.8p1. Any new installations are -# recommended to use the 'gssapi-with-mic' mechanism. Existing installations -# are encouraged to upgrade as soon as possible. - -diff --git a/openssh-6.6p1/auth2-gss.c b/openssh-6.6p1/auth2-gss.c ---- a/openssh-6.6p1/auth2-gss.c -+++ b/openssh-6.6p1/auth2-gss.c -@@ -168,16 +168,25 @@ input_gssapi_token(int type, u_int32_t p - dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL); - if (flags & GSS_C_INTEG_FLAG) - dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_MIC, - &input_gssapi_mic); - else - dispatch_set( - SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE, - &input_gssapi_exchange_complete); -+ -+ /* -+ * Old style 'gssapi' didn't have the GSSAPI_MIC -+ * and went straight to sending exchange_complete -+ */ -+ if (options.gss_enable_mitm) -+ dispatch_set( -+ SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE, -+ &input_gssapi_exchange_complete); - } - } - - gss_release_buffer(&min_status, &send_tok); - } - - static void - input_gssapi_errtok(int type, u_int32_t plen, void *ctxt) -@@ -286,9 +295,15 @@ input_gssapi_mic(int type, u_int32_t ple - } - - Authmethod method_gssapi = { - "gssapi-with-mic", - userauth_gssapi, - &options.gss_authentication - }; - -+Authmethod method_gssapi_old = { -+ "gssapi", -+ userauth_gssapi, -+ &options.gss_enable_mitm -+}; -+ - #endif /* GSSAPI */ -diff --git a/openssh-6.6p1/auth2.c b/openssh-6.6p1/auth2.c ---- a/openssh-6.6p1/auth2.c -+++ b/openssh-6.6p1/auth2.c -@@ -65,23 +65,25 @@ extern Buffer loginmsg; - - extern Authmethod method_none; - extern Authmethod method_pubkey; - extern Authmethod method_passwd; - extern Authmethod method_kbdint; - extern Authmethod method_hostbased; - #ifdef GSSAPI - extern Authmethod method_gssapi; -+extern Authmethod method_gssapi_old; - #endif - - Authmethod *authmethods[] = { - &method_none, - &method_pubkey, - #ifdef GSSAPI - &method_gssapi, -+ &method_gssapi_old, - #endif - &method_passwd, - &method_kbdint, - &method_hostbased, - NULL - }; - - /* protocol */ -diff --git a/openssh-6.6p1/readconf.c b/openssh-6.6p1/readconf.c ---- a/openssh-6.6p1/readconf.c -+++ b/openssh-6.6p1/readconf.c -@@ -135,17 +135,17 @@ typedef enum { - oCompressionLevel, oTCPKeepAlive, oNumberOfPasswordPrompts, - oUsePrivilegedPort, oLogLevel, oCiphers, oProtocol, oMacs, - oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication, - oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias, - oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication, - oHostKeyAlgorithms, oBindAddress, oPKCS11Provider, - oClearAllForwardings, oNoHostAuthenticationForLocalhost, - oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, -- oAddressFamily, oGssAuthentication, oGssDelegateCreds, -+ oAddressFamily, oGssAuthentication, oGssDelegateCreds, oGssEnableMITM, - oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, - oSendEnv, oControlPath, oControlMaster, oControlPersist, - oHashKnownHosts, - oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, - oVisualHostKey, oUseRoaming, - oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass, - oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots, - oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs, -@@ -179,19 +179,21 @@ static struct { - { "skeyauthentication", oChallengeResponseAuthentication }, /* alias */ - { "tisauthentication", oChallengeResponseAuthentication }, /* alias */ - { "kerberosauthentication", oUnsupported }, - { "kerberostgtpassing", oUnsupported }, - { "afstokenpassing", oUnsupported }, - #if defined(GSSAPI) - { "gssapiauthentication", oGssAuthentication }, - { "gssapidelegatecredentials", oGssDelegateCreds }, -+ { "gssapienablemitmattack", oGssEnableMITM }, - #else - { "gssapiauthentication", oUnsupported }, - { "gssapidelegatecredentials", oUnsupported }, -+ { "gssapienablemitmattack", oUnsupported }, - #endif - { "fallbacktorsh", oDeprecated }, - { "usersh", oDeprecated }, - { "identityfile", oIdentityFile }, - { "identityfile2", oIdentityFile }, /* obsolete */ - { "identitiesonly", oIdentitiesOnly }, - { "hostname", oHostName }, - { "hostkeyalias", oHostKeyAlias }, -@@ -839,16 +841,20 @@ parse_time: - - case oGssAuthentication: - intptr = &options->gss_authentication; - goto parse_flag; - - case oGssDelegateCreds: - intptr = &options->gss_deleg_creds; - goto parse_flag; -+ -+ case oGssEnableMITM: -+ intptr = &options->gss_enable_mitm; -+ goto parse_flag; - - case oBatchMode: - intptr = &options->batch_mode; - goto parse_flag; - - case oCheckHostIP: - intptr = &options->check_host_ip; - goto parse_flag; -@@ -1493,16 +1499,17 @@ initialize_options(Options * options) - options->xauth_location = NULL; - options->gateway_ports = -1; - options->use_privileged_port = -1; - options->rsa_authentication = -1; - options->pubkey_authentication = -1; - options->challenge_response_authentication = -1; - options->gss_authentication = -1; - options->gss_deleg_creds = -1; -+ options->gss_enable_mitm = -1; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->kbd_interactive_devices = NULL; - options->rhosts_rsa_authentication = -1; - options->hostbased_authentication = -1; - options->batch_mode = -1; - options->check_host_ip = -1; - options->strict_host_key_checking = -1; -@@ -1613,16 +1620,18 @@ fill_default_options(Options * options) - if (options->pubkey_authentication == -1) - options->pubkey_authentication = 1; - if (options->challenge_response_authentication == -1) - options->challenge_response_authentication = 1; - if (options->gss_authentication == -1) - options->gss_authentication = 0; - if (options->gss_deleg_creds == -1) - options->gss_deleg_creds = 0; -+ if (options->gss_enable_mitm == -1) -+ options->gss_enable_mitm = 0; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) - options->kbd_interactive_authentication = 1; - if (options->rhosts_rsa_authentication == -1) - options->rhosts_rsa_authentication = 0; - if (options->hostbased_authentication == -1) - options->hostbased_authentication = 0; -diff --git a/openssh-6.6p1/readconf.h b/openssh-6.6p1/readconf.h ---- a/openssh-6.6p1/readconf.h -+++ b/openssh-6.6p1/readconf.h -@@ -50,16 +50,17 @@ typedef struct { - * authentication. */ - int rsa_authentication; /* Try RSA authentication. */ - int pubkey_authentication; /* Try ssh2 pubkey authentication. */ - int hostbased_authentication; /* ssh2's rhosts_rsa */ - int challenge_response_authentication; - /* Try S/Key or TIS, authentication. */ - int gss_authentication; /* Try GSS authentication */ - int gss_deleg_creds; /* Delegate GSS credentials */ -+ int gss_enable_mitm; /* Enable old style gssapi auth */ - int password_authentication; /* Try password - * authentication. */ - int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ - char *kbd_interactive_devices; /* Keyboard-interactive auth devices. */ - int batch_mode; /* Batch mode: do not ask for passwords. */ - int check_host_ip; /* Also keep track of keys for IP address */ - int strict_host_key_checking; /* Strict host key checking. */ - int compression; /* Compress packets in both directions. */ -diff --git a/openssh-6.6p1/servconf.c b/openssh-6.6p1/servconf.c ---- a/openssh-6.6p1/servconf.c -+++ b/openssh-6.6p1/servconf.c -@@ -104,16 +104,17 @@ initialize_server_options(ServerOptions - options->rsa_authentication = -1; - options->pubkey_authentication = -1; - options->kerberos_authentication = -1; - options->kerberos_or_local_passwd = -1; - options->kerberos_ticket_cleanup = -1; - options->kerberos_get_afs_token = -1; - options->gss_authentication=-1; - options->gss_cleanup_creds = -1; -+ options->gss_enable_mitm = -1; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->challenge_response_authentication = -1; - options->permit_empty_passwd = -1; - options->permit_user_env = -1; - options->use_login = -1; - options->compression = -1; - options->rekey_limit = -1; -@@ -241,16 +242,18 @@ fill_default_server_options(ServerOption - if (options->kerberos_ticket_cleanup == -1) - options->kerberos_ticket_cleanup = 1; - if (options->kerberos_get_afs_token == -1) - options->kerberos_get_afs_token = 0; - if (options->gss_authentication == -1) - options->gss_authentication = 0; - if (options->gss_cleanup_creds == -1) - options->gss_cleanup_creds = 1; -+ if (options->gss_enable_mitm == -1) -+ options->gss_enable_mitm = 0; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) - options->kbd_interactive_authentication = 0; - if (options->challenge_response_authentication == -1) - options->challenge_response_authentication = 1; - if (options->permit_empty_passwd == -1) - options->permit_empty_passwd = 0; -@@ -335,17 +338,17 @@ typedef enum { - sPermitUserEnvironment, sUseLogin, sAllowTcpForwarding, sCompression, - sRekeyLimit, sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups, - sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile, - sGatewayPorts, sPubkeyAuthentication, sXAuthLocation, sSubsystem, - sMaxStartups, sMaxAuthTries, sMaxSessions, - sBanner, sUseDNS, sHostbasedAuthentication, - sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, - sClientAliveCountMax, sAuthorizedKeysFile, -- sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, -+ sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, sGssEnableMITM, - sMatch, sPermitOpen, sForceCommand, sChrootDirectory, - sUsePrivilegeSeparation, sAllowAgentForwarding, - sHostCertificate, - sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile, - sKexAlgorithms, sIPQoS, sVersionAddendum, - sAuthorizedKeysCommand, sAuthorizedKeysCommandUser, - sAuthenticationMethods, sHostKeyAgent, - sDeprecated, sUnsupported -@@ -402,19 +405,21 @@ static struct { - { "kerberosticketcleanup", sUnsupported, SSHCFG_GLOBAL }, - { "kerberosgetafstoken", sUnsupported, SSHCFG_GLOBAL }, - #endif - { "kerberostgtpassing", sUnsupported, SSHCFG_GLOBAL }, - { "afstokenpassing", sUnsupported, SSHCFG_GLOBAL }, - #ifdef GSSAPI - { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL }, - { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL }, -+ { "gssapienablemitmattack", sGssEnableMITM }, - #else - { "gssapiauthentication", sUnsupported, SSHCFG_ALL }, - { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapienablemitmattack", sUnsupported }, - #endif - { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL }, - { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL }, - { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL }, - { "skeyauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL }, /* alias */ - { "checkmail", sDeprecated, SSHCFG_GLOBAL }, - { "listenaddress", sListenAddress, SSHCFG_GLOBAL }, - { "addressfamily", sAddressFamily, SSHCFG_GLOBAL }, -@@ -1085,16 +1090,20 @@ process_server_config_line(ServerOptions - case sGssAuthentication: - intptr = &options->gss_authentication; - goto parse_flag; - - case sGssCleanupCreds: - intptr = &options->gss_cleanup_creds; - goto parse_flag; - -+ case sGssEnableMITM: -+ intptr = &options->gss_enable_mitm; -+ goto parse_flag; -+ - case sPasswordAuthentication: - intptr = &options->password_authentication; - goto parse_flag; - - case sKbdInteractiveAuthentication: - intptr = &options->kbd_interactive_authentication; - goto parse_flag; - -diff --git a/openssh-6.6p1/servconf.h b/openssh-6.6p1/servconf.h ---- a/openssh-6.6p1/servconf.h -+++ b/openssh-6.6p1/servconf.h -@@ -108,16 +108,17 @@ typedef struct { - * such as SecurID or - * /etc/passwd */ - int kerberos_ticket_cleanup; /* If true, destroy ticket - * file on logout. */ - int kerberos_get_afs_token; /* If true, try to get AFS token if - * authenticated with Kerberos. */ - int gss_authentication; /* If true, permit GSSAPI authentication */ - int gss_cleanup_creds; /* If true, destroy cred cache on logout */ -+ int gss_enable_mitm; /* If true, enable old style GSSAPI */ - int password_authentication; /* If true, permit password - * authentication. */ - int kbd_interactive_authentication; /* If true, permit */ - int challenge_response_authentication; - int permit_empty_passwd; /* If false, do not permit empty - * passwords. */ - int permit_user_env; /* If true, read ~/.ssh/environment */ - int use_login; /* If true, login(1) is used */ -diff --git a/openssh-6.6p1/ssh_config b/openssh-6.6p1/ssh_config ---- a/openssh-6.6p1/ssh_config -+++ b/openssh-6.6p1/ssh_config -@@ -51,9 +51,16 @@ ForwardX11Trusted yes - # Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc - # MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 - # EscapeChar ~ - # Tunnel no - # TunnelDevice any:any - # PermitLocalCommand no - # VisualHostKey no - # ProxyCommand ssh -q -W %h:%p gateway.example.com -+ -+# Set this to 'yes' to enable support for the deprecated 'gssapi' authentication -+# mechanism to OpenSSH 3.8p1. The newer 'gssapi-with-mic' mechanism is included -+# in this release. The use of 'gssapi' is deprecated due to the presence of -+# potential man-in-the-middle attacks, which 'gssapi-with-mic' is not susceptible to. -+# GSSAPIEnableMITMAttack no -+ - # RekeyLimit 1G 1h -diff --git a/openssh-6.6p1/sshconnect2.c b/openssh-6.6p1/sshconnect2.c ---- a/openssh-6.6p1/sshconnect2.c -+++ b/openssh-6.6p1/sshconnect2.c -@@ -318,16 +318,21 @@ static char *authmethods_get(void); - - Authmethod authmethods[] = { - #ifdef GSSAPI - {"gssapi-with-mic", - userauth_gssapi, - NULL, - &options.gss_authentication, - NULL}, -+ {"gssapi", -+ userauth_gssapi, -+ NULL, -+ &options.gss_enable_mitm, -+ NULL}, - #endif - {"hostbased", - userauth_hostbased, - NULL, - &options.hostbased_authentication, - NULL}, - {"publickey", - userauth_pubkey, -@@ -685,17 +690,19 @@ process_gssapi_token(void *ctxt, gss_buf - - packet_put_string(send_tok.value, send_tok.length); - packet_send(); - gss_release_buffer(&ms, &send_tok); - } - - if (status == GSS_S_COMPLETE) { - /* send either complete or MIC, depending on mechanism */ -- if (!(flags & GSS_C_INTEG_FLAG)) { -+ -+ if (strcmp(authctxt->method->name,"gssapi") == 0 || -+ (!(flags & GSS_C_INTEG_FLAG))) { - packet_start(SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE); - packet_send(); - } else { - ssh_gssapi_buildmic(&b, authctxt->server_user, - authctxt->service, "gssapi-with-mic"); - - gssbuf.value = buffer_ptr(&b); - gssbuf.length = buffer_len(&b); -diff --git a/openssh-6.6p1/sshd_config b/openssh-6.6p1/sshd_config ---- a/openssh-6.6p1/sshd_config -+++ b/openssh-6.6p1/sshd_config -@@ -80,16 +80,23 @@ PasswordAuthentication no - #KerberosOrLocalPasswd yes - #KerberosTicketCleanup yes - #KerberosGetAFSToken no - - # GSSAPI options - #GSSAPIAuthentication no - #GSSAPICleanupCredentials yes - -+# Set this to 'yes' to enable support for the deprecated 'gssapi' authentication -+# mechanism to OpenSSH 3.8p1. The newer 'gssapi-with-mic' mechanism is included -+# in this release. The use of 'gssapi' is deprecated due to the presence of -+# potential man-in-the-middle attacks, which 'gssapi-with-mic' is not susceptible to. -+#GSSAPIEnableMITMAttack no -+ -+ - # Set this to 'yes' to enable PAM authentication, account processing, - # and session processing. If this is enabled, PAM authentication will - # be allowed through the ChallengeResponseAuthentication and - # PasswordAuthentication. Depending on your PAM configuration, - # PAM authentication via ChallengeResponseAuthentication may bypass - # the setting of "PermitRootLogin without-password". - # If you just want the PAM account and session checks to run without - # PAM authentication, then enable this but set PasswordAuthentication diff --git a/openssh-6.6p1-host_ident.patch b/openssh-6.6p1-host_ident.patch deleted file mode 100644 index 3e07caf..0000000 --- a/openssh-6.6p1-host_ident.patch +++ /dev/null @@ -1,28 +0,0 @@ -# identify hashed hosts in known_hosts and suggest command line for their -# removal - -diff --git a/openssh-6.6p1/sshconnect.c b/openssh-6.6p1/sshconnect.c ---- a/openssh-6.6p1/sshconnect.c -+++ b/openssh-6.6p1/sshconnect.c -@@ -1070,16 +1070,21 @@ check_host_key(char *hostname, struct so - ip_found->file, ip_found->line); - } - /* The host key has changed. */ - warn_changed_key(host_key); - error("Add correct host key in %.100s to get rid of this message.", - user_hostfiles[0]); - error("Offending %s key in %s:%lu", key_type(host_found->key), - host_found->file, host_found->line); -+ error("You can use following command to remove all keys for this IP:"); -+ if (host_found->file) -+ error("ssh-keygen -R %s -f %s", hostname, host_found->file); -+ else -+ error("ssh-keygen -R %s", hostname); - - /* - * If strict host key checking is in use, the user will have - * to edit the key manually and we can only abort. - */ - if (options.strict_host_key_checking) { - error("%s host key for %.200s has changed and you have " - "requested strict checking.", type, host); diff --git a/openssh-6.6p1-key-converter.patch b/openssh-6.6p1-key-converter.patch deleted file mode 100644 index c628ad6..0000000 --- a/openssh-6.6p1-key-converter.patch +++ /dev/null @@ -1,534 +0,0 @@ -# SSHv1 to SSHv2 RSA keys converter - -diff --git a/openssh-6.6p1/converter/Makefile b/openssh-6.6p1/converter/Makefile -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/converter/Makefile -@@ -0,0 +1,17 @@ -+ -+bindir=/usr/bin -+mandir=/usr/share/man -+ -+all : ssh-keyconverter -+ -+ssh-keyconverter.o: ssh-keyconverter.c ../key.h ../authfile.h ../misc.h ../xmalloc.h -+ gcc $(RPM_OPT_FLAGS) -c -I../ $< -o $@ -+ -+ssh-keyconverter: ssh-keyconverter.o ../libssh.a ../openbsd-compat/libopenbsd-compat.a -+ gcc $< -Wl,--no-as-needed $(RPM_OPT_FLAGS) -L../ -L../openbsd-compat/ -lcrypto -lssh -lopenbsd-compat -lssh -lopenbsd-compat -lpam -ldl -lwrap -lutil -lz -lnsl -lcrypt -lssl -o $@ -+ -+install: ssh-keyconverter ssh-keyconverter.1 -+ if [ ! -d $(DESTDIR)$(bindir) ]; then install -d -m 755 $(DESTDIR)$(bindir); fi -+ install -m 755 ssh-keyconverter $(DESTDIR)$(bindir) -+ if [ ! -d $(DESTDIR)$(mandir)/man1 ]; then install -d -m 755 $(DESTDIR)$(mandir)/man1; fi -+ install -m 644 ssh-keyconverter.1 $(DESTDIR)$(mandir)/man1 -diff --git a/openssh-6.6p1/converter/ssh-keyconverter.1 b/openssh-6.6p1/converter/ssh-keyconverter.1 -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/converter/ssh-keyconverter.1 -@@ -0,0 +1,155 @@ -+.\" Manpage for ssh-keyconverter -+.\" -+.Dd February 2, 2002 -+.Dt SSH-KEYCONVER 1 -+.Os -+.Sh NAME -+.Nm ssh-keyconvert -+.Nd convert ssh v1 keys and authorization files -+.Sh SYNOPSIS -+.Nm ssh-keyconvert -+.Op Fl k -+.Op Fl o Ar output_file -+.Ar identity_file ... -+.Nm ssh-keyconvert -+.Op Fl a -+.Op Fl o Ar output_file -+.Ar authorization_file ... -+.Sh DESCRIPTION -+.Nm -+converts RSA public and private keys used for public key based -+user authentication with protocol version 1 to the format -+used with protocol version 2. -+.Pp -+When using RSA user authentication with SSH protocol version 1, -+the client uses the private key from -+.Pa $HOME/.ssh/identity -+to provide its identity to the server. The server grants or denies -+access based on whether the public part of this key is listed in -+.Pa $HOME/.ssh/authorized_keys . -+.Pp -+SSH protocol version 2 supports both DSA and RSA keys, but the -+way RSA keys are stored are differently. On the client, the default -+file name is -+.Pa .ssh/id_rsa -+rather than -+.Pa .ssh/identity , -+and the file's format is different as well. On the server, the -+public porting of the key can still be stored in -+.Pa .ssh/authorized_keys , -+but the key notation has changed as well. -+Therefore, when switching from protocol version 1 -+to version 2, you either have to create a new identity key using -+.Xr ssh-keygen 1 -+and add that key to the server's -+.Pa authorized_keys -+file, or you need to convert your keys using -+.Nm ssh-keyconvert . -+.Pp -+By default, -+.Nm -+will try to guess the type of file that is to be converted. -+If it fails to guess correctly, you can tell if what type of -+conversion to perform by specifying the -+.Fl k -+option to convert the private key, or the -+.Fl a -+option to convert an authorisation file. -+.Pp -+When converting your private keys stored in -+.Pa .ssh/identity , -+.Nm -+will read the private key, prompting you for the pass phrase -+if the key is protected by a pass phrase. If the -+.Fl o -+option is given, it will write the private key to the specified -+file, using version 2 syntax. If the key was protected by a -+pass phrase, it will use the same pass phrase to protect the new -+file. -+It will also write the public portion of the key to a second file, -+using the specified file name with -+.Dq .pub -+appended. -+If the -+.Fl o -+option was not given, private and public key will be written to -+.Pa id_rsa -+and -+.Pa id_rsa.pub , -+respectively, relative to the directory of the input key file. -+.Pp -+If the destination file already exists, -+.Nm -+will prompt the user for confirmation before overwriting the -+file, unless the -+.Fl f -+option is given. -+.Pp -+When converting your -+.Pa authorized_keys -+file, -+.Nm -+will ignore any keys in SSH version 2 format. Any public keys -+in version 1 format will be converted and appended to the output file -+using the new syntax. If the -+.Fl o -+option is given, keys are appended to the specified file. If it -+is not given, -+.Nm -+will append all keys to the input file. -+.Pp -+Note that -+.Nm -+does not check for duplicate keys, so if you run it on -+.Pa .ssh/authorized_keys -+more several times, the converted keys will show up several times. -+.Sh OPTIONS -+.Bl -tag -width Ds -+.It Fl k -+Convert private key file(s). The default is to guess the -+type of file that should be converted. -+.It Fl a -+Convert -+.Pa authorized_keys -+file(s). The default is to guess the -+type of file that should be converted. -+.It Fl o Ar outfile -+Specify the name of the output file. -+When converting an authorization file, all public keys will -+be appended to this file. -+For private key conversion, the private and public components of -+the key will be stored in -+.Pa outfile -+and -+.Pa outfile.pub , -+respectively. -+Note that since every key must be stored in a separate file, you -+cannot use this option when you specify several input files. -+.It Fl f -+When converting a key file, and the output file already exists, -+.Nm -+will ask the user whether to overwrite the file. Using this option -+forces overwriting. -+.El -+.Sh AUTHORS -+OpenSSH is a derivative of the original and free -+ssh 1.2.12 release by Tatu Ylonen. -+Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, -+Theo de Raadt and Dug Song -+removed many bugs, re-added newer features and -+created OpenSSH. -+.Nm -+was contributed by Olaf Kirch. -+.Sh SEE ALSO -+.Xr ssh 1 , -+.Xr ssh-add 1 , -+.Xr ssh-agent 1 , -+.Xr sshd 8 -+.Rs -+.%A J. Galbraith -+.%A R. Thayer -+.%T "SECSH Public Key File Format" -+.%N draft-ietf-secsh-publickeyfile-01.txt -+.%D March 2001 -+.%O work in progress material -+.Re -diff --git a/openssh-6.6p1/converter/ssh-keyconverter.c b/openssh-6.6p1/converter/ssh-keyconverter.c -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/converter/ssh-keyconverter.c -@@ -0,0 +1,345 @@ -+/* -+ * SSH v1 to v2 RSA key converter. -+ * -+ * Instead of a manpage: -+ * -+ * ssh-keyconverter ~/.ssh/identity -+ * will put the old RSA key in ~/.ssh/id_rsa and id_rsa.pub -+ * If a "-o foofah" is given, the keys will be written to -+ * foofah and foofah.pub, respectively. -+ * -+ * ssh-keyconverter ~/.ssh/authorized_keys -+ * will convert all old RSA keys and add them to the -+ * input file. The -o foofah option will direct -+ * output to a different file. -+ * (Note that it's harmless to specify the same file -+ * as input and output, as ssh-keyconverter will ignore -+ * any v2 keys, and output is always appended, never -+ * replacing the original file). -+ * -+ * To compile: -+ * -+ * gcc -g -Wall -o ssh-keyconverter converter.c \ -+ * -L. -Lopenbsd-compat/ -lssh -lopenbsd-compat -lssh \ -+ * -lpam -ldl -lwrap -lutil -lz -lnsl \ -+ * -Wl,-Bstatic -lcrypto -Wl,-dy -+ * -+ * Enjoy. --okir -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include "key.h" -+#include "authfile.h" -+#include "misc.h" -+#include "xmalloc.h" -+ -+#define TYPE_KEY 0 -+#define TYPE_AUTHKEYS 1 -+ -+#define PASSPHRASE_ATTEMPTS 3 -+ -+static int opt_verbose = 0; -+static int opt_force = 0; -+ -+static void convert(int, const char *, const char *); -+static void convert_private_key(const char *, const char *); -+static void convert_authorized_keys(const char *, const char *); -+static int fileok(const char *, char *, size_t); -+static int guess_type(const char *); -+ -+int -+main(int argc, char **argv) -+{ -+ int opt_type = -1; -+ char *opt_outfile = NULL; -+ int c; -+ -+ while ((c = getopt(argc, argv, "afko:")) != -1) { -+ switch (c) { -+ case 'a': -+ opt_type = TYPE_AUTHKEYS; -+ break; -+ case 'f': -+ opt_force = 1; -+ break; -+ case 'k': -+ opt_type = TYPE_KEY; -+ break; -+ case 'o': -+ opt_outfile = optarg; -+ break; -+ case 'v': -+ opt_verbose++; -+ break; -+ default: -+ fprintf(stderr, -+ "usage: ssh-keyconvert [-a | -k] " -+ "[-o filename] [-v] ...\n"); -+ exit(1); -+ } -+ } -+ -+ /* Warning, nanny code follows */ -+#if 0 -+ if (opt_outfile && (argc - optind) > 1 && opt_type != TYPE_AUTHKEY) { -+ fprintf(stderr, -+ "Output file ambiguous: more than two " -+ "input files given. Abort.\n"); -+ exit(1); -+ } -+#endif -+ -+ if (optind == argc) { -+ fprintf(stderr, -+ "Missing input file(s).\n"); -+ exit(1); -+ } -+ -+ for (; optind < argc; optind++) { -+ char *name = argv[optind]; -+ int type; -+ -+ if ((type = opt_type) < 0) -+ type = guess_type(name); -+ convert(type, name, opt_outfile); -+ } -+ -+ return 0; -+} -+ -+static void -+convert(int type, const char *iname, const char *oname) -+{ -+ if (type == TYPE_KEY) { -+ convert_private_key(iname, oname); -+ } else if (type == TYPE_AUTHKEYS) { -+ convert_authorized_keys(iname, oname); -+ } else { -+ fprintf(stderr, -+ "Conversion type not yet implemented.\n"); -+ exit(1); -+ } -+} -+ -+static void -+convert_private_key(const char *iname, const char *oname) -+{ -+ char prompt[1024], privname[PATH_MAX], pubname[PATH_MAX]; -+ char *comment = NULL, *passphrase; -+ Key *key = NULL, *pk = NULL; -+ int i; -+ FILE *pf = NULL; -+ -+ passphrase = xstrdup(""); -+ snprintf(prompt, sizeof(prompt), -+ "Enter passphrase for key '%.100s': ",iname); -+ for (i = 0; !key && i < PASSPHRASE_ATTEMPTS; i++) { -+ if (i) { -+ /* Zap old pass phrase */ -+ memset(passphrase, 0, strlen(passphrase)); -+ free(passphrase); -+ -+ /* Get a pass phrase from the user */ -+ passphrase = read_passphrase(prompt, 0); -+ } -+ key = key_load_private(iname, passphrase, &comment); -+ if (!key && i) -+ printf("Bad passphrase, please try again.\n"); -+ } -+ -+ if (oname != NULL) { -+ strcpy(privname, oname); -+ } else { -+ const char *s; -+ -+ if ((s = strrchr(iname, '/')) != NULL) { -+ int n = s + 1 - iname; -+ -+ strncpy(privname, iname, n); -+ privname[n++] = '\0'; -+ } -+ strcat(privname, "id_rsa"); -+ } -+ -+ if (!fileok("private", privname, sizeof(privname))) -+ goto out; -+ -+ sprintf(pubname, "%s.pub", privname); -+ if (!fileok("public", pubname, sizeof(pubname))) -+ goto out; -+ -+ /* "convert" from RSA1 to RSA */ -+ key->type = KEY_RSA; -+ pk = key_from_private(key); -+ -+ /* Now write the key in earnest */ -+ if (!key_save_private(key, privname, passphrase, comment)) { -+ fprintf(stderr, -+ "Failed to save private key to %s: %m.\n", privname); -+ goto out; -+ } -+ -+ if (!(pf = fopen(pubname, "w"))) { -+ fprintf(stderr, -+ "Failed to save public key to %s: %m.\n", pubname); -+ goto out; -+ } -+ if (!key_write(pk, pf)) { -+ fprintf(stderr, -+ "Failed to save public key to %s: %m.\n", pubname); -+ goto out; -+ } -+ if (comment) -+ fprintf(pf, " %s\n", comment); -+ -+out: -+ memset(passphrase, 0, strlen(passphrase)); -+ free(passphrase); -+ if (key) -+ key_free(key); -+ if (pk) -+ key_free(pk); -+ if (pf) -+ fclose(pf); -+} -+ -+static void -+convert_authorized_keys(const char *iname, const char *oname) -+{ -+ char line[1024]; -+ FILE *ifp, *ofp; -+ Key *key; -+ -+ if (!(ifp = fopen(iname, "r"))) { -+ perror(iname); -+ exit(1); -+ } -+ -+ if (oname == NULL) -+ oname = iname; -+ -+ if (!strcmp(oname, "-")) { -+ ofp = stdout; -+ } else { -+ if ((ofp = fopen(oname, "a")) == NULL) { -+ perror(oname); -+ exit(1); -+ } -+ } -+ setlinebuf(ofp); -+ -+#define whitespace(c) ((c) == ' ' || (c) == '\t') -+ while (fgets(line, sizeof(line), ifp) != NULL) { -+ char *cp = line, *options = NULL; -+ -+ while (whitespace(*cp)) -+ cp++; -+ if (!*cp || *cp == '\n' || *cp == '#') -+ continue; -+ -+ key = key_new(KEY_RSA1); -+ if (key_read(key, &cp) != 1) { -+ /* Skip options, if any */ -+ int quoted = 0; -+ -+ options = cp; -+ for (; *cp && (quoted || !whitespace(*cp)); cp++) { -+ if (cp[0] == '\\' && cp[1] == '"') -+ ++cp; -+ else if (*cp == '"') -+ quoted = !quoted; -+ } -+ if (quoted) -+ goto next; -+ *cp++ = '\0'; -+ while (whitespace(*cp)) -+ cp++; -+ if (key_read(key, &cp) != 1) -+ goto next; -+ } -+ -+ if (options) -+ fprintf(ofp, "%s ", options); -+ /* "convert" from RSA1 to RSA */ -+ key->type = KEY_RSA; -+ key_write(key, ofp); -+ fputs(cp, ofp); -+ key_free(key); -+ -+ next: -+ ; -+ } -+} -+ -+/* if file exists, ask user whether to overwrite it */ -+static int -+fileok(const char *what, char *filename, size_t size) -+{ -+ char buffer[PATH_MAX]; -+ int n; -+ -+checkagain: -+ if (access(filename, F_OK) < 0) -+ return 1; -+ printf("%s key file %s already exists.\n", what, filename); -+ if (opt_force) { -+ printf("Overwriting because of -f option...\n"); -+ return 1; -+ } -+ -+tryagain: -+ printf("Please enter a different filename, " -+ "or return to overwrite: "); -+ fflush(stdout); -+ -+ n = read(0, buffer, sizeof(buffer)-1); -+ if (n <= 0) -+ printf("\n"); -+ if (n < 0) { -+ perror("read failed"); -+ exit(1); -+ } -+ if (n == 0) { -+ fprintf(stderr, "EOF from standard input. Bye.\n"); -+ exit(1); -+ } -+ buffer[n] = '\0'; -+ while (n && buffer[n-1] == '\n') -+ buffer[--n] = '\0'; -+ if (n == 0) -+ return 1; -+ if (n >= size) { -+ fprintf(stderr, "Filename too long.\n"); -+ goto tryagain; -+ } -+ strcpy(filename, buffer); -+ goto checkagain; -+} -+ -+/* -+ * Guess the type of file to be converted. -+ * XXX: should look at the file; v1 key files -+ * start with "SSH PRIVATE KEY FILE" -+ */ -+static int -+guess_type(const char *name) -+{ -+ printf("%s... ", name); -+ if (strstr(name, "identity")) { -+ printf("looks like a key file\n"); -+ return TYPE_KEY; -+ } -+ if (strstr(name, "authorized_keys")) { -+ printf("looks like an authorized_keys file\n"); -+ return TYPE_AUTHKEYS; -+ } -+ -+ if (opt_verbose) -+ printf("unable to identify."); -+ fprintf(stderr, "Please specify the file type for %s. Abort.\n", name); -+ exit(1); -+} diff --git a/openssh-6.6p1-ldap.patch b/openssh-6.6p1-ldap.patch deleted file mode 100644 index 6d6d6c7..0000000 --- a/openssh-6.6p1-ldap.patch +++ /dev/null @@ -1,2805 +0,0 @@ -# Helper app for retrieving keys from a LDAP server -# by Jan F. Chadima -# -# patch for openbsd-compat/base64.* introduces preprocessor macro -# USE_INTERNAL_B64 intended to enforce using ssh supplied functions. -# (The additional -lldap/-llber introduced in the patch cause configure to -# discover the base64 functions in glibc (libresolv) and not to build the -# internal versions. ssh-keyconverter consequently fails to link as it lacks -# the proper flags, and libopenbsd-compat doesn't contain the b64_* functions) - -diff --git a/openssh-6.6p1/HOWTO.ldap-keys b/openssh-6.6p1/HOWTO.ldap-keys -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/HOWTO.ldap-keys -@@ -0,0 +1,108 @@ -+ -+HOW TO START -+ -+1) configure LDAP server -+ * Use LDAP server documentation -+2) add appropriate LDAP schema -+ * For OpenLDAP or SunONE Use attached schema, otherwise you have to create -+ it. -+ * LDAP user entry -+ User entry: -+ - attached to the 'ldapPublicKey' objectclass -+ - attached to the 'posixAccount' objectclass -+ - with a filled 'sshPublicKey' attribute -+3) insert users into LDAP -+ * Use LDAP Tree management tool as useful -+ * Entry in the LDAP server must respect 'posixAccount' and 'ldapPublicKey' -+ which are defined in core.schema and the additionnal lpk.schema. -+ * Example: -+ dn: uid=captain,ou=commanders,dc=enterprise,dc=universe -+ objectclass: top -+ objectclass: person -+ objectclass: organizationalPerson -+ objectclass: posixAccount -+ objectclass: ldapPublicKey -+ description: Jonathan Archer -+ userPassword: Porthos -+ cn: onathan Archer -+ sn: onathan Archer -+ uid: captain -+ uidNumber: 1001 -+ gidNumber: 1001 -+ homeDirectory: /home/captain -+ sshPublicKey: ssh-rss AAAAB3.... =captain@universe -+ sshPublicKey: command="kill -9 1" ssh-rss AAAAM5... -+4) on the ssh side set in sshd_config -+ * Set up the backend -+ AuthorizedKeysCommand "@LIBEXECDIR@/ssh-ldap-wrapper" -+ AuthorizedKeysCommandRunAs -+ * Do not forget to set -+ PubkeyAuthentication yes -+ * Swith off unnecessary auth methods -+5) confugure ldap.conf -+ * Default ldap.conf is placed in /etc/ssh -+ * The configuration style is the same as other ldap based aplications -+6) if necessary edit ssh-ldap-wrapper -+ * There is a possibility to change ldap.conf location -+ * There are some debug options -+ * Example -+ @LIBEXECDIR@/ssh-ldap-wrapper -s -f /etc/ldap.conf -w -d >> /tmp/ldapdebuglog.txt -+ -+HOW TO MIGRATE FROM LPK -+ -+1) goto HOW TO START 4) .... the ldap schema is the same -+ -+2) convert the group requests to the appropriate LDAP requests -+ -+HOW TO SOLVE PROBLEMS -+ -+1) use debug in sshd -+ * /usr/sbin/sshd -d -d -d -d -+2) use debug in ssh-ldap-helper -+ * ssh-ldap-helper -d -d -d -d -s -+3) use tcpdump ... other ldap client etc. -+ -+ADVANTAGES -+ -+1) Blocking an user account can be done directly from LDAP (if sshd is using -+ PubkeyAuthentication + AuthorizedKeysCommand with ldap only). -+ -+DISADVANTAGES -+ -+1) LDAP must be well configured, getting the public key of some user is not -+ a problem, but if anonymous LDAP allows write to users dn, somebody could -+ replace some user's public key by his own and impersonate some of your users -+ in all your server farm -- be VERY CAREFUL. -+2) With incomplete PKI the MITM attack when sshd is requesting the public key, -+ could lead to a compromise of your servers allowing login as the -+ impersonated user. -+3) If LDAP server is down there may be no fallback on passwd auth. -+ -+MISC. -+ -+1) todo -+ * Possibility to reuse the ssh-ldap-helper. -+ * Tune the LDAP part to accept all possible LDAP configurations. -+ -+2) differences from original lpk -+ * No LDAP code in sshd. -+ * Support for various LDAP platforms and configurations. -+ * LDAP is configured in separate ldap.conf file. -+ -+3) docs/link -+ * http://pacsec.jp/core05/psj05-barisani-en.pdf -+ * http://fritz.potsdam.edu/projects/openssh-lpk/ -+ * http://fritz.potsdam.edu/projects/sshgate/ -+ * http://dev.inversepath.com/trac/openssh-lpk -+ * http://lam.sf.net/ -+ ( http://lam.sourceforge.net/documentation/supportedSchemas.htm ) -+ -+4) contributors/ideas/greets -+ - Eric AUGE -+ - Andrea Barisani -+ - Falk Siemonsmeier. -+ - Jacob Rief. -+ - Michael Durchgraf. -+ - frederic peters. -+ - Finlay dobbie. -+ - Stefan Fisher. -diff --git a/openssh-6.6p1/Makefile.in b/openssh-6.6p1/Makefile.in ---- a/openssh-6.6p1/Makefile.in -+++ b/openssh-6.6p1/Makefile.in -@@ -20,16 +20,18 @@ srcdir=@srcdir@ - top_srcdir=@top_srcdir@ - - DESTDIR= - VPATH=@srcdir@ - SSH_PROGRAM=@bindir@/ssh - ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass - SFTP_SERVER=$(libexecdir)/sftp-server - SSH_KEYSIGN=$(libexecdir)/ssh-keysign -+SSH_LDAP_HELPER=$(libexecdir)/ssh-ldap-helper -+SSH_LDAP_WRAPPER=$(libexecdir)/ssh-ldap-wrapper - SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper - PRIVSEP_PATH=@PRIVSEP_PATH@ - SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@ - STRIP_OPT=@STRIP_OPT@ - - PATHS= -DSSHDIR=\"$(sysconfdir)\" \ - -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \ - -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" \ -@@ -56,17 +58,19 @@ INSTALL=@INSTALL@ - PERL=@PERL@ - SED=@SED@ - ENT=@ENT@ - XAUTH_PATH=@XAUTH_PATH@ - LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ - EXEEXT=@EXEEXT@ - MANFMT=@MANFMT@ - --TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT) -+INSTALL_SSH_LDAP_HELPER=@INSTALL_SSH_LDAP_HELPER@ -+ -+TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT) ssh-ldap-helper$(EXEEXT) - - LIBSSH_OBJS=authfd.o authfile.o bufaux.o bufbn.o buffer.o \ - canohost.o channels.o cipher.o cipher-aes.o \ - cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \ - compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \ - log.o match.o md-sha256.o moduli.o nchan.o packet.o \ - readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \ - atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ -@@ -96,18 +100,18 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passw - kexc25519s.o auth-krb5.o \ - auth2-gss.o gss-serv.o gss-serv-krb5.o \ - loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ - sftp-server.o sftp-common.o \ - roaming_common.o roaming_serv.o \ - sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \ - sandbox-seccomp-filter.o sandbox-capsicum.o - --MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out --MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5 -+MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out ssh-ldap-helper.8.out ssh-ldap.conf.5.out -+MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5 ssh-ldap-helper.8 ssh-ldap.conf.5 - MANTYPE = @MANTYPE@ - - CONFIGFILES=sshd_config.out ssh_config.out moduli.out - CONFIGFILES_IN=sshd_config ssh_config moduli - - PATHSUBS = \ - -e 's|/etc/ssh/ssh_config|$(sysconfdir)/ssh_config|g' \ - -e 's|/etc/ssh/ssh_known_hosts|$(sysconfdir)/ssh_known_hosts|g' \ -@@ -171,16 +175,19 @@ ssh-keysign$(EXEEXT): $(LIBCOMPAT) libss - $(LD) -o $@ ssh-keysign.o readconf.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) - - ssh-pkcs11-helper$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-pkcs11-helper.o ssh-pkcs11.o - $(LD) -o $@ ssh-pkcs11-helper.o ssh-pkcs11.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) - - ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o roaming_dummy.o - $(LD) -o $@ ssh-keyscan.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) - -+ssh-ldap-helper$(EXEEXT): $(LIBCOMPAT) libssh.a ldapconf.o ldapbody.o ldapmisc.o ldap-helper.o -+ $(LD) -o $@ ldapconf.o ldapbody.o ldapmisc.o ldap-helper.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -+ - sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o sftp-server-main.o - $(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) - - sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-common.o sftp-glob.o progressmeter.o - $(LD) -o $@ progressmeter.o sftp.o sftp-client.o sftp-common.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBEDIT) - - # test driver for the loginrec code - not built by default - logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o -@@ -273,30 +280,38 @@ install-files: - $(INSTALL) -m 0755 $(STRIP_OPT) ssh-agent$(EXEEXT) $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT) - $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keygen$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT) - $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keyscan$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) - $(INSTALL) -m 0755 $(STRIP_OPT) sshd$(EXEEXT) $(DESTDIR)$(sbindir)/sshd$(EXEEXT) - $(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign$(EXEEXT) $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT) - $(INSTALL) -m 0755 $(STRIP_OPT) ssh-pkcs11-helper$(EXEEXT) $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT) - $(INSTALL) -m 0755 $(STRIP_OPT) sftp$(EXEEXT) $(DESTDIR)$(bindir)/sftp$(EXEEXT) - $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server$(EXEEXT) $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) -+ if test ! -z "$(INSTALL_SSH_LDAP_HELPER)" ; then \ -+ $(INSTALL) -m 0755 $(STRIP_OPT) ssh-ldap-helper $(DESTDIR)$(SSH_LDAP_HELPER) ; \ -+ $(INSTALL) -m 0755 ssh-ldap-wrapper $(DESTDIR)$(SSH_LDAP_WRAPPER) ; \ -+ fi - $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 - $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 - $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 - $(INSTALL) -m 644 ssh-agent.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1 - $(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1 - $(INSTALL) -m 644 ssh-keyscan.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1 - $(INSTALL) -m 644 moduli.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/moduli.5 - $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5 - $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5 - $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 - $(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 - $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 - $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 - $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 -+ if test ! -z "$(INSTALL_SSH_LDAP_HELPER)" ; then \ -+ $(INSTALL) -m 644 ssh-ldap-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-ldap-helper.8 ; \ -+ $(INSTALL) -m 644 ssh-ldap.conf.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh-ldap.conf.5 ; \ -+ fi - -rm -f $(DESTDIR)$(bindir)/slogin - ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 - ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 - - install-sysconf: - if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ - $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ -@@ -316,16 +331,23 @@ install-sysconf: - echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \ - mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \ - else \ - $(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \ - fi ; \ - else \ - echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \ - fi -+ if test ! -z "$(INSTALL_SSH_LDAP_HELPER)" ; then \ -+ if [ ! -f $(DESTDIR)$(sysconfdir)/ldap.conf ]; then \ -+ $(INSTALL) -m 644 ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf; \ -+ else \ -+ echo "$(DESTDIR)$(sysconfdir)/ldap.conf already exists, install will not overwrite"; \ -+ fi ; \ -+ fi - - host-key: ssh-keygen$(EXEEXT) - @if [ -z "$(DESTDIR)" ] ; then \ - if [ -f "$(sysconfdir)/ssh_host_key" ] ; then \ - echo "$(sysconfdir)/ssh_host_key already exists, skipping." ; \ - else \ - ./ssh-keygen -t rsa1 -f $(sysconfdir)/ssh_host_key -N "" ; \ - fi ; \ -@@ -379,27 +401,30 @@ uninstall: - -rm -f $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT) - -rm -f $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT) - -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) - -rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT) - -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT) - -rm -r $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) - -rm -f $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT) - -rm -f $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT) -+ -rm -f $(DESTDIR)$(SSH_LDAP_HELPER)$(EXEEXT) -+ -rm -f $(DESTDIR)$(SSH_LDAP_WRAPPER)$(EXEEXT) - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1 - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1 - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1 - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 -+ -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-ldap-helper.8 - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 - - regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c - [ -d `pwd`/regress ] || mkdir -p `pwd`/regress - [ -f `pwd`/regress/Makefile ] || \ - ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile - $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \ - $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) -diff --git a/openssh-6.6p1/configure.ac b/openssh-6.6p1/configure.ac ---- a/openssh-6.6p1/configure.ac -+++ b/openssh-6.6p1/configure.ac -@@ -1599,16 +1599,116 @@ AC_ARG_WITH([audit], - AC_MSG_RESULT([no]) - ;; - *) - AC_MSG_ERROR([Unknown audit module $withval]) - ;; - esac ] - ) - -+# Check whether user wants LDAP support -+LDAP_MSG="no" -+INSTALL_SSH_LDAP_HELPER="" -+AC_ARG_WITH(ldap, -+ [ --with-ldap[[=PATH]] Enable LDAP pubkey support (optionally in PATH)], -+ [ -+ if test "x$withval" != "xno" ; then -+ -+ INSTALL_SSH_LDAP_HELPER="yes" -+ CPPFLAGS="$CPPFLAGS -DLDAP_DEPRECATED" -+ -+ if test "x$withval" != "xyes" ; then -+ CPPFLAGS="$CPPFLAGS -I${withval}/include" -+ LDFLAGS="$LDFLAGS -L${withval}/lib" -+ fi -+ -+ AC_DEFINE([WITH_LDAP_PUBKEY], 1, [Enable LDAP pubkey support]) -+ LDAP_MSG="yes" -+ -+ AC_CHECK_HEADERS(lber.h) -+ AC_CHECK_HEADERS(ldap.h, , AC_MSG_ERROR(could not locate )) -+ AC_CHECK_HEADERS(ldap_ssl.h) -+ -+ AC_ARG_WITH(ldap-lib, -+ [ --with-ldap-lib=type select ldap library [auto|netscape5|netscape4|netscape3|umich|openldap]]) -+ -+ if test -z "$with_ldap_lib"; then -+ with_ldap_lib=auto -+ fi -+ -+ if test -z "$found_ldap_lib" -a \( $with_ldap_lib = auto -o $with_ldap_lib = umich -o $with_ldap_lib = openldap \); then -+ AC_CHECK_LIB(lber, main, LIBS="-llber $LIBS" found_ldap_lib=yes) -+ AC_CHECK_LIB(ldap, main, LIBS="-lldap $LIBS" found_ldap_lib=yes) -+ fi -+ -+ if test -z "$found_ldap_lib" -a \( $with_ldap_lib = auto -o $with_ldap_lib = netscape5 \); then -+ AC_CHECK_LIB(ldap50, main, LIBS="-lldap50 -lssldap50 -lssl3 -lnss3 -lnspr4 -lprldap50 -lplc4 -lplds4 $LIBS" found_ldap_lib=yes) -+ fi -+ -+ if test -z "$found_ldap_lib" -a \( $with_ldap_lib = auto -o $with_ldap_lib = netscape4 \); then -+ AC_CHECK_LIB(ldapssl41, main, LIBS="-lldapssl41 -lplc3 -lplds3 -lnspr3 $LIBS" found_ldap_lib=yes) -+ if test -z "$found_ldap_lib"; then -+ AC_CHECK_LIB(ldapssl40, main, LIBS="-lldapssl40 $LIBS" found_ldap_lib=yes) -+ fi -+ if test -z "$found_ldap_lib"; then -+ AC_CHECK_LIB(ldap41, main, LIBS="-lldap41 $LIBS" found_ldap_lib=yes) -+ fi -+ if test -z "$found_ldap_lib"; then -+ AC_CHECK_LIB(ldap40, main, LIBS="-lldap40 $LIBS" found_ldap_lib=yes) -+ fi -+ fi -+ -+ if test -z "$found_ldap_lib" -a \( $with_ldap_lib = auto -o $with_ldap_lib = netscape3 \); then -+ AC_CHECK_LIB(ldapssl30, main, LIBS="-lldapssl30 $LIBS" found_ldap_lib=yes) -+ fi -+ -+ if test -z "$found_ldap_lib"; then -+ AC_MSG_ERROR(could not locate a valid LDAP library) -+ fi -+ -+ AC_MSG_CHECKING([for working LDAP support]) -+ AC_TRY_COMPILE( -+ [#include -+ #include ], -+ [(void)ldap_init(0, 0);], -+ [AC_MSG_RESULT(yes)], -+ [ -+ AC_MSG_RESULT(no) -+ AC_MSG_ERROR([** Incomplete or missing ldap libraries **]) -+ ]) -+ AC_CHECK_FUNCS( \ -+ ldap_init \ -+ ldap_get_lderrno \ -+ ldap_set_lderrno \ -+ ldap_parse_result \ -+ ldap_memfree \ -+ ldap_controls_free \ -+ ldap_set_option \ -+ ldap_get_option \ -+ ldapssl_init \ -+ ldap_start_tls_s \ -+ ldap_pvt_tls_set_option \ -+ ldap_initialize \ -+ ) -+ AC_CHECK_FUNCS(ldap_set_rebind_proc, -+ AC_MSG_CHECKING([number arguments of ldap_set_rebind_proc]) -+ AC_TRY_COMPILE( -+ [#include -+ #include ], -+ [ldap_set_rebind_proc(0, 0, 0);], -+ [ac_cv_ldap_set_rebind_proc=3], -+ [ac_cv_ldap_set_rebind_proc=2]) -+ AC_MSG_RESULT($ac_cv_ldap_set_rebind_proc) -+ AC_DEFINE(LDAP_SET_REBIND_PROC_ARGS, $ac_cv_ldap_set_rebind_proc, [number arguments of ldap_set_rebind_proc]) -+ ) -+ fi -+ ] -+) -+AC_SUBST(INSTALL_SSH_LDAP_HELPER) -+ - AC_ARG_WITH([pie], - [ --with-pie Build Position Independent Executables if possible], [ - if test "x$withval" = "xno"; then - use_pie=no - fi - if test "x$withval" = "xyes"; then - use_pie=yes - fi -diff --git a/openssh-6.6p1/ldap-helper.c b/openssh-6.6p1/ldap-helper.c -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/ldap-helper.c -@@ -0,0 +1,155 @@ -+/* $OpenBSD: ssh-pka-ldap.c,v 1.1 2009/12/03 03:34:42 jfch Exp $ */ -+/* -+ * Copyright (c) 2009 Jan F. Chadima. 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. -+ */ -+ -+#include "ldapincludes.h" -+#include "log.h" -+#include "misc.h" -+#include "xmalloc.h" -+#include "ldapconf.h" -+#include "ldapbody.h" -+#include -+#include -+ -+static int config_debug = 0; -+int config_exclusive_config_file = 0; -+static char *config_file_name = "/etc/ssh/ldap.conf"; -+static char *config_single_user = NULL; -+static int config_verbose = SYSLOG_LEVEL_VERBOSE; -+int config_warning_config_file = 0; -+extern char *__progname; -+ -+static void -+usage(void) -+{ -+ fprintf(stderr, "usage: %s [options]\n", -+ __progname); -+ fprintf(stderr, "Options:\n"); -+ fprintf(stderr, " -d Output the log messages to stderr.\n"); -+ fprintf(stderr, " -e Check the config file for unknown commands.\n"); -+ fprintf(stderr, " -f file Use alternate config file (default is /etc/ssh/ldap.conf).\n"); -+ fprintf(stderr, " -s user Do not demonize, send the user's key to stdout.\n"); -+ fprintf(stderr, " -v Increase verbosity of the debug output (implies -d).\n"); -+ fprintf(stderr, " -w Warn on unknown commands in the config file.\n"); -+ exit(1); -+} -+ -+/* -+ * Main program for the ssh pka ldap agent. -+ */ -+ -+int -+main(int ac, char **av) -+{ -+ int opt; -+ FILE *outfile = NULL; -+ -+ __progname = ssh_get_progname(av[0]); -+ -+ log_init(__progname, SYSLOG_LEVEL_DEBUG3, SYSLOG_FACILITY_AUTH, 0); -+ -+ /* -+ * Initialize option structure to indicate that no values have been -+ * set. -+ */ -+ initialize_options(); -+ -+ /* Parse command-line arguments. */ -+ while ((opt = getopt(ac, av, "def:s:vw")) != -1) { -+ switch (opt) { -+ case 'd': -+ config_debug = 1; -+ break; -+ -+ case 'e': -+ config_exclusive_config_file = 1; -+ config_warning_config_file = 1; -+ break; -+ -+ case 'f': -+ config_file_name = optarg; -+ break; -+ -+ case 's': -+ config_single_user = optarg; -+ outfile = fdopen (dup (fileno (stdout)), "w"); -+ break; -+ -+ case 'v': -+ config_debug = 1; -+ if (config_verbose < SYSLOG_LEVEL_DEBUG3) -+ config_verbose++; -+ break; -+ -+ case 'w': -+ config_warning_config_file = 1; -+ break; -+ -+ case '?': -+ default: -+ usage(); -+ break; -+ } -+ } -+ -+ /* Initialize loging */ -+ log_init(__progname, config_verbose, SYSLOG_FACILITY_AUTH, config_debug); -+ -+ if (ac != optind) -+ fatal ("illegal extra parameter %s", av[1]); -+ -+ /* Ensure that fds 0 and 2 are open or directed to /dev/null */ -+ if (config_debug == 0) -+ sanitise_stdfd(); -+ -+ /* Read config file */ -+ read_config_file(config_file_name); -+ fill_default_options(); -+ if (config_verbose == SYSLOG_LEVEL_DEBUG3) { -+ debug3 ("=== Configuration ==="); -+ dump_config(); -+ debug3 ("=== *** ==="); -+ } -+ -+ ldap_checkconfig(); -+ ldap_do_connect(); -+ -+ if (config_single_user) { -+ process_user (config_single_user, outfile); -+ } else { -+ usage(); -+ fatal ("Not yet implemented"); -+/* TODO -+ * open unix socket a run the loop on it -+ */ -+ } -+ -+ ldap_do_close(); -+ return 0; -+} -+ -+/* Ugly hack */ -+void *buffer_get_string(Buffer *b, u_int *l) { return NULL; } -+void buffer_put_string(Buffer *b, const void *f, u_int l) {} -+ -diff --git a/openssh-6.6p1/ldap-helper.h b/openssh-6.6p1/ldap-helper.h -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/ldap-helper.h -@@ -0,0 +1,32 @@ -+/* $OpenBSD: ldap-helper.h,v 1.1 2009/12/03 03:34:42 jfch Exp $ */ -+/* -+ * Copyright (c) 2009 Jan F. Chadima. 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. -+ */ -+ -+#ifndef LDAP_HELPER_H -+#define LDAP_HELPER_H -+ -+extern int config_exclusive_config_file; -+extern int config_warning_config_file; -+ -+#endif /* LDAP_HELPER_H */ -diff --git a/openssh-6.6p1/ldap.conf b/openssh-6.6p1/ldap.conf -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/ldap.conf -@@ -0,0 +1,88 @@ -+# $Id: openssh-5.5p1-ldap.patch,v 1.3 2010/07/07 13:48:36 jfch2222 Exp $ -+# -+# This is the example configuration file for the OpenSSH -+# LDAP backend -+# -+# see ssh-ldap.conf(5) -+# -+ -+# URI with your LDAP server name. This allows to use -+# Unix Domain Sockets to connect to a local LDAP Server. -+#uri ldap://127.0.0.1/ -+#uri ldaps://127.0.0.1/ -+#uri ldapi://%2fvar%2frun%2fldapi_sock/ -+# Note: %2f encodes the '/' used as directory separator -+ -+# Another way to specify your LDAP server is to provide an -+# host name and the port of our LDAP server. Host name -+# must be resolvable without using LDAP. -+# Multiple hosts may be specified, each separated by a -+# space. How long nss_ldap takes to failover depends on -+# whether your LDAP client library supports configurable -+# network or connect timeouts (see bind_timelimit). -+#host 127.0.0.1 -+ -+# The port. -+# Optional: default is 389. -+#port 389 -+ -+# The distinguished name to bind to the server with. -+# Optional: default is to bind anonymously. -+#binddn cn=openssh_keys,dc=example,dc=org -+ -+# The credentials to bind with. -+# Optional: default is no credential. -+#bindpw TopSecret -+ -+# The distinguished name of the search base. -+#base dc=example,dc=org -+ -+# The LDAP version to use (defaults to 3 -+# if supported by client library) -+#ldap_version 3 -+ -+# The search scope. -+#scope sub -+#scope one -+#scope base -+ -+# Search timelimit -+#timelimit 30 -+ -+# Bind/connect timelimit -+#bind_timelimit 30 -+ -+# Reconnect policy: hard (default) will retry connecting to -+# the software with exponential backoff, soft will fail -+# immediately. -+#bind_policy hard -+ -+# SSL setup, may be implied by URI also. -+#ssl no -+#ssl on -+#ssl start_tls -+ -+# OpenLDAP SSL options -+# Require and verify server certificate (yes/no) -+# Default is to use libldap's default behavior, which can be configured in -+# /etc/openldap/ldap.conf using the TLS_REQCERT setting. The default for -+# OpenLDAP 2.0 and earlier is "no", for 2.1 and later is "yes". -+#tls_checkpeer hard -+ -+# CA certificates for server certificate verification -+# At least one of these are required if tls_checkpeer is "yes" -+#tls_cacertfile /etc/ssl/ca.cert -+#tls_cacertdir /etc/pki/tls/certs -+ -+# Seed the PRNG if /dev/urandom is not provided -+#tls_randfile /var/run/egd-pool -+ -+# SSL cipher suite -+# See man ciphers for syntax -+#tls_ciphers TLSv1 -+ -+# Client certificate and key -+# Use these, if your server requires client authentication. -+#tls_cert -+#tls_key -+ -diff --git a/openssh-6.6p1/ldapbody.c b/openssh-6.6p1/ldapbody.c -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/ldapbody.c -@@ -0,0 +1,494 @@ -+/* $OpenBSD: ldapbody.c,v 1.1 2009/12/03 03:34:42 jfch Exp $ */ -+/* -+ * Copyright (c) 2009 Jan F. Chadima. 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. -+ */ -+ -+#include "ldapincludes.h" -+#include "log.h" -+#include "xmalloc.h" -+#include "ldapconf.h" -+#include "ldapmisc.h" -+#include "ldapbody.h" -+#include -+#include -+ -+#define LDAPSEARCH_FORMAT "(&(objectclass=posixAccount)(objectclass=ldapPublicKey)(uid=%s)%s)" -+#define PUBKEYATTR "sshPublicKey" -+#define LDAP_LOGFILE "%s/ldap.%d" -+ -+static FILE *logfile = NULL; -+static LDAP *ld; -+ -+static char *attrs[] = { -+ PUBKEYATTR, -+ NULL -+}; -+ -+void -+ldap_checkconfig (void) -+{ -+#ifdef HAVE_LDAP_INITIALIZE -+ if (options.host == NULL && options.uri == NULL) -+#else -+ if (options.host == NULL) -+#endif -+ fatal ("missing \"host\" in config file"); -+} -+ -+#if defined(LDAP_API_FEATURE_X_OPENLDAP) && (LDAP_API_VERSION > 2000) -+static int -+_rebind_proc (LDAP * ld, LDAP_CONST char *url, int request, ber_int_t msgid) -+{ -+ struct timeval timeout; -+ int rc; -+#if defined(HAVE_LDAP_PARSE_RESULT) && defined(HAVE_LDAP_CONTROLS_FREE) -+ LDAPMessage *result; -+#endif /* HAVE_LDAP_PARSE_RESULT && HAVE_LDAP_CONTROLS_FREE */ -+ -+ debug2 ("Doing LDAP rebind to %s", options.binddn); -+ if (options.ssl == SSL_START_TLS) { -+ if ((rc = ldap_start_tls_s (ld, NULL, NULL)) != LDAP_SUCCESS) { -+ error ("ldap_starttls_s: %s", ldap_err2string (rc)); -+ return LDAP_OPERATIONS_ERROR; -+ } -+ } -+ -+#if !defined(HAVE_LDAP_PARSE_RESULT) || !defined(HAVE_LDAP_CONTROLS_FREE) -+ return ldap_simple_bind_s (ld, options.binddn, options.bindpw); -+#else -+ if (ldap_simple_bind(ld, options.binddn, options.bindpw) < 0) -+ fatal ("ldap_simple_bind %s", ldap_err2string (ldap_get_lderrno (ld, 0, 0))); -+ -+ timeout.tv_sec = options.bind_timelimit; -+ timeout.tv_usec = 0; -+ result = NULL; -+ if ((rc = ldap_result (ld, msgid, 0, &timeout, &result)) < 1) { -+ error ("ldap_result %s", ldap_err2string (ldap_get_lderrno (ld, 0, 0))); -+ ldap_msgfree (result); -+ return LDAP_OPERATIONS_ERROR; -+ } -+ debug3 ("LDAP rebind to %s succesfull", options.binddn); -+ return rc; -+#endif -+} -+#else -+ -+static int -+_rebind_proc (LDAP * ld, char **whop, char **credp, int *methodp, int freeit) -+{ -+ if (freeit) -+ return LDAP_SUCCESS; -+ -+ *whop = strdup (options.binddn); -+ *credp = strdup (options.bindpw); -+ *methodp = LDAP_AUTH_SIMPLE; -+ debug2 ("Doing LDAP rebind for %s", *whop); -+ return LDAP_SUCCESS; -+} -+#endif -+ -+void -+ldap_do_connect(void) -+{ -+ int rc, msgid, ld_errno = 0; -+ struct timeval timeout; -+#if defined(HAVE_LDAP_PARSE_RESULT) && defined(HAVE_LDAP_CONTROLS_FREE) -+ int parserc; -+ LDAPMessage *result; -+ LDAPControl **controls; -+ int reconnect = 0; -+#endif /* HAVE_LDAP_PARSE_RESULT && HAVE_LDAP_CONTROLS_FREE */ -+ -+ debug ("LDAP do connect"); -+ -+retry: -+ if (reconnect) { -+ debug3 ("Reconnecting with ld_errno %d", ld_errno); -+ if (options.bind_policy == 0 || -+ (ld_errno != LDAP_SERVER_DOWN && ld_errno != LDAP_TIMEOUT) || -+ reconnect > 5) -+ fatal ("Cannot connect to LDAP server"); -+ -+ if (reconnect > 1) -+ sleep (reconnect - 1); -+ -+ if (ld != NULL) { -+ ldap_unbind (ld); -+ ld = NULL; -+ } -+ logit("reconnecting to LDAP server..."); -+ } -+ -+ if (ld == NULL) { -+ int rc; -+ struct timeval tv; -+ -+#ifdef HAVE_LDAP_SET_OPTION -+ if (options.debug > 0) { -+#ifdef LBER_OPT_LOG_PRINT_FILE -+ if (options.logdir) { -+ char *logfilename; -+ int logfilenamelen; -+ -+ logfilenamelen = strlen (LDAP_LOGFILE) + strlen ("000000") + strlen (options.logdir); -+ logfilename = xmalloc (logfilenamelen); -+ snprintf (logfilename, logfilenamelen, LDAP_LOGFILE, options.logdir, (int) getpid ()); -+ logfilename[logfilenamelen - 1] = 0; -+ if ((logfile = fopen (logfilename, "a")) == NULL) -+ fatal ("cannot append to %s: %s", logfilename, strerror (errno)); -+ debug3 ("LDAP debug into %s", logfilename); -+ free (logfilename); -+ ber_set_option (NULL, LBER_OPT_LOG_PRINT_FILE, logfile); -+ } -+#endif -+ if (options.debug) { -+#ifdef LBER_OPT_DEBUG_LEVEL -+ ber_set_option (NULL, LBER_OPT_DEBUG_LEVEL, &options.debug); -+#endif /* LBER_OPT_DEBUG_LEVEL */ -+#ifdef LDAP_OPT_DEBUG_LEVEL -+ ldap_set_option (NULL, LDAP_OPT_DEBUG_LEVEL, &options.debug); -+#endif /* LDAP_OPT_DEBUG_LEVEL */ -+ debug3 ("Set LDAP debug to %d", options.debug); -+ } -+ } -+#endif /* HAVE_LDAP_SET_OPTION */ -+ -+ ld = NULL; -+#ifdef HAVE_LDAPSSL_INIT -+ if (options.host != NULL) { -+ if (options.ssl_on == SSL_LDAPS) { -+ if ((rc = ldapssl_client_init (options.sslpath, NULL)) != LDAP_SUCCESS) -+ fatal ("ldapssl_client_init %s", ldap_err2string (rc)); -+ debug3 ("LDAPssl client init"); -+ } -+ -+ if (options.ssl_on != SSL_OFF) { -+ if ((ld = ldapssl_init (options.host, options.port, 1)) == NULL) -+ fatal ("ldapssl_init failed"); -+ debug3 ("LDAPssl init"); -+ } -+ } -+#endif /* HAVE_LDAPSSL_INIT */ -+ -+ /* continue with opening */ -+ if (ld == NULL) { -+#if defined (HAVE_LDAP_START_TLS_S) || (defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_OPT_X_TLS)) -+ /* Some global TLS-specific options need to be set before we create our -+ * session context, so we set them here. */ -+ -+#ifdef LDAP_OPT_X_TLS_RANDOM_FILE -+ /* rand file */ -+ if (options.tls_randfile != NULL) { -+ if ((rc = ldap_set_option (NULL, LDAP_OPT_X_TLS_RANDOM_FILE, -+ options.tls_randfile)) != LDAP_SUCCESS) -+ fatal ("ldap_set_option(LDAP_OPT_X_TLS_RANDOM_FILE): %s", -+ ldap_err2string (rc)); -+ debug3 ("Set TLS random file %s", options.tls_randfile); -+ } -+#endif /* LDAP_OPT_X_TLS_RANDOM_FILE */ -+ -+ /* ca cert file */ -+ if (options.tls_cacertfile != NULL) { -+ if ((rc = ldap_set_option (NULL, LDAP_OPT_X_TLS_CACERTFILE, -+ options.tls_cacertfile)) != LDAP_SUCCESS) -+ error ("ldap_set_option(LDAP_OPT_X_TLS_CACERTFILE): %s", -+ ldap_err2string (rc)); -+ debug3 ("Set TLS CA cert file %s ", options.tls_cacertfile); -+ } -+ -+ /* ca cert directory */ -+ if (options.tls_cacertdir != NULL) { -+ if ((rc = ldap_set_option (NULL, LDAP_OPT_X_TLS_CACERTDIR, -+ options.tls_cacertdir)) != LDAP_SUCCESS) -+ fatal ("ldap_set_option(LDAP_OPT_X_TLS_CACERTDIR): %s", -+ ldap_err2string (rc)); -+ debug3 ("Set TLS CA cert dir %s ", options.tls_cacertdir); -+ } -+ -+ /* require cert? */ -+ if ((rc = ldap_set_option (NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, -+ &options.tls_checkpeer)) != LDAP_SUCCESS) -+ fatal ("ldap_set_option(LDAP_OPT_X_TLS_REQUIRE_CERT): %s", -+ ldap_err2string (rc)); -+ debug3 ("Set TLS check peer to %d ", options.tls_checkpeer); -+ -+ /* set cipher suite, certificate and private key: */ -+ if (options.tls_ciphers != NULL) { -+ if ((rc = ldap_set_option (NULL, LDAP_OPT_X_TLS_CIPHER_SUITE, -+ options.tls_ciphers)) != LDAP_SUCCESS) -+ fatal ("ldap_set_option(LDAP_OPT_X_TLS_CIPHER_SUITE): %s", -+ ldap_err2string (rc)); -+ debug3 ("Set TLS ciphers to %s ", options.tls_ciphers); -+ } -+ -+ /* cert file */ -+ if (options.tls_cert != NULL) { -+ if ((rc = ldap_set_option (NULL, LDAP_OPT_X_TLS_CERTFILE, -+ options.tls_cert)) != LDAP_SUCCESS) -+ fatal ("ldap_set_option(LDAP_OPT_X_TLS_CERTFILE): %s", -+ ldap_err2string (rc)); -+ debug3 ("Set TLS cert file %s ", options.tls_cert); -+ } -+ -+ /* key file */ -+ if (options.tls_key != NULL) { -+ if ((rc = ldap_set_option (NULL, LDAP_OPT_X_TLS_KEYFILE, -+ options.tls_key)) != LDAP_SUCCESS) -+ fatal ("ldap_set_option(LDAP_OPT_X_TLS_KEYFILE): %s", -+ ldap_err2string (rc)); -+ debug3 ("Set TLS key file %s ", options.tls_key); -+ } -+#endif -+#ifdef HAVE_LDAP_INITIALIZE -+ if (options.uri != NULL) { -+ if ((rc = ldap_initialize (&ld, options.uri)) != LDAP_SUCCESS) -+ fatal ("ldap_initialize %s", ldap_err2string (rc)); -+ debug3 ("LDAP initialize %s", options.uri); -+ } -+ } -+#endif /* HAVE_LDAP_INTITIALIZE */ -+ -+ /* continue with opening */ -+ if ((ld == NULL) && (options.host != NULL)) { -+#ifdef HAVE_LDAP_INIT -+ if ((ld = ldap_init (options.host, options.port)) == NULL) -+ fatal ("ldap_init failed"); -+ debug3 ("LDAP init %s:%d", options.host, options.port); -+#else -+ if ((ld = ldap_open (options.host, options.port)) == NULL) -+ fatal ("ldap_open failed"); -+ debug3 ("LDAP open %s:%d", options.host, options.port); -+#endif /* HAVE_LDAP_INIT */ -+ } -+ -+ if (ld == NULL) -+ fatal ("no way to open ldap"); -+ -+#if defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_OPT_X_TLS) -+ if (options.ssl == SSL_LDAPS) { -+ if ((rc = ldap_set_option (ld, LDAP_OPT_X_TLS, &options.tls_checkpeer)) != LDAP_SUCCESS) -+ fatal ("ldap_set_option(LDAP_OPT_X_TLS) %s", ldap_err2string (rc)); -+ debug3 ("LDAP set LDAP_OPT_X_TLS_%d", options.tls_checkpeer); -+ } -+#endif /* LDAP_OPT_X_TLS */ -+ -+#if defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_OPT_PROTOCOL_VERSION) -+ (void) ldap_set_option (ld, LDAP_OPT_PROTOCOL_VERSION, -+ &options.ldap_version); -+#else -+ ld->ld_version = options.ldap_version; -+#endif -+ debug3 ("LDAP set version to %d", options.ldap_version); -+ -+#if LDAP_SET_REBIND_PROC_ARGS == 3 -+ ldap_set_rebind_proc (ld, _rebind_proc, NULL); -+#elif LDAP_SET_REBIND_PROC_ARGS == 2 -+ ldap_set_rebind_proc (ld, _rebind_proc); -+#else -+#warning unknown LDAP_SET_REBIND_PROC_ARGS -+#endif -+ debug3 ("LDAP set rebind proc"); -+ -+#if defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_OPT_DEREF) -+ (void) ldap_set_option (ld, LDAP_OPT_DEREF, &options.deref); -+#else -+ ld->ld_deref = options.deref; -+#endif -+ debug3 ("LDAP set deref to %d", options.deref); -+ -+#if defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_OPT_TIMELIMIT) -+ (void) ldap_set_option (ld, LDAP_OPT_TIMELIMIT, -+ &options.timelimit); -+#else -+ ld->ld_timelimit = options.timelimit; -+#endif -+ debug3 ("LDAP set timelimit to %d", options.timelimit); -+ -+#if defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_X_OPT_CONNECT_TIMEOUT) -+ /* -+ * This is a new option in the Netscape SDK which sets -+ * the TCP connect timeout. For want of a better value, -+ * we use the bind_timelimit to control this. -+ */ -+ timeout = options.bind_timelimit * 1000; -+ (void) ldap_set_option (ld, LDAP_X_OPT_CONNECT_TIMEOUT, &timeout); -+ debug3 ("LDAP set opt connect timeout to %d", timeout); -+#endif -+ -+#if defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_OPT_NETWORK_TIMEOUT) -+ tv.tv_sec = options.bind_timelimit; -+ tv.tv_usec = 0; -+ (void) ldap_set_option (ld, LDAP_OPT_NETWORK_TIMEOUT, &tv); -+ debug3 ("LDAP set opt network timeout to %ld.0", tv.tv_sec); -+#endif -+ -+#if defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_OPT_REFERRALS) -+ (void) ldap_set_option (ld, LDAP_OPT_REFERRALS, -+ options.referrals ? LDAP_OPT_ON : LDAP_OPT_OFF); -+ debug3 ("LDAP set referrals to %d", options.referrals); -+#endif -+ -+#if defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_OPT_RESTART) -+ (void) ldap_set_option (ld, LDAP_OPT_RESTART, -+ options.restart ? LDAP_OPT_ON : LDAP_OPT_OFF); -+ debug3 ("LDAP set restart to %d", options.restart); -+#endif -+ -+#ifdef HAVE_LDAP_START_TLS_S -+ if (options.ssl == SSL_START_TLS) { -+ int version; -+ -+ if (ldap_get_option (ld, LDAP_OPT_PROTOCOL_VERSION, &version) -+ == LDAP_SUCCESS) { -+ if (version < LDAP_VERSION3) { -+ version = LDAP_VERSION3; -+ (void) ldap_set_option (ld, LDAP_OPT_PROTOCOL_VERSION, -+ &version); -+ debug3 ("LDAP set version to %d", version); -+ } -+ } -+ -+ if ((rc = ldap_start_tls_s (ld, NULL, NULL)) != LDAP_SUCCESS) -+ fatal ("ldap_starttls_s: %s", ldap_err2string (rc)); -+ debug3 ("LDAP start TLS"); -+ } -+#endif /* HAVE_LDAP_START_TLS_S */ -+ } -+ -+ if ((msgid = ldap_simple_bind (ld, options.binddn, -+ options.bindpw)) == -1) { -+ ld_errno = ldap_get_lderrno (ld, 0, 0); -+ -+ error ("ldap_simple_bind %s", ldap_err2string (ld_errno)); -+ reconnect++; -+ goto retry; -+ } -+ debug3 ("LDAP simple bind (%s)", options.binddn); -+ -+ timeout.tv_sec = options.bind_timelimit; -+ timeout.tv_usec = 0; -+ if ((rc = ldap_result (ld, msgid, 0, &timeout, &result)) < 1) { -+ ld_errno = ldap_get_lderrno (ld, 0, 0); -+ -+ error ("ldap_result %s", ldap_err2string (ld_errno)); -+ reconnect++; -+ goto retry; -+ } -+ debug3 ("LDAP result in time"); -+ -+#if defined(HAVE_LDAP_PARSE_RESULT) && defined(HAVE_LDAP_CONTROLS_FREE) -+ controls = NULL; -+ if ((parserc = ldap_parse_result (ld, result, &rc, 0, 0, 0, &controls, 1)) != LDAP_SUCCESS) -+ fatal ("ldap_parse_result %s", ldap_err2string (parserc)); -+ debug3 ("LDAP parse result OK"); -+ -+ if (controls != NULL) { -+ ldap_controls_free (controls); -+ } -+#else -+ rc = ldap_result2error (session->ld, result, 1); -+#endif -+ if (rc != LDAP_SUCCESS) -+ fatal ("error trying to bind as user \"%s\" (%s)", -+ options.binddn, ldap_err2string (rc)); -+ -+ debug2 ("LDAP do connect OK"); -+} -+ -+void -+process_user (const char *user, FILE *output) -+{ -+ LDAPMessage *res, *e; -+ char *buffer; -+ int bufflen, rc, i; -+ struct timeval timeout; -+ -+ debug ("LDAP process user"); -+ -+ /* quick check for attempts to be evil */ -+ if ((strchr(user, '(') != NULL) || (strchr(user, ')') != NULL) || -+ (strchr(user, '*') != NULL) || (strchr(user, '\\') != NULL)) { -+ logit ("illegal user name %s not processed", user); -+ return; -+ } -+ -+ /* build filter for LDAP request */ -+ bufflen = strlen (LDAPSEARCH_FORMAT) + strlen (user); -+ if (options.ssh_filter != NULL) -+ bufflen += strlen (options.ssh_filter); -+ buffer = xmalloc (bufflen); -+ snprintf(buffer, bufflen, LDAPSEARCH_FORMAT, user, (options.ssh_filter != NULL) ? options.ssh_filter : NULL); -+ buffer[bufflen - 1] = 0; -+ -+ debug3 ("LDAP search scope = %d %s", options.scope, buffer); -+ -+ timeout.tv_sec = options.timelimit; -+ timeout.tv_usec = 0; -+ if ((rc = ldap_search_st(ld, options.base, options.scope, buffer, attrs, 0, &timeout, &res)) != LDAP_SUCCESS) { -+ error ("ldap_search_st(): %s", ldap_err2string (rc)); -+ free (buffer); -+ return; -+ } -+ -+ /* free */ -+ free (buffer); -+ -+ for (e = ldap_first_entry(ld, res); e != NULL; e = ldap_next_entry(ld, e)) { -+ int num; -+ struct berval **keys; -+ -+ keys = ldap_get_values_len(ld, e, PUBKEYATTR); -+ num = ldap_count_values_len(keys); -+ for (i = 0 ; i < num ; i++) { -+ char *cp; //, *options = NULL; -+ -+ for (cp = keys[i]->bv_val; *cp == ' ' || *cp == '\t'; cp++); -+ if (!*cp || *cp == '\n' || *cp == '#') -+ continue; -+ -+ /* We have found the desired key. */ -+ fprintf (output, "%s\n", keys[i]->bv_val); -+ } -+ -+ ldap_value_free_len(keys); -+ } -+ -+ ldap_msgfree(res); -+ debug2 ("LDAP process user finished"); -+} -+ -+void -+ldap_do_close(void) -+{ -+ int rc; -+ -+ debug ("LDAP do close"); -+ if ((rc = ldap_unbind_ext(ld, NULL, NULL)) != LDAP_SUCCESS) -+ fatal ("ldap_unbind_ext: %s", -+ ldap_err2string (rc)); -+ -+ ld = NULL; -+ debug2 ("LDAP do close OK"); -+ return; -+} -+ -diff --git a/openssh-6.6p1/ldapbody.h b/openssh-6.6p1/ldapbody.h -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/ldapbody.h -@@ -0,0 +1,37 @@ -+/* $OpenBSD: ldapbody.h,v 1.1 2009/12/03 03:34:42 jfch Exp $ */ -+/* -+ * Copyright (c) 2009 Jan F. Chadima. 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. -+ */ -+ -+#ifndef LDAPBODY_H -+#define LDAPBODY_H -+ -+#include -+ -+void ldap_checkconfig(void); -+void ldap_do_connect(void); -+void process_user(const char *, FILE *); -+void ldap_do_close(void); -+ -+#endif /* LDAPBODY_H */ -+ -diff --git a/openssh-6.6p1/ldapconf.c b/openssh-6.6p1/ldapconf.c -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/ldapconf.c -@@ -0,0 +1,682 @@ -+/* $OpenBSD: ldapconf.c,v 1.1 2009/12/03 03:34:42 jfch Exp $ */ -+/* -+ * Copyright (c) 2009 Jan F. Chadima. 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. -+ */ -+ -+#include "ldapincludes.h" -+#include "ldap-helper.h" -+#include "log.h" -+#include "misc.h" -+#include "xmalloc.h" -+#include "ldapconf.h" -+#include -+#include -+ -+/* Keyword tokens. */ -+ -+typedef enum { -+ lBadOption, -+ lHost, lURI, lBase, lBindDN, lBindPW, lRootBindDN, -+ lScope, lDeref, lPort, lTimeLimit, lBind_TimeLimit, -+ lLdap_Version, lBind_Policy, lSSLPath, lSSL, lReferrals, -+ lRestart, lTLS_CheckPeer, lTLS_CaCertFile, -+ lTLS_CaCertDir, lTLS_Ciphers, lTLS_Cert, lTLS_Key, -+ lTLS_RandFile, lLogDir, lDebug, lSSH_Filter, -+ lDeprecated, lUnsupported -+} OpCodes; -+ -+/* Textual representations of the tokens. */ -+ -+static struct { -+ const char *name; -+ OpCodes opcode; -+} keywords[] = { -+ { "URI", lURI }, -+ { "Base", lBase }, -+ { "BindDN", lBindDN }, -+ { "BindPW", lBindPW }, -+ { "RootBindDN", lRootBindDN }, -+ { "Host", lHost }, -+ { "Port", lPort }, -+ { "Scope", lScope }, -+ { "Deref", lDeref }, -+ { "TimeLimit", lTimeLimit }, -+ { "TimeOut", lTimeLimit }, -+ { "Bind_Timelimit", lBind_TimeLimit }, -+ { "Network_TimeOut", lBind_TimeLimit }, -+/* -+ * Todo -+ * SIZELIMIT -+ */ -+ { "Ldap_Version", lLdap_Version }, -+ { "Version", lLdap_Version }, -+ { "Bind_Policy", lBind_Policy }, -+ { "SSLPath", lSSLPath }, -+ { "SSL", lSSL }, -+ { "Referrals", lReferrals }, -+ { "Restart", lRestart }, -+ { "TLS_CheckPeer", lTLS_CheckPeer }, -+ { "TLS_ReqCert", lTLS_CheckPeer }, -+ { "TLS_CaCertFile", lTLS_CaCertFile }, -+ { "TLS_CaCert", lTLS_CaCertFile }, -+ { "TLS_CaCertDir", lTLS_CaCertDir }, -+ { "TLS_Ciphers", lTLS_Ciphers }, -+ { "TLS_Cipher_Suite", lTLS_Ciphers }, -+ { "TLS_Cert", lTLS_Cert }, -+ { "TLS_Certificate", lTLS_Cert }, -+ { "TLS_Key", lTLS_Key }, -+ { "TLS_RandFile", lTLS_RandFile }, -+/* -+ * Todo -+ * TLS_CRLCHECK -+ * TLS_CRLFILE -+ */ -+ { "LogDir", lLogDir }, -+ { "Debug", lDebug }, -+ { "SSH_Filter", lSSH_Filter }, -+ { NULL, lBadOption } -+}; -+ -+/* Configuration ptions. */ -+ -+Options options; -+ -+/* -+ * Returns the number of the token pointed to by cp or oBadOption. -+ */ -+ -+static OpCodes -+parse_token(const char *cp, const char *filename, int linenum) -+{ -+ u_int i; -+ -+ for (i = 0; keywords[i].name; i++) -+ if (strcasecmp(cp, keywords[i].name) == 0) -+ return keywords[i].opcode; -+ -+ if (config_warning_config_file) -+ logit("%s: line %d: Bad configuration option: %s", -+ filename, linenum, cp); -+ return lBadOption; -+} -+ -+/* -+ * Processes a single option line as used in the configuration files. This -+ * only sets those values that have not already been set. -+ */ -+#define WHITESPACE " \t\r\n" -+ -+static int -+process_config_line(char *line, const char *filename, int linenum) -+{ -+ char *s, **charptr, **xstringptr, *endofnumber, *keyword, *arg; -+ char *rootbinddn = NULL; -+ int opcode, *intptr, value; -+ size_t len; -+ -+ /* Strip trailing whitespace */ -+ for (len = strlen(line) - 1; len > 0; len--) { -+ if (strchr(WHITESPACE, line[len]) == NULL) -+ break; -+ line[len] = '\0'; -+ } -+ -+ s = line; -+ /* Get the keyword. (Each line is supposed to begin with a keyword). */ -+ if ((keyword = strdelim(&s)) == NULL) -+ return 0; -+ /* Ignore leading whitespace. */ -+ if (*keyword == '\0') -+ keyword = strdelim(&s); -+ if (keyword == NULL || !*keyword || *keyword == '\n' || *keyword == '#') -+ return 0; -+ -+ opcode = parse_token(keyword, filename, linenum); -+ -+ switch (opcode) { -+ case lBadOption: -+ /* don't panic, but count bad options */ -+ return -1; -+ /* NOTREACHED */ -+ -+ case lHost: -+ xstringptr = &options.host; -+parse_xstring: -+ if (!s || *s == '\0') -+ fatal("%s line %d: missing dn",filename,linenum); -+ if (*xstringptr == NULL) -+ *xstringptr = xstrdup(s); -+ return 0; -+ -+ case lURI: -+ xstringptr = &options.uri; -+ goto parse_xstring; -+ -+ case lBase: -+ xstringptr = &options.base; -+ goto parse_xstring; -+ -+ case lBindDN: -+ xstringptr = &options.binddn; -+ goto parse_xstring; -+ -+ case lBindPW: -+ charptr = &options.bindpw; -+parse_string: -+ arg = strdelim(&s); -+ if (!arg || *arg == '\0') -+ fatal("%.200s line %d: Missing argument.", filename, linenum); -+ if (*charptr == NULL) -+ *charptr = xstrdup(arg); -+ break; -+ -+ case lRootBindDN: -+ xstringptr = &rootbinddn; -+ goto parse_xstring; -+ -+ case lScope: -+ intptr = &options.scope; -+ arg = strdelim(&s); -+ if (!arg || *arg == '\0') -+ fatal("%.200s line %d: Missing sub/one/base argument.", filename, linenum); -+ value = 0; /* To avoid compiler warning... */ -+ if (strcasecmp (arg, "sub") == 0 || strcasecmp (arg, "subtree") == 0) -+ value = LDAP_SCOPE_SUBTREE; -+ else if (strcasecmp (arg, "one") == 0) -+ value = LDAP_SCOPE_ONELEVEL; -+ else if (strcasecmp (arg, "base") == 0) -+ value = LDAP_SCOPE_BASE; -+ else -+ fatal("%.200s line %d: Bad sub/one/base argument.", filename, linenum); -+ if (*intptr == -1) -+ *intptr = value; -+ break; -+ -+ case lDeref: -+ intptr = &options.scope; -+ arg = strdelim(&s); -+ if (!arg || *arg == '\0') -+ fatal("%.200s line %d: Missing never/searching/finding/always argument.", filename, linenum); -+ value = 0; /* To avoid compiler warning... */ -+ if (!strcasecmp (arg, "never")) -+ value = LDAP_DEREF_NEVER; -+ else if (!strcasecmp (arg, "searching")) -+ value = LDAP_DEREF_SEARCHING; -+ else if (!strcasecmp (arg, "finding")) -+ value = LDAP_DEREF_FINDING; -+ else if (!strcasecmp (arg, "always")) -+ value = LDAP_DEREF_ALWAYS; -+ else -+ fatal("%.200s line %d: Bad never/searching/finding/always argument.", filename, linenum); -+ if (*intptr == -1) -+ *intptr = value; -+ break; -+ -+ case lPort: -+ intptr = &options.port; -+parse_int: -+ arg = strdelim(&s); -+ if (!arg || *arg == '\0') -+ fatal("%.200s line %d: Missing argument.", filename, linenum); -+ if (arg[0] < '0' || arg[0] > '9') -+ fatal("%.200s line %d: Bad number.", filename, linenum); -+ -+ /* Octal, decimal, or hex format? */ -+ value = strtol(arg, &endofnumber, 0); -+ if (arg == endofnumber) -+ fatal("%.200s line %d: Bad number.", filename, linenum); -+ if (*intptr == -1) -+ *intptr = value; -+ break; -+ -+ case lTimeLimit: -+ intptr = &options.timelimit; -+parse_time: -+ arg = strdelim(&s); -+ if (!arg || *arg == '\0') -+ fatal("%s line %d: missing time value.", -+ filename, linenum); -+ if ((value = convtime(arg)) == -1) -+ fatal("%s line %d: invalid time value.", -+ filename, linenum); -+ if (*intptr == -1) -+ *intptr = value; -+ break; -+ -+ case lBind_TimeLimit: -+ intptr = &options.bind_timelimit; -+ goto parse_time; -+ -+ case lLdap_Version: -+ intptr = &options.ldap_version; -+ goto parse_int; -+ -+ case lBind_Policy: -+ intptr = &options.bind_policy; -+ arg = strdelim(&s); -+ if (!arg || *arg == '\0') -+ fatal("%.200s line %d: Missing soft/hard argument.", filename, linenum); -+ value = 0; /* To avoid compiler warning... */ -+ if (strcasecmp(arg, "hard") == 0 || strcasecmp(arg, "hard_open") == 0 || strcasecmp(arg, "hard_init") == 0) -+ value = 1; -+ else if (strcasecmp(arg, "soft") == 0) -+ value = 0; -+ else -+ fatal("%.200s line %d: Bad soft/hard argument.", filename, linenum); -+ if (*intptr == -1) -+ break; -+ -+ case lSSLPath: -+ charptr = &options.sslpath; -+ goto parse_string; -+ -+ case lSSL: -+ intptr = &options.ssl; -+ arg = strdelim(&s); -+ if (!arg || *arg == '\0') -+ fatal("%.200s line %d: Missing yes/no/start_tls argument.", filename, linenum); -+ value = 0; /* To avoid compiler warning... */ -+ if (strcasecmp(arg, "yes") == 0 || strcasecmp(arg, "true") == 0 || strcasecmp(arg, "on") == 0) -+ value = SSL_LDAPS; -+ else if (strcasecmp(arg, "no") == 0 || strcasecmp(arg, "false") == 0 || strcasecmp(arg, "off") == 0) -+ value = SSL_OFF; -+ else if (!strcasecmp (arg, "start_tls")) -+ value = SSL_START_TLS; -+ else -+ fatal("%.200s line %d: Bad yes/no/start_tls argument.", filename, linenum); -+ if (*intptr == -1) -+ *intptr = value; -+ break; -+ -+ case lReferrals: -+ intptr = &options.referrals; -+parse_flag: -+ arg = strdelim(&s); -+ if (!arg || *arg == '\0') -+ fatal("%.200s line %d: Missing yes/no argument.", filename, linenum); -+ value = 0; /* To avoid compiler warning... */ -+ if (strcasecmp(arg, "yes") == 0 || strcasecmp(arg, "true") == 0 || strcasecmp(arg, "on") == 0) -+ value = 1; -+ else if (strcasecmp(arg, "no") == 0 || strcasecmp(arg, "false") == 0 || strcasecmp(arg, "off") == 0) -+ value = 0; -+ else -+ fatal("%.200s line %d: Bad yes/no argument.", filename, linenum); -+ if (*intptr == -1) -+ *intptr = value; -+ break; -+ -+ case lRestart: -+ intptr = &options.restart; -+ goto parse_flag; -+ -+ case lTLS_CheckPeer: -+ intptr = &options.tls_checkpeer; -+ arg = strdelim(&s); -+ if (!arg || *arg == '\0') -+ fatal("%.200s line %d: Missing never/hard/demand/alow/try argument.", filename, linenum); -+ value = 0; /* To avoid compiler warning... */ -+ if (strcasecmp(arg, "never") == 0 || strcasecmp(arg, "no") == 0 || strcasecmp(arg, "false") == 0 || strcasecmp(arg, "off") == 0) -+ value = LDAP_OPT_X_TLS_NEVER; -+ else if (strcasecmp(arg, "hard") == 0 || strcasecmp(arg, "yes") == 0 || strcasecmp(arg, "true") == 0 || strcasecmp(arg, "on") == 0) -+ value = LDAP_OPT_X_TLS_HARD; -+ else if (strcasecmp(arg, "demand") == 0) -+ value = LDAP_OPT_X_TLS_DEMAND; -+ else if (strcasecmp(arg, "allow") == 0) -+ value = LDAP_OPT_X_TLS_ALLOW; -+ else if (strcasecmp(arg, "try") == 0) -+ value = LDAP_OPT_X_TLS_TRY; -+ else -+ fatal("%.200s line %d: Bad never/hard/demand/alow/try argument.", filename, linenum); -+ if (*intptr == -1) -+ break; -+ -+ case lTLS_CaCertFile: -+ charptr = &options.tls_cacertfile; -+ goto parse_string; -+ -+ case lTLS_CaCertDir: -+ charptr = &options.tls_cacertdir; -+ goto parse_string; -+ -+ case lTLS_Ciphers: -+ xstringptr = &options.tls_ciphers; -+ goto parse_xstring; -+ -+ case lTLS_Cert: -+ charptr = &options.tls_cert; -+ goto parse_string; -+ -+ case lTLS_Key: -+ charptr = &options.tls_key; -+ goto parse_string; -+ -+ case lTLS_RandFile: -+ charptr = &options.tls_randfile; -+ goto parse_string; -+ -+ case lLogDir: -+ charptr = &options.logdir; -+ goto parse_string; -+ -+ case lDebug: -+ intptr = &options.debug; -+ goto parse_int; -+ -+ case lSSH_Filter: -+ xstringptr = &options.ssh_filter; -+ goto parse_xstring; -+ -+ case lDeprecated: -+ debug("%s line %d: Deprecated option \"%s\"", -+ filename, linenum, keyword); -+ return 0; -+ -+ case lUnsupported: -+ error("%s line %d: Unsupported option \"%s\"", -+ filename, linenum, keyword); -+ return 0; -+ -+ default: -+ fatal("process_config_line: Unimplemented opcode %d", opcode); -+ } -+ -+ /* Check that there is no garbage at end of line. */ -+ if ((arg = strdelim(&s)) != NULL && *arg != '\0') { -+ fatal("%.200s line %d: garbage at end of line; \"%.200s\".", -+ filename, linenum, arg); -+ } -+ return 0; -+} -+ -+/* -+ * Reads the config file and modifies the options accordingly. Options -+ * should already be initialized before this call. This never returns if -+ * there is an error. If the file does not exist, this returns 0. -+ */ -+ -+void -+read_config_file(const char *filename) -+{ -+ FILE *f; -+ char line[1024]; -+ int active, linenum; -+ int bad_options = 0; -+ struct stat sb; -+ -+ if ((f = fopen(filename, "r")) == NULL) -+ fatal("fopen %s: %s", filename, strerror(errno)); -+ -+ if (fstat(fileno(f), &sb) == -1) -+ fatal("fstat %s: %s", filename, strerror(errno)); -+ if (((sb.st_uid != 0 && sb.st_uid != getuid()) || -+ (sb.st_mode & 022) != 0)) -+ fatal("Bad owner or permissions on %s", filename); -+ -+ debug("Reading configuration data %.200s", filename); -+ -+ /* -+ * Mark that we are now processing the options. This flag is turned -+ * on/off by Host specifications. -+ */ -+ active = 1; -+ linenum = 0; -+ while (fgets(line, sizeof(line), f)) { -+ /* Update line number counter. */ -+ linenum++; -+ if (process_config_line(line, filename, linenum) != 0) -+ bad_options++; -+ } -+ fclose(f); -+ if ((bad_options > 0) && config_exclusive_config_file) -+ fatal("%s: terminating, %d bad configuration options", -+ filename, bad_options); -+} -+ -+/* -+ * Initializes options to special values that indicate that they have not yet -+ * been set. Read_config_file will only set options with this value. Options -+ * are processed in the following order: command line, user config file, -+ * system config file. Last, fill_default_options is called. -+ */ -+ -+void -+initialize_options(void) -+{ -+ memset(&options, 'X', sizeof(options)); -+ options.host = NULL; -+ options.uri = NULL; -+ options.base = NULL; -+ options.binddn = NULL; -+ options.bindpw = NULL; -+ options.scope = -1; -+ options.deref = -1; -+ options.port = -1; -+ options.timelimit = -1; -+ options.bind_timelimit = -1; -+ options.ldap_version = -1; -+ options.bind_policy = -1; -+ options.sslpath = NULL; -+ options.ssl = -1; -+ options.referrals = -1; -+ options.restart = -1; -+ options.tls_checkpeer = -1; -+ options.tls_cacertfile = NULL; -+ options.tls_cacertdir = NULL; -+ options.tls_ciphers = NULL; -+ options.tls_cert = NULL; -+ options.tls_key = NULL; -+ options.tls_randfile = NULL; -+ options.logdir = NULL; -+ options.debug = -1; -+ options.ssh_filter = NULL; -+} -+ -+/* -+ * Called after processing other sources of option data, this fills those -+ * options for which no value has been specified with their default values. -+ */ -+ -+void -+fill_default_options(void) -+{ -+ if (options.uri != NULL) { -+ LDAPURLDesc *ludp; -+ -+ if (ldap_url_parse(options.uri, &ludp) == LDAP_SUCCESS) { -+ if (options.ssl == -1) { -+ if (strcmp (ludp->lud_scheme, "ldap") == 0) -+ options.ssl = 2; -+ if (strcmp (ludp->lud_scheme, "ldapi") == 0) -+ options.ssl = 0; -+ else if (strcmp (ludp->lud_scheme, "ldaps") == 0) -+ options.ssl = 1; -+ } -+ if (options.host == NULL) -+ options.host = xstrdup (ludp->lud_host); -+ if (options.port == -1) -+ options.port = ludp->lud_port; -+ -+ ldap_free_urldesc (ludp); -+ } -+ } -+ if (options.ssl == -1) -+ options.ssl = SSL_START_TLS; -+ if (options.port == -1) -+ options.port = (options.ssl == 0) ? 389 : 636; -+ if (options.uri == NULL) { -+ int len; -+#define MAXURILEN 4096 -+ -+ options.uri = xmalloc (MAXURILEN); -+ len = snprintf (options.uri, MAXURILEN, "ldap%s://%s:%d", -+ (options.ssl == 0) ? "" : "s", options.host, options.port); -+ options.uri[MAXURILEN - 1] = 0; -+ options.uri = xrealloc (options.uri, len + 1, 1); -+ } -+ if (options.binddn == NULL) -+ options.binddn = ""; -+ if (options.bindpw == NULL) -+ options.bindpw = ""; -+ if (options.scope == -1) -+ options.scope = LDAP_SCOPE_SUBTREE; -+ if (options.deref == -1) -+ options.deref = LDAP_DEREF_NEVER; -+ if (options.timelimit == -1) -+ options.timelimit = 10; -+ if (options.bind_timelimit == -1) -+ options.bind_timelimit = 10; -+ if (options.ldap_version == -1) -+ options.ldap_version = 3; -+ if (options.bind_policy == -1) -+ options.bind_policy = 1; -+ if (options.referrals == -1) -+ options.referrals = 1; -+ if (options.restart == -1) -+ options.restart = 1; -+ if (options.tls_checkpeer == -1) -+ options.tls_checkpeer = LDAP_OPT_X_TLS_HARD; -+ if (options.debug == -1) -+ options.debug = 0; -+ if (options.ssh_filter == NULL) -+ options.ssh_filter = ""; -+} -+ -+static const char * -+lookup_opcode_name(OpCodes code) -+{ -+ u_int i; -+ -+ for (i = 0; keywords[i].name != NULL; i++) -+ if (keywords[i].opcode == code) -+ return(keywords[i].name); -+ return "UNKNOWN"; -+} -+ -+static void -+dump_cfg_string(OpCodes code, const char *val) -+{ -+ if (val == NULL) -+ debug3("%s ", lookup_opcode_name(code)); -+ else -+ debug3("%s %s", lookup_opcode_name(code), val); -+} -+ -+static void -+dump_cfg_int(OpCodes code, int val) -+{ -+ if (val == -1) -+ debug3("%s ", lookup_opcode_name(code)); -+ else -+ debug3("%s %d", lookup_opcode_name(code), val); -+} -+ -+struct names { -+ int value; -+ char *name; -+}; -+ -+static void -+dump_cfg_namedint(OpCodes code, int val, struct names *names) -+{ -+ u_int i; -+ -+ if (val == -1) -+ debug3("%s ", lookup_opcode_name(code)); -+ else { -+ for (i = 0; names[i].value != -1; i++) -+ if (names[i].value == val) { -+ debug3("%s %s", lookup_opcode_name(code), names[i].name); -+ return; -+ } -+ debug3("%s unknown: %d", lookup_opcode_name(code), val); -+ } -+} -+ -+static struct names _yesnotls[] = { -+ { 0, "No" }, -+ { 1, "Yes" }, -+ { 2, "Start_TLS" }, -+ { -1, NULL }}; -+ -+static struct names _scope[] = { -+ { LDAP_SCOPE_BASE, "Base" }, -+ { LDAP_SCOPE_ONELEVEL, "One" }, -+ { LDAP_SCOPE_SUBTREE, "Sub"}, -+ { -1, NULL }}; -+ -+static struct names _deref[] = { -+ { LDAP_DEREF_NEVER, "Never" }, -+ { LDAP_DEREF_SEARCHING, "Searching" }, -+ { LDAP_DEREF_FINDING, "Finding" }, -+ { LDAP_DEREF_ALWAYS, "Always" }, -+ { -1, NULL }}; -+ -+static struct names _yesno[] = { -+ { 0, "No" }, -+ { 1, "Yes" }, -+ { -1, NULL }}; -+ -+static struct names _bindpolicy[] = { -+ { 0, "Soft" }, -+ { 1, "Hard" }, -+ { -1, NULL }}; -+ -+static struct names _checkpeer[] = { -+ { LDAP_OPT_X_TLS_NEVER, "Never" }, -+ { LDAP_OPT_X_TLS_HARD, "Hard" }, -+ { LDAP_OPT_X_TLS_DEMAND, "Demand" }, -+ { LDAP_OPT_X_TLS_ALLOW, "Allow" }, -+ { LDAP_OPT_X_TLS_TRY, "TRY" }, -+ { -1, NULL }}; -+ -+void -+dump_config(void) -+{ -+ dump_cfg_string(lURI, options.uri); -+ dump_cfg_string(lHost, options.host); -+ dump_cfg_int(lPort, options.port); -+ dump_cfg_namedint(lSSL, options.ssl, _yesnotls); -+ dump_cfg_int(lLdap_Version, options.ldap_version); -+ dump_cfg_int(lTimeLimit, options.timelimit); -+ dump_cfg_int(lBind_TimeLimit, options.bind_timelimit); -+ dump_cfg_string(lBase, options.base); -+ dump_cfg_string(lBindDN, options.binddn); -+ dump_cfg_string(lBindPW, options.bindpw); -+ dump_cfg_namedint(lScope, options.scope, _scope); -+ dump_cfg_namedint(lDeref, options.deref, _deref); -+ dump_cfg_namedint(lReferrals, options.referrals, _yesno); -+ dump_cfg_namedint(lRestart, options.restart, _yesno); -+ dump_cfg_namedint(lBind_Policy, options.bind_policy, _bindpolicy); -+ dump_cfg_string(lSSLPath, options.sslpath); -+ dump_cfg_namedint(lTLS_CheckPeer, options.tls_checkpeer, _checkpeer); -+ dump_cfg_string(lTLS_CaCertFile, options.tls_cacertfile); -+ dump_cfg_string(lTLS_CaCertDir, options.tls_cacertdir); -+ dump_cfg_string(lTLS_Ciphers, options.tls_ciphers); -+ dump_cfg_string(lTLS_Cert, options.tls_cert); -+ dump_cfg_string(lTLS_Key, options.tls_key); -+ dump_cfg_string(lTLS_RandFile, options.tls_randfile); -+ dump_cfg_string(lLogDir, options.logdir); -+ dump_cfg_int(lDebug, options.debug); -+ dump_cfg_string(lSSH_Filter, options.ssh_filter); -+} -+ -diff --git a/openssh-6.6p1/ldapconf.h b/openssh-6.6p1/ldapconf.h -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/ldapconf.h -@@ -0,0 +1,71 @@ -+/* $OpenBSD: ldapconf.c,v 1.1 2009/12/03 03:34:42 jfch Exp $ */ -+/* -+ * Copyright (c) 2009 Jan F. Chadima. 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. -+ */ -+ -+#ifndef LDAPCONF_H -+#define LDAPCONF_H -+ -+#define SSL_OFF 0 -+#define SSL_LDAPS 1 -+#define SSL_START_TLS 2 -+ -+/* Data structure for representing option data. */ -+ -+typedef struct { -+ char *host; -+ char *uri; -+ char *base; -+ char *binddn; -+ char *bindpw; -+ int scope; -+ int deref; -+ int port; -+ int timelimit; -+ int bind_timelimit; -+ int ldap_version; -+ int bind_policy; -+ char *sslpath; -+ int ssl; -+ int referrals; -+ int restart; -+ int tls_checkpeer; -+ char *tls_cacertfile; -+ char *tls_cacertdir; -+ char *tls_ciphers; -+ char *tls_cert; -+ char *tls_key; -+ char *tls_randfile; -+ char *logdir; -+ int debug; -+ char *ssh_filter; -+} Options; -+ -+extern Options options; -+ -+void read_config_file(const char *); -+void initialize_options(void); -+void fill_default_options(void); -+void dump_config(void); -+ -+#endif /* LDAPCONF_H */ -diff --git a/openssh-6.6p1/ldapincludes.h b/openssh-6.6p1/ldapincludes.h -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/ldapincludes.h -@@ -0,0 +1,41 @@ -+/* $OpenBSD: ldapconf.c,v 1.1 2009/12/03 03:34:42 jfch Exp $ */ -+/* -+ * Copyright (c) 2009 Jan F. Chadima. 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. -+ */ -+ -+#ifndef LDAPINCLUDES_H -+#define LDAPINCLUDES_H -+ -+#include "includes.h" -+ -+#ifdef HAVE_LBER_H -+#include -+#endif -+#ifdef HAVE_LDAP_H -+#include -+#endif -+#ifdef HAVE_LDAP_SSL_H -+#include -+#endif -+ -+#endif /* LDAPINCLUDES_H */ -diff --git a/openssh-6.6p1/ldapmisc.c b/openssh-6.6p1/ldapmisc.c -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/ldapmisc.c -@@ -0,0 +1,79 @@ -+ -+#include "ldapincludes.h" -+#include "ldapmisc.h" -+ -+#ifndef HAVE_LDAP_GET_LDERRNO -+int -+ldap_get_lderrno (LDAP * ld, char **m, char **s) -+{ -+#ifdef HAVE_LDAP_GET_OPTION -+ int rc; -+#endif -+ int lderrno; -+ -+#if defined(HAVE_LDAP_GET_OPTION) && defined(LDAP_OPT_ERROR_NUMBER) -+ if ((rc = ldap_get_option (ld, LDAP_OPT_ERROR_NUMBER, &lderrno)) != LDAP_SUCCESS) -+ return rc; -+#else -+ lderrno = ld->ld_errno; -+#endif -+ -+ if (s != NULL) { -+#if defined(HAVE_LDAP_GET_OPTION) && defined(LDAP_OPT_ERROR_STRING) -+ if ((rc = ldap_get_option (ld, LDAP_OPT_ERROR_STRING, s)) != LDAP_SUCCESS) -+ return rc; -+#else -+ *s = ld->ld_error; -+#endif -+ } -+ -+ if (m != NULL) { -+#if defined(HAVE_LDAP_GET_OPTION) && defined(LDAP_OPT_MATCHED_DN) -+ if ((rc = ldap_get_option (ld, LDAP_OPT_MATCHED_DN, m)) != LDAP_SUCCESS) -+ return rc; -+#else -+ *m = ld->ld_matched; -+#endif -+ } -+ -+ return lderrno; -+} -+#endif -+ -+#ifndef HAVE_LDAP_SET_LDERRNO -+int -+ldap_set_lderrno (LDAP * ld, int lderrno, const char *m, const char *s) -+{ -+#ifdef HAVE_LDAP_SET_OPTION -+ int rc; -+#endif -+ -+#if defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_OPT_ERROR_NUMBER) -+ if ((rc = ldap_set_option (ld, LDAP_OPT_ERROR_NUMBER, &lderrno)) != LDAP_SUCCESS) -+ return rc; -+#else -+ ld->ld_errno = lderrno; -+#endif -+ -+ if (s != NULL) { -+#if defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_OPT_ERROR_STRING) -+ if ((rc = ldap_set_option (ld, LDAP_OPT_ERROR_STRING, s)) != LDAP_SUCCESS) -+ return rc; -+#else -+ ld->ld_error = s; -+#endif -+ } -+ -+ if (m != NULL) { -+#if defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_OPT_MATCHED_DN) -+ if ((rc = ldap_set_option (ld, LDAP_OPT_MATCHED_DN, m)) != LDAP_SUCCESS) -+ return rc; -+#else -+ ld->ld_matched = m; -+#endif -+ } -+ -+ return LDAP_SUCCESS; -+} -+#endif -+ -diff --git a/openssh-6.6p1/ldapmisc.h b/openssh-6.6p1/ldapmisc.h -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/ldapmisc.h -@@ -0,0 +1,35 @@ -+/* $OpenBSD: ldapbody.h,v 1.1 2009/12/03 03:34:42 jfch Exp $ */ -+/* -+ * Copyright (c) 2009 Jan F. Chadima. 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. -+ */ -+ -+#ifndef LDAPMISC_H -+#define LDAPMISC_H -+ -+#include "ldapincludes.h" -+ -+int ldap_get_lderrno (LDAP *, char **, char **); -+int ldap_set_lderrno (LDAP *, int, const char *, const char *); -+ -+#endif /* LDAPMISC_H */ -+ -diff --git a/openssh-6.6p1/openbsd-compat/base64.c b/openssh-6.6p1/openbsd-compat/base64.c ---- a/openssh-6.6p1/openbsd-compat/base64.c -+++ b/openssh-6.6p1/openbsd-compat/base64.c -@@ -41,17 +41,17 @@ - * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN - * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. - */ - - /* OPENBSD ORIGINAL: lib/libc/net/base64.c */ - - #include "includes.h" - --#if (!defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP)) || (!defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON)) -+#if (!defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP)) || (!defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON)) || defined(USE_INTERNAL_B64) - - #include - #include - #include - #include - #include - - #include -@@ -124,17 +124,17 @@ static const char Pad64 = '='; - (2) the final quantum of encoding input is exactly 8 bits; - here, the final unit of encoded output will be two - characters followed by two "=" padding characters, or - (3) the final quantum of encoding input is exactly 16 bits; - here, the final unit of encoded output will be three - characters followed by one "=" padding character. - */ - --#if !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) -+#if !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) || defined(USE_INTERNAL_B64) - int - b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) - { - size_t datalength = 0; - u_char input[3]; - u_char output[4]; - u_int i; - -@@ -180,17 +180,17 @@ b64_ntop(u_char const *src, size_t srcle - } - if (datalength >= targsize) - return (-1); - target[datalength] = '\0'; /* Returned value doesn't count \0. */ - return (datalength); - } - #endif /* !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) */ - --#if !defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON) -+#if !defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON) || defined(USE_INTERNAL_B64) - - /* skips all whitespace anywhere. - converts characters, four at a time, starting at (or after) - src from base - 64 numbers into three 8 bit bytes in the target area. - it returns the number of data bytes stored at the target, or -1 on error. - */ - - int -diff --git a/openssh-6.6p1/openbsd-compat/base64.h b/openssh-6.6p1/openbsd-compat/base64.h ---- a/openssh-6.6p1/openbsd-compat/base64.h -+++ b/openssh-6.6p1/openbsd-compat/base64.h -@@ -42,24 +42,24 @@ - * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. - */ - - #ifndef _BSD_BASE64_H - #define _BSD_BASE64_H - - #include "includes.h" - --#ifndef HAVE___B64_NTOP --# ifndef HAVE_B64_NTOP -+#if !defined(HAVE___B64_NTOP) || defined(USE_INTERNAL_B64) -+# if !defined(HAVE_B64_NTOP) || defined(USE_INTERNAL_B64) - int b64_ntop(u_char const *src, size_t srclength, char *target, - size_t targsize); - # endif /* !HAVE_B64_NTOP */ - # define __b64_ntop(a,b,c,d) b64_ntop(a,b,c,d) - #endif /* HAVE___B64_NTOP */ - --#ifndef HAVE___B64_PTON --# ifndef HAVE_B64_PTON -+#if !defined(HAVE___B64_PTON) || defined(USE_INTERNAL_B64) -+# if !defined(HAVE_B64_PTON) || defined(USE_INTERNAL_B64) - int b64_pton(char const *src, u_char *target, size_t targsize); - # endif /* !HAVE_B64_PTON */ - # define __b64_pton(a,b,c) b64_pton(a,b,c) - #endif /* HAVE___B64_PTON */ - - #endif /* _BSD_BASE64_H */ -diff --git a/openssh-6.6p1/openssh-lpk-openldap.schema b/openssh-6.6p1/openssh-lpk-openldap.schema -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/openssh-lpk-openldap.schema -@@ -0,0 +1,21 @@ -+# -+# LDAP Public Key Patch schema for use with openssh-ldappubkey -+# useful with PKA-LDAP also -+# -+# Author: Eric AUGE -+# -+# Based on the proposal of : Mark Ruijter -+# -+ -+ -+# octetString SYNTAX -+attributetype ( 1.3.6.1.4.1.24552.500.1.1.1.13 NAME 'sshPublicKey' -+ DESC 'MANDATORY: OpenSSH Public key' -+ EQUALITY octetStringMatch -+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 ) -+ -+# printableString SYNTAX yes|no -+objectclass ( 1.3.6.1.4.1.24552.500.1.1.2.0 NAME 'ldapPublicKey' SUP top AUXILIARY -+ DESC 'MANDATORY: OpenSSH LPK objectclass' -+ MUST ( sshPublicKey $ uid ) -+ ) -diff --git a/openssh-6.6p1/openssh-lpk-sun.schema b/openssh-6.6p1/openssh-lpk-sun.schema -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/openssh-lpk-sun.schema -@@ -0,0 +1,23 @@ -+# -+# LDAP Public Key Patch schema for use with openssh-ldappubkey -+# useful with PKA-LDAP also -+# -+# Author: Eric AUGE -+# -+# Schema for Sun Directory Server. -+# Based on the original schema, modified by Stefan Fischer. -+# -+ -+dn: cn=schema -+ -+# octetString SYNTAX -+attributeTypes: ( 1.3.6.1.4.1.24552.500.1.1.1.13 NAME 'sshPublicKey' -+ DESC 'MANDATORY: OpenSSH Public key' -+ EQUALITY octetStringMatch -+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 ) -+ -+# printableString SYNTAX yes|no -+objectClasses: ( 1.3.6.1.4.1.24552.500.1.1.2.0 NAME 'ldapPublicKey' SUP top AUXILIARY -+ DESC 'MANDATORY: OpenSSH LPK objectclass' -+ MUST ( sshPublicKey $ uid ) -+ ) -diff --git a/openssh-6.6p1/ssh-ldap-helper.8 b/openssh-6.6p1/ssh-ldap-helper.8 -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/ssh-ldap-helper.8 -@@ -0,0 +1,79 @@ -+.\" $OpenBSD: ssh-ldap-helper.8,v 1.1 2010/02/10 23:20:38 markus Exp $ -+.\" -+.\" Copyright (c) 2010 Jan F. Chadima. All rights reserved. -+.\" -+.\" Permission to use, copy, modify, and distribute this software for any -+.\" purpose with or without fee is hereby granted, provided that the above -+.\" copyright notice and this permission notice appear in all copies. -+.\" -+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+.\" -+.Dd $Mdocdate: April 29 2010 $ -+.Dt SSH-LDAP-HELPER 8 -+.Os -+.Sh NAME -+.Nm ssh-ldap-helper -+.Nd sshd helper program for ldap support -+.Sh SYNOPSIS -+.Nm ssh-ldap-helper -+.Op Fl devw -+.Op Fl f Ar file -+.Op Fl s Ar user -+.Sh DESCRIPTION -+.Nm -+is used by -+.Xr sshd 1 -+to access keys provided by an LDAP. -+.Nm -+is disabled by default and can only be enabled in the -+sshd configuration file -+.Pa /etc/ssh/sshd_config -+by setting -+.Cm AuthorizedKeysCommand -+to -+.Dq @LIBEXECDIR@/ssh-ldap-wrapper . -+.Pp -+.Nm -+is not intended to be invoked by the user, but from -+.Xr sshd 8 via -+.Xr ssh-ldap-wrapper . -+.Pp -+The options are as follows: -+.Bl -tag -width Ds -+.It Fl d -+Set the debug mode; -+.Nm -+prints all logs to stderr instead of syslog. -+.It Fl e -+Implies \-w; -+.Nm -+halts if it encounters an unknown item in the ldap.conf file. -+.It Fl f -+.Nm -+uses this file as the ldap configuration file instead of /etc/ssh/ldap.conf (default). -+.It Fl s -+.Nm -+prints out the user's keys to stdout and exits. -+.It Fl v -+Implies \-d; -+increases verbosity. -+.It Fl w -+.Nm -+writes warnings about unknown items in the ldap.conf configuration file. -+.El -+.Sh SEE ALSO -+.Xr sshd 8 , -+.Xr sshd_config 5 , -+.Xr ssh-ldap.conf 5 , -+.Sh HISTORY -+.Nm -+first appeared in -+OpenSSH 5.5 + PKA-LDAP . -+.Sh AUTHORS -+.An Jan F. Chadima Aq jchadima@redhat.com -diff --git a/openssh-6.6p1/ssh-ldap-wrapper b/openssh-6.6p1/ssh-ldap-wrapper -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/ssh-ldap-wrapper -@@ -0,0 +1,4 @@ -+#!/bin/sh -+ -+exec @LIBEXECDIR@/ssh-ldap-helper -s "$1" -+ -diff --git a/openssh-6.6p1/ssh-ldap.conf.5 b/openssh-6.6p1/ssh-ldap.conf.5 -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/ssh-ldap.conf.5 -@@ -0,0 +1,376 @@ -+.\" $OpenBSD: ssh-ldap.conf.5,v 1.1 2010/02/10 23:20:38 markus Exp $ -+.\" -+.\" Copyright (c) 2010 Jan F. Chadima. All rights reserved. -+.\" -+.\" Permission to use, copy, modify, and distribute this software for any -+.\" purpose with or without fee is hereby granted, provided that the above -+.\" copyright notice and this permission notice appear in all copies. -+.\" -+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+.\" -+.Dd $Mdocdate: may 12 2010 $ -+.Dt SSH-LDAP.CONF 5 -+.Os -+.Sh NAME -+.Nm ssh-ldap.conf -+.Nd configuration file for ssh-ldap-helper -+.Sh SYNOPSIS -+.Nm /etc/ssh/ldap.conf -+.Sh DESCRIPTION -+.Xr ssh-ldap-helper 8 -+reads configuration data from -+.Pa /etc/ssh/ldap.conf -+(or the file specified with -+.Fl f -+on the command line). -+The file contains keyword-argument pairs, one per line. -+Lines starting with -+.Ql # -+and empty lines are interpreted as comments. -+.Pp -+The value starts with the first non-blank character after -+the keyword's name, and terminates at the end of the line, -+or at the last sequence of blanks before the end of the line. -+Quoting values that contain blanks -+may be incorrect, as the quotes would become part of the value. -+The possible keywords and their meanings are as follows (note that -+keywords are case-insensitive, and arguments, on a case by case basis, may be case-sensitive). -+.Bl -tag -width Ds -+.It Cm URI -+The argument(s) are in the form -+.Pa ldap[si]://[name[:port]] -+and specify the URI(s) of an LDAP server(s) to which the -+.Xr ssh-ldap-helper 8 -+should connect. The URI scheme may be any of -+.Dq ldap , -+.Dq ldaps -+or -+.Dq ldapi , -+which refer to LDAP over TCP, LDAP over SSL (TLS) and LDAP -+over IPC (UNIX domain sockets), respectively. -+Each server's name can be specified as a -+domain-style name or an IP address literal. Optionally, the -+server's name can followed by a ':' and the port number the LDAP -+server is listening on. If no port number is provided, the default -+port for the scheme is used (389 for ldap://, 636 for ldaps://). -+For LDAP over IPC, name is the name of the socket, and no port -+is required, nor allowed; note that directory separators must be -+URL-encoded, like any other characters that are special to URLs; -+A space separated list of URIs may be provided. -+There is no default. -+.It Cm Base -+Specifies the default base Distinguished Name (DN) to use when performing ldap operations. -+The base must be specified as a DN in LDAP format. -+There is no default. -+.It Cm BindDN -+Specifies the default BIND DN to use when connecting to the ldap server. -+The bind DN must be specified as a Distinguished Name in LDAP format. -+There is no default. -+.It Cm BindPW -+Specifies the default password to use when connecting to the ldap server via -+.Cm BindDN . -+There is no default. -+.It Cm RootBindDN -+Intentionaly does nothing. Recognized for compatibility reasons. -+.It Cm Host -+The argument(s) specifies the name(s) of an LDAP server(s) to which the -+.Xr ssh-ldap-helper 8 -+should connect. Each server's name can be specified as a -+domain-style name or an IP address and optionally followed by a ':' and -+the port number the ldap server is listening on. A space-separated -+list of hosts may be provided. -+There is no default. -+.Cm Host -+is deprecated in favor of -+.Cm URI . -+.It Cm Port -+Specifies the default port used when connecting to LDAP servers(s). -+The port may be specified as a number. -+The default port is 389 for ldap:// or 636 for ldaps:// respectively. -+.Cm Port -+is deprecated in favor of -+.Cm URI . -+.It Cm Scope -+Specifies the starting point of an LDAP search and the depth from the base DN to which the search should descend. -+There are three options (values) that can be assigned to the -+.Cm Scope parameter: -+.Dq base , -+.Dq one -+and -+.Dq subtree . -+Alias for the subtree is -+.Dq sub . -+The value -+.Dq base -+is used to indicate searching only the entry at the base DN, resulting in only that entry being returned (keeping in mind that it also has to meet the search filter criteria!). -+The value -+.Dq one -+is used to indicate searching all entries one level under the base DN, but not including the base DN and not including any entries under that one level under the base DN. -+The value -+.Dq subtree -+is used to indicate searching of all entries at all levels under and including the specified base DN. -+The default is -+.Dq subtree . -+.It Cm Deref -+Specifies how alias dereferencing is done when performing a search. There are four -+possible values that can be assigned to the -+.Cm Deref -+parameter: -+.Dq never , -+.Dq searching , -+.Dq finding , -+and -+.Dq always . -+The value -+.Dq never -+means that the aliases are never dereferenced. -+The value -+.Dq searching -+means that the aliases are dereferenced in subordinates of the base object, but -+not in locating the base object of the search. -+The value -+.Dq finding -+means that the aliases are only dereferenced when locating the base object of the search. -+The value -+.Dq always -+means that the aliases are dereferenced both in searching and in locating the base object -+of the search. -+The default is -+.Dq never . -+.It Cm TimeLimit -+Specifies a time limit (in seconds) to use when performing searches. -+The number should be a non-negative integer. A -+.Cm TimeLimit -+of zero (0) specifies that the search time is unlimited. Please note that the server -+may still apply any server-side limit on the duration of a search operation. -+The default value is 10. -+.It Cm TimeOut -+Is an aliast to -+.Cm TimeLimit . -+.It Cm Bind_TimeLimit -+Specifies the timeout (in seconds) after which the poll(2)/select(2) -+following a connect(2) returns in case of no activity. -+The default value is 10. -+.It Cm Network_TimeOut -+Is an alias to -+.Cm Bind_TimeLimit . -+.It Cm Ldap_Version -+Specifies what version of the LDAP protocol should be used. -+The allowed values are 2 or 3. The default is 3. -+.It Cm Version -+Is an alias to -+.Cm Ldap_Version . -+.It Cm Bind_Policy -+Specifies the policy to use for reconnecting to an unavailable LDAP server. There are 2 available values: -+.Dq hard -+and -+.Dq soft. -+.Dq hard has 2 aliases -+.Dq hard_open -+and -+.Dq hard_init . -+The value -+.Dq hard -+means that reconects that the -+.Xr ssh-ldap-helper 8 -+tries to reconnect to the LDAP server 5 times before failure. There is exponential backoff before retrying. -+The value -+.Dq soft -+means that -+.Xr ssh-ldap-helper 8 -+fails immediately when it cannot connect to the LDAP seerver. -+The deault is -+.Dq hard . -+.It Cm SSLPath -+Specifies the path to the X.509 certificate database. -+There is no default. -+.It Cm SSL -+Specifies whether to use SSL/TLS or not. -+There are three allowed values: -+.Dq yes , -+.Dq no -+and -+.Dq start_tls -+Both -+.Dq true -+and -+.Dq on -+are the aliases for -+.Dq yes . -+.Dq false -+and -+.Dq off -+are the aliases for -+.Dq no . -+If -+.Dq start_tls -+is specified then StartTLS is used rather than raw LDAP over SSL. -+The default for ldap:// is -+.Dq start_tls , -+for ldaps:// -+.Dq yes -+and -+.Dq no -+for the ldapi:// . -+In case of host based configuration the default is -+.Dq start_tls . -+.It Cm Referrals -+Specifies if the client should automatically follow referrals returned -+by LDAP servers. -+The value can be or -+.Dq yes -+or -+.Dq no . -+.Dq true -+and -+.Dq on -+are the aliases for -+.Dq yes . -+.Dq false -+and -+.Dq off -+are the aliases for -+.Dq no . -+The default is yes. -+.It Cm Restart -+Specifies whether the LDAP client library should restart the select(2) system call when interrupted. -+The value can be or -+.Dq yes -+or -+.Dq no . -+.Dq true -+and -+.Dq on -+are the aliases for -+.Dq yes . -+.Dq false -+and -+.Dq off -+are the aliases for -+.Dq no . -+The default is yes. -+.It Cm TLS_CheckPeer -+Specifies what checks to perform on server certificates in a TLS session, -+if any. The value -+can be specified as one of the following keywords: -+.Dq never , -+.Dq hard , -+.Dq demand , -+.Dq allow -+and -+.Dq try . -+.Dq true , -+.Dq on -+and -+.Dq yes -+are aliases for -+.Dq hard . -+.Dq false , -+.Dq off -+and -+.Dq no -+are the aliases for -+.Dq never . -+The value -+.Dq never -+means that the client will not request or check any server certificate. -+The value -+.Dq allow -+means that the server certificate is requested. If no certificate is provided, -+the session proceeds normally. If a bad certificate is provided, it will -+be ignored and the session proceeds normally. -+The value -+.Dq try -+means that the server certificate is requested. If no certificate is provided, -+the session proceeds normally. If a bad certificate is provided, -+the session is immediately terminated. -+The value -+.Dq demand -+means that the server certificate is requested. If no -+certificate is provided, or a bad certificate is provided, the session -+is immediately terminated. -+The value -+.Dq hard -+is the same as -+.Dq demand . -+It requires an SSL connection. In the case of the plain conection the -+session is immediately terminated. -+The default is -+.Dq hard . -+.It Cm TLS_ReqCert -+Is an alias for -+.Cm TLS_CheckPeer . -+.It Cm TLS_CACertFile -+Specifies the file that contains certificates for all of the Certificate -+Authorities the client will recognize. -+There is no default. -+.It Cm TLS_CACert -+Is an alias for -+.Cm TLS_CACertFile . -+.It Cm TLS_CACertDIR -+Specifies the path of a directory that contains Certificate Authority -+certificates in separate individual files. The -+.Cm TLS_CACert -+is always used before -+.Cm TLS_CACertDir . -+The specified directory must be managed with the OpenSSL c_rehash utility. -+There is no default. -+.It Cm TLS_Ciphers -+Specifies acceptable cipher suite and preference order. -+The value should be a cipher specification for OpenSSL, -+e.g., -+.Dq HIGH:MEDIUM:+SSLv2 . -+The default is -+.Dq ALL . -+.It Cm TLS_Cipher_Suite -+Is an alias for -+.Cm TLS_Ciphers . -+.It Cm TLS_Cert -+Specifies the file that contains the client certificate. -+There is no default. -+.It Cm TLS_Certificate -+Is an alias for -+.Cm TLS_Cert . -+.It Cm TLS_Key -+Specifies the file that contains the private key that matches the certificate -+stored in the -+.Cm TLS_Cert -+file. Currently, the private key must not be protected with a password, so -+it is of critical importance that the key file is protected carefully. -+There is no default. -+.It Cm TLS_RandFile -+Specifies the file to obtain random bits from when /dev/[u]random is -+not available. Generally set to the name of the EGD/PRNGD socket. -+The environment variable RANDFILE can also be used to specify the filename. -+There is no default. -+.It Cm LogDir -+Specifies the directory used for logging by the LDAP client library. -+There is no default. -+.It Cm Debug -+Specifies the debug level used for logging by the LDAP client library. -+There is no default. -+.It Cm SSH_Filter -+Specifies the user filter applied on the LDAP serch. -+The default is no filter. -+.El -+.Sh FILES -+.Bl -tag -width Ds -+.It Pa /etc/ssh/ldap.conf -+Ldap configuration file for -+.Xr ssh-ldap-helper 8 . -+.El -+.Sh "SEE ALSO" -+.Xr ldap.conf 5 , -+.Xr ssh-ldap-helper 8 -+.Sh HISTORY -+.Nm -+first appeared in -+OpenSSH 5.5 + PKA-LDAP . -+.Sh AUTHORS -+.An Jan F. Chadima Aq jchadima@redhat.com diff --git a/openssh-6.6p1-login_options.patch b/openssh-6.6p1-login_options.patch deleted file mode 100644 index 15e0e6f..0000000 --- a/openssh-6.6p1-login_options.patch +++ /dev/null @@ -1,28 +0,0 @@ -# login-pam cannot handle the option terminator "--" as login from util-linux -# (this is correct behaviour considering its man-page), hence use option which -# selects the compile-time branch in the code which doesn't use the terminator -# -# bnc#833605 - -diff --git a/openssh-6.6p1/configure.ac b/openssh-6.6p1/configure.ac ---- a/openssh-6.6p1/configure.ac -+++ b/openssh-6.6p1/configure.ac -@@ -719,16 +719,18 @@ main() { if (NSVersionOfRunTimeLibrary(" - AC_DEFINE([_PATH_BTMP], ["/var/log/btmp"], [log for bad login attempts]) - AC_DEFINE([USE_BTMP], [1], [Use btmp to log bad logins]) - ;; - *-*-linux*) - no_dev_ptmx=1 - use_pie=auto - check_for_libcrypt_later=1 - check_for_openpty_ctty_bug=1 -+ AC_DEFINE([LOGIN_NO_ENDOPT], [1], -+ [Define if your login program cannot handle end of options ("--")]) - AC_DEFINE([PAM_TTY_KLUDGE], [1], - [Work around problematic Linux PAM modules handling of PAM_TTY]) - AC_DEFINE([LOCKED_PASSWD_PREFIX], ["!"], - [String used in /etc/passwd to denote locked account]) - AC_DEFINE([SPT_TYPE], [SPT_REUSEARGV]) - AC_DEFINE([LINK_OPNOTSUPP_ERRNO], [EPERM], - [Define to whatever link() returns for "not supported" - if it doesn't return EOPNOTSUPP.]) diff --git a/openssh-6.6p1-no_fork-no_pid_file.patch b/openssh-6.6p1-no_fork-no_pid_file.patch deleted file mode 100644 index 9ad6c49..0000000 --- a/openssh-6.6p1-no_fork-no_pid_file.patch +++ /dev/null @@ -1,24 +0,0 @@ -# Do not write a PID file when not daemonizing (e.g. when running from systemd) - -diff --git a/openssh-6.6p1/sshd.c b/openssh-6.6p1/sshd.c ---- a/openssh-6.6p1/sshd.c -+++ b/openssh-6.6p1/sshd.c -@@ -1994,17 +1994,17 @@ main(int ac, char **av) - signal(SIGCHLD, main_sigchld_handler); - signal(SIGTERM, sigterm_handler); - signal(SIGQUIT, sigterm_handler); - - /* - * Write out the pid file after the sigterm handler - * is setup and the listen sockets are bound - */ -- if (!debug_flag) { -+ if (!(debug_flag || no_daemon_flag)) { - FILE *f = fopen(options.pid_file, "w"); - - if (f == NULL) { - error("Couldn't create pid file \"%s\": %s", - options.pid_file, strerror(errno)); - } else { - fprintf(f, "%ld\n", (long) getpid()); - fclose(f); diff --git a/openssh-6.6p1-saveargv-fix.patch b/openssh-6.6p1-saveargv-fix.patch deleted file mode 100644 index 9daf973..0000000 --- a/openssh-6.6p1-saveargv-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -# related to bnc#49845, upstream bug #529 - -diff --git a/openssh-6.6p1/sshd.c b/openssh-6.6p1/sshd.c ---- a/openssh-6.6p1/sshd.c -+++ b/openssh-6.6p1/sshd.c -@@ -1405,17 +1405,21 @@ main(int ac, char **av) - saved_argv = xcalloc(ac + 1, sizeof(*saved_argv)); - for (i = 0; i < ac; i++) - saved_argv[i] = xstrdup(av[i]); - saved_argv[i] = NULL; - - #ifndef HAVE_SETPROCTITLE - /* Prepare for later setproctitle emulation */ - compat_init_setproctitle(ac, av); -- av = saved_argv; -+ -+ av = xmalloc(sizeof(*saved_argv) * (saved_argc + 1)); -+ for (i = 0; i < saved_argc; i++) -+ av[i] = xstrdup(saved_argv[i]); -+ av[i] = NULL; - #endif - - if (geteuid() == 0 && setgroups(0, NULL) == -1) - debug("setgroups(): %.200s", strerror(errno)); - - /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ - sanitise_stdfd(); - diff --git a/openssh-6.6p1-seccomp_getuid.patch b/openssh-6.6p1-seccomp_getuid.patch deleted file mode 100644 index 28efbcd..0000000 --- a/openssh-6.6p1-seccomp_getuid.patch +++ /dev/null @@ -1,29 +0,0 @@ -# HG changeset patch -# Parent bde6f1a808f345e141a976ebc3e37903c81a09cb -add 'getuid' syscall to list of allowed ones to prevent the sanboxed thread -from being killed by the seccomp filter - -diff --git a/openssh-6.6p1/sandbox-seccomp-filter.c b/openssh-6.6p1/sandbox-seccomp-filter.c ---- a/openssh-6.6p1/sandbox-seccomp-filter.c -+++ b/openssh-6.6p1/sandbox-seccomp-filter.c -@@ -85,16 +85,20 @@ static const struct sock_filter preauth_ - offsetof(struct seccomp_data, arch)), - BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, SECCOMP_AUDIT_ARCH, 1, 0), - BPF_STMT(BPF_RET+BPF_K, SECCOMP_FILTER_FAIL), - /* Load the syscall number for checking. */ - BPF_STMT(BPF_LD+BPF_W+BPF_ABS, - offsetof(struct seccomp_data, nr)), - SC_DENY(open, EACCES), - SC_ALLOW(getpid), -+ SC_ALLOW(getuid), -+#ifdef __NR_getuid32 -+ SC_ALLOW(getuid32), -+#endif - SC_ALLOW(gettimeofday), - SC_ALLOW(clock_gettime), - #ifdef __NR_time /* not defined on EABI ARM */ - SC_ALLOW(time), - #endif - SC_ALLOW(read), - SC_ALLOW(write), - SC_ALLOW(close), diff --git a/openssh-6.6p1-seccomp_stat.patch b/openssh-6.6p1-seccomp_stat.patch deleted file mode 100644 index 80d1fd2..0000000 --- a/openssh-6.6p1-seccomp_stat.patch +++ /dev/null @@ -1,28 +0,0 @@ -# HG changeset patch -# Parent 8c8249d4e830ade9dfa1d2294c6218bbe439cb4a -Allow the stat() syscall for OpenSSL re-seed patch -(which causes OpenSSL use stat() on some file) - -bnc#912436 - -diff --git a/openssh-6.6p1/sandbox-seccomp-filter.c b/openssh-6.6p1/sandbox-seccomp-filter.c ---- a/openssh-6.6p1/sandbox-seccomp-filter.c -+++ b/openssh-6.6p1/sandbox-seccomp-filter.c -@@ -97,16 +97,17 @@ static const struct sock_filter preauth_ - SC_ALLOW(gettimeofday), - SC_ALLOW(clock_gettime), - #ifdef __NR_time /* not defined on EABI ARM */ - SC_ALLOW(time), - #endif - SC_ALLOW(read), - SC_ALLOW(write), - SC_ALLOW(close), -+ SC_ALLOW(stat), - #ifdef __NR_shutdown /* not defined on archs that go via socketcall(2) */ - SC_ALLOW(shutdown), - #endif - SC_ALLOW(brk), - SC_ALLOW(poll), - #ifdef __NR__newselect - SC_ALLOW(_newselect), - #else diff --git a/openssh-6.6p1-seed-prng.patch b/openssh-6.6p1-seed-prng.patch deleted file mode 100644 index 9a99148..0000000 --- a/openssh-6.6p1-seed-prng.patch +++ /dev/null @@ -1,542 +0,0 @@ -# extended support for (re-)seeding the OpenSSL PRNG from /dev/random -# bnc#703221, FATE#312172 - -diff --git a/openssh-6.6p1/audit-bsm.c b/openssh-6.6p1/audit-bsm.c ---- a/openssh-6.6p1/audit-bsm.c -+++ b/openssh-6.6p1/audit-bsm.c -@@ -504,9 +504,15 @@ audit_destroy_sensitive_data(const char - /* not implemented */ - } - - void - audit_generate_ephemeral_server_key(const char *fp) - { - /* not implemented */ - } -+ -+void -+audit_linux_prng_seed(long bytes, const char *rf) -+{ -+ /* not implemented */ -+} - #endif /* BSM */ -diff --git a/openssh-6.6p1/audit-linux.c b/openssh-6.6p1/audit-linux.c ---- a/openssh-6.6p1/audit-linux.c -+++ b/openssh-6.6p1/audit-linux.c -@@ -398,9 +398,31 @@ audit_generate_ephemeral_server_key(cons - } - audit_ok = audit_log_user_message(audit_fd, AUDIT_CRYPTO_KEY_USER, - buf, NULL, 0, NULL, 1); - audit_close(audit_fd); - /* do not abort if the error is EPERM and sshd is run as non root user */ - if ((audit_ok < 0) && ((audit_ok != -1) || (getuid() == 0))) - error("cannot write into audit"); - } -+ -+void -+audit_linux_prng_seed(long bytes, const char *rf) -+{ -+ char buf[AUDIT_LOG_SIZE]; -+ int audit_fd, audit_ok; -+ -+ snprintf(buf, sizeof(buf), "op=prng_seed kind=server bytes=%li source=%s ", bytes, rf); -+ audit_fd = audit_open(); -+ if (audit_fd < 0) { -+ if (errno != EINVAL && errno != EPROTONOSUPPORT && -+ errno != EAFNOSUPPORT) -+ error("cannot open audit"); -+ return; -+ } -+ audit_ok = audit_log_user_message(audit_fd, AUDIT_CRYPTO_PARAM_CHANGE_USER, -+ buf, NULL, 0, NULL, 1); -+ audit_close(audit_fd); -+ /* do not abort if the error is EPERM and sshd is run as non root user */ -+ if ((audit_ok < 0) && ((audit_ok != -1) || (getuid() == 0))) -+ error("cannot write into audit"); -+} - #endif /* USE_LINUX_AUDIT */ -diff --git a/openssh-6.6p1/audit.c b/openssh-6.6p1/audit.c ---- a/openssh-6.6p1/audit.c -+++ b/openssh-6.6p1/audit.c -@@ -304,10 +304,16 @@ audit_destroy_sensitive_data(const char - /* - * This will be called on generation of the ephemeral server key - */ - void - audit_generate_ephemeral_server_key(const char *) - { - debug("audit create ephemeral server key euid %d fingerprint %s", geteuid(), fp); - } -+ -+void -+audit_linux_prng_seed(long bytes, const char *rf) -+{ -+ debug("audit PRNG seed euid %d bytes %li source %s", geteuid(), bytes, rf); -+} - # endif /* !defined CUSTOM_SSH_AUDIT_EVENTS */ - #endif /* SSH_AUDIT_EVENTS */ -diff --git a/openssh-6.6p1/audit.h b/openssh-6.6p1/audit.h ---- a/openssh-6.6p1/audit.h -+++ b/openssh-6.6p1/audit.h -@@ -63,10 +63,11 @@ void audit_key(int, int *, const Key *); - void audit_unsupported(int); - void audit_kex(int, char *, char *, char *); - void audit_unsupported_body(int); - void audit_kex_body(int, char *, char *, char *, pid_t, uid_t); - void audit_session_key_free(int ctos); - void audit_session_key_free_body(int ctos, pid_t, uid_t); - void audit_destroy_sensitive_data(const char *, pid_t, uid_t); - void audit_generate_ephemeral_server_key(const char *); -+void audit_linux_prng_seed(long, const char *); - - #endif /* _SSH_AUDIT_H */ -diff --git a/openssh-6.6p1/entropy.c b/openssh-6.6p1/entropy.c ---- a/openssh-6.6p1/entropy.c -+++ b/openssh-6.6p1/entropy.c -@@ -45,16 +45,17 @@ - - #include "ssh.h" - #include "misc.h" - #include "xmalloc.h" - #include "atomicio.h" - #include "pathnames.h" - #include "log.h" - #include "buffer.h" -+#include "openbsd-compat/port-linux.h" - - /* - * Portable OpenSSH PRNG seeding: - * If OpenSSL has not "internally seeded" itself (e.g. pulled data from - * /dev/random), then collect RANDOM_SEED_SIZE bytes of randomness from - * PRNGd. - */ - #ifndef OPENSSL_PRNG_ONLY -@@ -229,11 +230,14 @@ seed_rng(void) - } - - if (seed_from_prngd(buf, sizeof(buf)) == -1) - fatal("Could not obtain seed from PRNGd"); - RAND_add(buf, sizeof(buf), sizeof(buf)); - memset(buf, '\0', sizeof(buf)); - - #endif /* OPENSSL_PRNG_ONLY */ -+ -+ linux_seed(); -+ - if (RAND_status() != 1) - fatal("PRNG is not seeded"); - } -diff --git a/openssh-6.6p1/openbsd-compat/Makefile.in b/openssh-6.6p1/openbsd-compat/Makefile.in ---- a/openssh-6.6p1/openbsd-compat/Makefile.in -+++ b/openssh-6.6p1/openbsd-compat/Makefile.in -@@ -15,17 +15,17 @@ AR=@AR@ - RANLIB=@RANLIB@ - INSTALL=@INSTALL@ - LDFLAGS=-L. @LDFLAGS@ - - OPENBSD=base64.o basename.o bcrypt_pbkdf.o bindresvport.o blowfish.o daemon.o dirname.o fmt_scaled.o getcwd.o getgrouplist.o getopt_long.o getrrsetbyname.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o pwcache.o readpassphrase.o realpath.o rresvport.o setenv.o setproctitle.o sha2.o sigact.o strlcat.o strlcpy.o strmode.o strnlen.o strptime.o strsep.o strtonum.o strtoll.o strtoul.o strtoull.o timingsafe_bcmp.o vis.o blowfish.o bcrypt_pbkdf.o explicit_bzero.o - - COMPAT=arc4random.o bsd-asprintf.o bsd-closefrom.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o getrrsetbyname-ldns.o bsd-misc.o bsd-nextstep.o bsd-openpty.o bsd-poll.o bsd-setres_id.o bsd-snprintf.o bsd-statvfs.o bsd-waitpid.o fake-rfc2553.o openssl-compat.o xmmap.o xcrypt.o - --PORTS=port-aix.o port-irix.o port-linux.o port-solaris.o port-tun.o port-uw.o -+PORTS=port-aix.o port-irix.o port-linux.o port-linux-prng.o port-solaris.o port-tun.o port-uw.o - - .c.o: - $(CC) $(CFLAGS) $(CPPFLAGS) -c $< - - all: libopenbsd-compat.a - - $(COMPAT): ../config.h - $(OPENBSD): ../config.h -diff --git a/openssh-6.6p1/openbsd-compat/port-linux-prng.c b/openssh-6.6p1/openbsd-compat/port-linux-prng.c -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/openbsd-compat/port-linux-prng.c -@@ -0,0 +1,79 @@ -+/* -+ * Copyright (c) 2011 Jan F. Chadima -+ * (c) 2011 Petr Cerny -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+/* -+ * Linux-specific portability code - prng support -+ */ -+ -+#include "includes.h" -+#include "defines.h" -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include "log.h" -+#include "port-linux.h" -+#include "audit.h" -+ -+#define RNG_BYTES_DEFAULT 6L -+#define RNG_ENV_VAR "SSH_USE_STRONG_RNG" -+ -+long rand_bytes = 0; -+char *rand_file = NULL; -+ -+static void -+linux_seed_init(void) -+{ -+ long elen = 0; -+ char *env = getenv(RNG_ENV_VAR); -+ -+ if (env) { -+ errno = 0; -+ elen = strtol(env, NULL, 10); -+ if (errno) { -+ debug("bogus value in the %s environment variable, using default %li\n", -+ RNG_ENV_VAR, RNG_BYTES_DEFAULT); -+ } -+ } -+ -+ if (elen) -+ rand_file = "/dev/random"; -+ else -+ rand_file = "/dev/urandom"; -+ -+ rand_bytes = MAX(elen, RNG_BYTES_DEFAULT); -+} -+ -+void -+linux_seed(void) -+{ -+ long len; -+ if (!rand_file) -+ linux_seed_init(); -+ -+ errno = 0; -+ len = RAND_load_file(rand_file, rand_bytes); -+ if (len != rand_bytes) { -+ if (errno) -+ fatal ("cannot read from %s, %s", random, strerror(errno)); -+ else -+ fatal ("EOF reading %s", random); -+ } -+} -diff --git a/openssh-6.6p1/openbsd-compat/port-linux.h b/openssh-6.6p1/openbsd-compat/port-linux.h ---- a/openssh-6.6p1/openbsd-compat/port-linux.h -+++ b/openssh-6.6p1/openbsd-compat/port-linux.h -@@ -14,16 +14,20 @@ - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - - #ifndef _PORT_LINUX_H - #define _PORT_LINUX_H - -+extern long rand_bytes; -+extern char *rand_file; -+void linux_seed(void); -+ - #ifdef WITH_SELINUX - int ssh_selinux_enabled(void); - void ssh_selinux_setup_pty(char *, const char *); - void ssh_selinux_setup_exec_context(char *); - void ssh_selinux_change_context(const char *); - void ssh_selinux_setfscreatecon(const char *); - #endif - -diff --git a/openssh-6.6p1/ssh-add.1 b/openssh-6.6p1/ssh-add.1 ---- a/openssh-6.6p1/ssh-add.1 -+++ b/openssh-6.6p1/ssh-add.1 -@@ -156,16 +156,30 @@ or related script. - (Note that on some machines it - may be necessary to redirect the input from - .Pa /dev/null - to make this work.) - .It Ev SSH_AUTH_SOCK - Identifies the path of a - .Ux Ns -domain - socket used to communicate with the agent. -+.It Ev SSH_USE_STRONG_RNG -+The reseeding of the OpenSSL random generator is usually done from -+.Cm /dev/urandom . -+If the -+.Cm SSH_USE_STRONG_RNG -+environment variable is set to value other than -+.Cm 0 -+the OpenSSL random generator is reseeded from -+.Cm /dev/random . -+The number of bytes read is defined by the SSH_USE_STRONG_RNG value. -+Minimum is 6 bytes. -+This setting is not recommended on the computers without the hardware -+random generator because insufficient entropy causes the connection to -+be blocked until enough entropy is available. - .El - .Sh FILES - .Bl -tag -width Ds - .It Pa ~/.ssh/identity - Contains the protocol version 1 RSA authentication identity of the user. - .It Pa ~/.ssh/id_dsa - Contains the protocol version 2 DSA authentication identity of the user. - .It Pa ~/.ssh/id_ecdsa -diff --git a/openssh-6.6p1/ssh-agent.1 b/openssh-6.6p1/ssh-agent.1 ---- a/openssh-6.6p1/ssh-agent.1 -+++ b/openssh-6.6p1/ssh-agent.1 -@@ -196,16 +196,33 @@ Contains the protocol version 2 ED25519 - .It Pa ~/.ssh/id_rsa - Contains the protocol version 2 RSA authentication identity of the user. - .It Pa $TMPDIR/ssh-XXXXXXXXXX/agent.\*(Ltppid\*(Gt - .Ux Ns -domain - sockets used to contain the connection to the authentication agent. - These sockets should only be readable by the owner. - The sockets should get automatically removed when the agent exits. - .El -+.Sh ENVIRONMENT -+.Bl -tag -width Ds -compact -+.Pp -+.It Pa SSH_USE_STRONG_RNG -+The reseeding of the OpenSSL random generator is usually done from -+.Cm /dev/urandom . -+If the -+.Cm SSH_USE_STRONG_RNG -+environment variable is set to value other than -+.Cm 0 -+the OpenSSL random generator is reseeded from -+.Cm /dev/random . -+The number of bytes read is defined by the SSH_USE_STRONG_RNG value. -+Minimum is 6 bytes. -+This setting is not recommended on the computers without the hardware -+random generator because insufficient entropy causes the connection to -+be blocked until enough entropy is available. - .Sh SEE ALSO - .Xr ssh 1 , - .Xr ssh-add 1 , - .Xr ssh-keygen 1 , - .Xr sshd 8 - .Sh AUTHORS - OpenSSH is a derivative of the original and free - ssh 1.2.12 release by Tatu Ylonen. -diff --git a/openssh-6.6p1/ssh-keygen.1 b/openssh-6.6p1/ssh-keygen.1 ---- a/openssh-6.6p1/ssh-keygen.1 -+++ b/openssh-6.6p1/ssh-keygen.1 -@@ -827,16 +827,33 @@ on all machines - where the user wishes to log in using public key authentication. - There is no need to keep the contents of this file secret. - .Pp - .It Pa /etc/moduli - Contains Diffie-Hellman groups used for DH-GEX. - The file format is described in - .Xr moduli 5 . - .El -+.Sh ENVIRONMENT -+.Bl -tag -width Ds -compact -+.Pp -+.It Pa SSH_USE_STRONG_RNG -+The reseeding of the OpenSSL random generator is usually done from -+.Cm /dev/urandom . -+If the -+.Cm SSH_USE_STRONG_RNG -+environment variable is set to value other than -+.Cm 0 -+the OpenSSL random generator is reseeded from -+.Cm /dev/random . -+The number of bytes read is defined by the SSH_USE_STRONG_RNG value. -+Minimum is 6 bytes. -+This setting is not recommended on the computers without the hardware -+random generator because insufficient entropy causes the connection to -+be blocked until enough entropy is available. - .Sh SEE ALSO - .Xr ssh 1 , - .Xr ssh-add 1 , - .Xr ssh-agent 1 , - .Xr moduli 5 , - .Xr sshd 8 - .Rs - .%R RFC 4716 -diff --git a/openssh-6.6p1/ssh-keysign.8 b/openssh-6.6p1/ssh-keysign.8 ---- a/openssh-6.6p1/ssh-keysign.8 -+++ b/openssh-6.6p1/ssh-keysign.8 -@@ -75,16 +75,33 @@ must be set-uid root if host-based authe - .Pp - .It Pa /etc/ssh/ssh_host_dsa_key-cert.pub - .It Pa /etc/ssh/ssh_host_ecdsa_key-cert.pub - .It Pa /etc/ssh/ssh_host_ed25519_key-cert.pub - .It Pa /etc/ssh/ssh_host_rsa_key-cert.pub - If these files exist they are assumed to contain public certificate - information corresponding with the private keys above. - .El -+.Sh ENVIRONMENT -+.Bl -tag -width Ds -compact -+.Pp -+.It Pa SSH_USE_STRONG_RNG -+The reseeding of the OpenSSL random generator is usually done from -+.Cm /dev/urandom . -+If the -+.Cm SSH_USE_STRONG_RNG -+environment variable is set to value other than -+.Cm 0 -+the OpenSSL random generator is reseeded from -+.Cm /dev/random . -+The number of bytes read is defined by the SSH_USE_STRONG_RNG value. -+Minimum is 6 bytes. -+This setting is not recommended on the computers without the hardware -+random generator because insufficient entropy causes the connection to -+be blocked until enough entropy is available. - .Sh SEE ALSO - .Xr ssh 1 , - .Xr ssh-keygen 1 , - .Xr ssh_config 5 , - .Xr sshd 8 - .Sh HISTORY - .Nm - first appeared in -diff --git a/openssh-6.6p1/ssh.1 b/openssh-6.6p1/ssh.1 ---- a/openssh-6.6p1/ssh.1 -+++ b/openssh-6.6p1/ssh.1 -@@ -1304,16 +1304,30 @@ reads - and adds lines of the format - .Dq VARNAME=value - to the environment if the file exists and users are allowed to - change their environment. - For more information, see the - .Cm PermitUserEnvironment - option in - .Xr sshd_config 5 . -+.It Ev SSH_USE_STRONG_RNG -+The reseeding of the OpenSSL random generator is usually done from -+.Cm /dev/urandom . -+If the -+.Cm SSH_USE_STRONG_RNG -+environment variable is set to value other than -+.Cm 0 -+the OpenSSL random generator is reseeded from -+.Cm /dev/random . -+The number of bytes read is defined by the SSH_USE_STRONG_RNG value. -+Minimum is 6 bytes. -+This setting is not recommended on the computers without the hardware -+random generator because insufficient entropy causes the connection to -+be blocked until enough entropy is available. - .Sh FILES - .Bl -tag -width Ds -compact - .It Pa ~/.rhosts - This file is used for host-based authentication (see above). - On some machines this file may need to be - world-readable if the user's home directory is on an NFS partition, - because - .Xr sshd 8 -diff --git a/openssh-6.6p1/sshd.8 b/openssh-6.6p1/sshd.8 ---- a/openssh-6.6p1/sshd.8 -+++ b/openssh-6.6p1/sshd.8 -@@ -946,16 +946,33 @@ and not group or world-writable. - .It Pa /var/run/sshd.pid - Contains the process ID of the - .Nm - listening for connections (if there are several daemons running - concurrently for different ports, this contains the process ID of the one - started last). - The content of this file is not sensitive; it can be world-readable. - .El -+.Sh ENVIRONMENT -+.Bl -tag -width Ds -compact -+.Pp -+.It Pa SSH_USE_STRONG_RNG -+The reseeding of the OpenSSL random generator is usually done from -+.Cm /dev/urandom . -+If the -+.Cm SSH_USE_STRONG_RNG -+environment variable is set to value other than -+.Cm 0 -+the OpenSSL random generator is reseeded from -+.Cm /dev/random . -+The number of bytes read is defined by the SSH_USE_STRONG_RNG value. -+Minimum is 6 bytes. -+This setting is not recommended on the computers without the hardware -+random generator because insufficient entropy causes the connection to -+be blocked until enough entropy is available. - .Sh SEE ALSO - .Xr scp 1 , - .Xr sftp 1 , - .Xr ssh 1 , - .Xr ssh-add 1 , - .Xr ssh-agent 1 , - .Xr ssh-keygen 1 , - .Xr ssh-keyscan 1 , -diff --git a/openssh-6.6p1/sshd.c b/openssh-6.6p1/sshd.c ---- a/openssh-6.6p1/sshd.c -+++ b/openssh-6.6p1/sshd.c -@@ -50,16 +50,18 @@ - #ifdef HAVE_SYS_STAT_H - # include - #endif - #ifdef HAVE_SYS_TIME_H - # include - #endif - #include "openbsd-compat/sys-tree.h" - #include "openbsd-compat/sys-queue.h" -+#include "openbsd-compat/port-linux.h" -+ - #include - - #include - #include - #include - #ifdef HAVE_PATHS_H - #include - #endif -@@ -218,16 +220,23 @@ struct { - Key **host_pubkeys; /* all public host keys */ - Key **host_certificates; /* all public host certificates */ - int have_ssh1_key; - int have_ssh2_key; - u_char ssh1_cookie[SSH_SESSION_KEY_LENGTH]; - } sensitive_data; - - /* -+ * Every RESEED_AFTERth connection triggers call to linux_seed() to re-seed the -+ * random pool. -+ */ -+#define RESEED_AFTER 100 -+static int re_seeding_counter = RESEED_AFTER; -+ -+/* - * Flag indicating whether the RSA server key needs to be regenerated. - * Is set in the SIGALRM handler and cleared when the key is regenerated. - */ - static volatile sig_atomic_t key_do_regen = 0; - - /* This is set to true when a signal is received. */ - static volatile sig_atomic_t received_sighup = 0; - static volatile sig_atomic_t received_sigterm = 0; -@@ -1322,16 +1331,21 @@ server_accept_loop(int *sock_in, int *so - for (j = 0; j < options.max_startups; j++) - if (startup_pipes[j] == -1) { - startup_pipes[j] = startup_p[0]; - if (maxfd < startup_p[0]) - maxfd = startup_p[0]; - startups++; - break; - } -+ if(!(--re_seeding_counter)) { -+ re_seeding_counter = RESEED_AFTER; -+ linux_seed(); -+ audit_linux_prng_seed(rand_bytes, rand_file); -+ } - - /* - * Got connection. Fork a child to handle it, unless - * we are in debugging mode. - */ - if (debug_flag) { - /* - * In debugging mode. Close the listening diff --git a/openssh-6.6p1-send_locale.patch b/openssh-6.6p1-send_locale.patch deleted file mode 100644 index c4af273..0000000 --- a/openssh-6.6p1-send_locale.patch +++ /dev/null @@ -1,44 +0,0 @@ -# send locales in default configuration -# bnc#65747 - -diff --git a/openssh-6.6p1/ssh_config b/openssh-6.6p1/ssh_config ---- a/openssh-6.6p1/ssh_config -+++ b/openssh-6.6p1/ssh_config -@@ -58,9 +58,14 @@ ForwardX11Trusted yes - # ProxyCommand ssh -q -W %h:%p gateway.example.com - - # Set this to 'yes' to enable support for the deprecated 'gssapi' authentication - # mechanism to OpenSSH 3.8p1. The newer 'gssapi-with-mic' mechanism is included - # in this release. The use of 'gssapi' is deprecated due to the presence of - # potential man-in-the-middle attacks, which 'gssapi-with-mic' is not susceptible to. - # GSSAPIEnableMITMAttack no - -+# This enables sending locale enviroment variables LC_* LANG, see ssh_config(5). -+SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES -+SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT -+SendEnv LC_IDENTIFICATION LC_ALL -+ - # RekeyLimit 1G 1h -diff --git a/openssh-6.6p1/sshd_config b/openssh-6.6p1/sshd_config ---- a/openssh-6.6p1/sshd_config -+++ b/openssh-6.6p1/sshd_config -@@ -127,14 +127,19 @@ UsePrivilegeSeparation sandbox # Defaul - #VersionAddendum none - - # no default banner path - #Banner none - - # override default of no subsystems - Subsystem sftp /usr/libexec/sftp-server - -+# This enables accepting locale enviroment variables LC_* LANG, see sshd_config(5). -+AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES -+AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT -+AcceptEnv LC_IDENTIFICATION LC_ALL -+ - # Example of overriding settings on a per-user basis - #Match User anoncvs - # X11Forwarding no - # AllowTcpForwarding no - # PermitTTY no - # ForceCommand cvs server diff --git a/openssh-6.6p1-sftp_force_permissions.patch b/openssh-6.6p1-sftp_force_permissions.patch deleted file mode 100644 index 697662c..0000000 --- a/openssh-6.6p1-sftp_force_permissions.patch +++ /dev/null @@ -1,155 +0,0 @@ -# additional option for sftp-server to force file mode for new files -# FATE#312774 -# http://lists.mindrot.org/pipermail/openssh-unix-dev/2010-November/029044.html -# http://marc.info/?l=openssh-unix-dev&m=128896838930893 - -diff --git a/openssh-6.6p1/sftp-server.8 b/openssh-6.6p1/sftp-server.8 ---- a/openssh-6.6p1/sftp-server.8 -+++ b/openssh-6.6p1/sftp-server.8 -@@ -33,16 +33,17 @@ - .Bk -words - .Op Fl ehR - .Op Fl d Ar start_directory - .Op Fl f Ar log_facility - .Op Fl l Ar log_level - .Op Fl P Ar blacklisted_requests - .Op Fl p Ar whitelisted_requests - .Op Fl u Ar umask -+.Op Fl m Ar force_file_permissions - .Ek - .Nm - .Fl Q Ar protocol_feature - .Sh DESCRIPTION - .Nm - is a program that speaks the server side of SFTP protocol - to stdout and expects client requests from stdin. - .Nm -@@ -133,16 +134,20 @@ Places this instance of - into a read-only mode. - Attempts to open files for writing, as well as other operations that change - the state of the filesystem, will be denied. - .It Fl u Ar umask - Sets an explicit - .Xr umask 2 - to be applied to newly-created files and directories, instead of the - user's default mask. -+.It Fl m Ar force_file_permissions -+Sets explicit file permissions to be applied to newly-created files instead -+of the default or client requested mode. Numeric values include: -+777, 755, 750, 666, 644, 640, etc. Option -u is ineffective if -m is set. - .El - .Pp - For logging to work, - .Nm - must be able to access - .Pa /dev/log . - Use of - .Nm -diff --git a/openssh-6.6p1/sftp-server.c b/openssh-6.6p1/sftp-server.c ---- a/openssh-6.6p1/sftp-server.c -+++ b/openssh-6.6p1/sftp-server.c -@@ -75,16 +75,20 @@ static u_int version; - static int init_done; - - /* Disable writes */ - static int readonly; - - /* Requests that are allowed/denied */ - static char *request_whitelist, *request_blacklist; - -+/* Force file permissions */ -+int permforce = 0; -+long permforcemode; -+ - /* portable attributes, etc. */ - typedef struct Stat Stat; - - struct Stat { - char *name; - char *long_name; - Attrib attrib; - }; -@@ -670,16 +674,20 @@ process_open(u_int32_t id) - int handle, fd, flags, mode, status = SSH2_FX_FAILURE; - - name = get_string(NULL); - pflags = get_int(); /* portable flags */ - debug3("request %u: open flags %d", id, pflags); - a = get_attrib(); - flags = flags_from_portable(pflags); - mode = (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) ? a->perm : 0666; -+ if (permforce == 1) { -+ mode = permforcemode; -+ (void)umask(0); /* so umask does not interfere */ -+ } - logit("open \"%s\" flags %s mode 0%o", - name, string_from_portable(pflags), mode); - if (readonly && - ((flags & O_ACCMODE) == O_WRONLY || - (flags & O_ACCMODE) == O_RDWR)) { - verbose("Refusing open request in read-only mode"); - status = SSH2_FX_PERMISSION_DENIED; - } else { -@@ -1425,17 +1433,18 @@ sftp_server_cleanup_exit(int i) - static void - sftp_server_usage(void) - { - extern char *__progname; - - fprintf(stderr, - "usage: %s [-ehR] [-d start_directory] [-f log_facility] " - "[-l log_level]\n\t[-P blacklisted_requests] " -- "[-p whitelisted_requests] [-u umask]\n" -+ "[-p whitelisted_requests] [-u umask]\n\t" -+ "[-m force_file_permissions]\n", - " %s -Q protocol_feature\n", - __progname, __progname); - exit(1); - } - - int - sftp_server_main(int argc, char **argv, struct passwd *user_pw) - { -@@ -1450,17 +1459,17 @@ sftp_server_main(int argc, char **argv, - extern char *__progname; - - __progname = ssh_get_progname(argv[0]); - log_init(__progname, log_level, log_facility, log_stderr); - - pw = pwcopy(user_pw); - - while (!skipargs && (ch = getopt(argc, argv, -- "d:f:l:P:p:Q:u:cehR")) != -1) { -+ "d:f:l:P:p:Q:u:m:cehR")) != -1) { - switch (ch) { - case 'Q': - if (strcasecmp(optarg, "requests") != 0) { - fprintf(stderr, "Invalid query type\n"); - exit(1); - } - for (i = 0; handlers[i].handler != NULL; i++) - printf("%s\n", handlers[i].name); -@@ -1510,16 +1519,23 @@ sftp_server_main(int argc, char **argv, - case 'u': - errno = 0; - mask = strtol(optarg, &cp, 8); - if (mask < 0 || mask > 0777 || *cp != '\0' || - cp == optarg || (mask == 0 && errno != 0)) - fatal("Invalid umask \"%s\"", optarg); - (void)umask((mode_t)mask); - break; -+ case 'm': -+ permforce = 1; -+ permforcemode = strtol(optarg, &cp, 8); -+ if (permforcemode < 0 || permforcemode > 0777 || *cp != '\0' || -+ cp == optarg || (permforcemode == 0 && errno != 0)) -+ fatal("Invalid umask \"%s\"", optarg); -+ break; - case 'h': - default: - sftp_server_usage(); - } - } - - log_init(__progname, log_level, log_facility, log_stderr); - diff --git a/openssh-6.6p1-sftp_homechroot.patch b/openssh-6.6p1-sftp_homechroot.patch deleted file mode 100644 index 71f9c83..0000000 --- a/openssh-6.6p1-sftp_homechroot.patch +++ /dev/null @@ -1,373 +0,0 @@ -# run sftp sessions inside a chroot - -diff --git a/openssh-6.6p1/session.c b/openssh-6.6p1/session.c ---- a/openssh-6.6p1/session.c -+++ b/openssh-6.6p1/session.c -@@ -120,16 +120,18 @@ int do_exec(Session *, const char *); - void do_login(Session *, const char *); - #ifdef LOGIN_NEEDS_UTMPX - static void do_pre_login(Session *s); - #endif - void do_child(Session *, const char *); - void do_motd(void); - int check_quietlogin(Session *, const char *); - -+int chroot_no_tree = 0; -+ - static void do_authenticated1(Authctxt *); - static void do_authenticated2(Authctxt *); - - static int session_pty_req(Session *); - - /* import */ - extern ServerOptions options; - extern char *__progname; -@@ -827,16 +829,21 @@ do_exec(Session *s, const char *command) - "subsystem '%.900s'", s->subsys); - } else if (command == NULL) { - snprintf(session_type, sizeof(session_type), "shell"); - } else { - /* NB. we don't log unforced commands to preserve privacy */ - snprintf(session_type, sizeof(session_type), "command"); - } - -+ if ((s->is_subsystem != SUBSYSTEM_INT_SFTP) && chroot_no_tree) { -+ logit("You aren't welcomed, go away!"); -+ exit (1); -+ } -+ - if (s->ttyfd != -1) { - tty = s->tty; - if (strncmp(tty, "/dev/", 5) == 0) - tty += 5; - } - - verbose("Starting session: %s%s%s for %s from %.200s port %d", - session_type, -@@ -1463,67 +1470,132 @@ do_nologin(struct passwd *pw) - while (fgets(buf, sizeof(buf), f)) - fputs(buf, stderr); - fclose(f); - } - exit(254); - } - - /* -+ * Test if filesystem is mounted nosuid and nodev -+ */ -+ -+static void -+test_nosuid (char * path, dev_t fs) -+{ -+ FILE *f; -+ struct stat st; -+ char buf[4096], *s, *on, *mountpoint, *opt; -+ int nodev, nosuid; -+ -+ if (!(f = popen ("/bin/mount", "r"))) -+ fatal ("%s: popen(\"/bin/mount\", \"r\"): %s", -+ __func__, strerror (errno)); -+ for (;;) { -+ s = fgets (buf, sizeof (buf), f); -+ if (ferror (f)) -+ fatal ("%s: read from popen: %s", __func__, -+ strerror (errno)); -+ if (!s) { -+ pclose (f); -+ fatal ("cannot find filesystem with the chroot directory"); -+ } -+ (void) strtok (buf, " "); -+ on = strtok (NULL, " "); -+ if (strcmp (on, "on")) { -+ pclose (f); -+ fatal ("bad format of mount output"); -+ } -+ mountpoint = strtok (NULL, " "); -+ if (memcmp (path, mountpoint, strlen (mountpoint))) -+ continue; -+ if (stat(mountpoint, &st) != 0) { -+ pclose (f); -+ fatal("%s: stat(\"%s\"): %s", __func__, -+ mountpoint, strerror(errno)); -+ } -+ if (fs != st.st_dev) -+ continue; -+ nodev = nosuid = 0; -+ for (opt = strtok (NULL, "("); opt; opt = strtok (NULL, " ,)")) { -+ if (!strcmp (opt, "nodev")) -+ nodev = 1; -+ else if (!strcmp (opt, "nosuid")) -+ nosuid = 1; -+ else if (!strcmp (opt, "noexec")) -+ nosuid = 1; -+ if (nodev && nosuid) { -+ pclose (f); -+ return; -+ } -+ } -+ fatal ("chroot into directory without nodev and either noexec or nosuid"); -+ } -+} -+ -+/* - * Chroot into a directory after checking it for safety: all path components - * must be root-owned directories with strict permissions. - */ - static void - safely_chroot(const char *path, uid_t uid) - { - const char *cp; - char component[MAXPATHLEN]; - struct stat st; -+ int last; - - if (*path != '/') - fatal("chroot path does not begin at root"); - if (strlen(path) >= sizeof(component)) - fatal("chroot path too long"); - - /* - * Descend the path, checking that each component is a - * root-owned directory with strict permissions. - */ - for (cp = path; cp != NULL;) { -- if ((cp = strchr(cp, '/')) == NULL) -+ if (((last = ((cp = strchr(cp, '/')) == NULL)))) - strlcpy(component, path, sizeof(component)); - else { - cp++; - memcpy(component, path, cp - path); - component[cp - path] = '\0'; - } - - debug3("%s: checking '%s'", __func__, component); - - if (stat(component, &st) != 0) - fatal("%s: stat(\"%s\"): %s", __func__, - component, strerror(errno)); -- if (st.st_uid != 0 || (st.st_mode & 022) != 0) -+ if ((st.st_uid != 0 || (st.st_mode & 022) != 0) && !(last && st.st_uid == uid)) - fatal("bad ownership or modes for chroot " - "directory %s\"%s\"", - cp == NULL ? "" : "component ", component); - if (!S_ISDIR(st.st_mode)) - fatal("chroot path %s\"%s\" is not a directory", - cp == NULL ? "" : "component ", component); -- -+ } -+ setenv ("TZ", "/etc/localtime", 0); -+ tzset(); -+ -+ if (st.st_uid) { -+ test_nosuid(path, st.st_dev); -+ ++chroot_no_tree; - } - - if (chdir(path) == -1) - fatal("Unable to chdir to chroot path \"%s\": " - "%s", path, strerror(errno)); - if (chroot(path) == -1) - fatal("chroot(\"%s\"): %s", path, strerror(errno)); - if (chdir("/") == -1) - fatal("%s: chdir(/) after chroot: %s", - __func__, strerror(errno)); -+ - verbose("Changed root directory to \"%s\"", path); - } - - /* Set login name, uid, gid, and groups. */ - void - do_setusercontext(struct passwd *pw) - { - char *chroot_path, *tmp; -diff --git a/openssh-6.6p1/sftp-chrootenv.h b/openssh-6.6p1/sftp-chrootenv.h -new file mode 100644 ---- /dev/null -+++ b/openssh-6.6p1/sftp-chrootenv.h -@@ -0,0 +1,30 @@ -+/* -+ * Copyright (c) 2009 Jan F Chadima. 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. -+ */ -+#ifndef CHROOTENV_H -+#define CHROOTENV_H -+ -+extern int chroot_no_tree; -+ -+#endif -+ -diff --git a/openssh-6.6p1/sftp-common.c b/openssh-6.6p1/sftp-common.c ---- a/openssh-6.6p1/sftp-common.c -+++ b/openssh-6.6p1/sftp-common.c -@@ -42,16 +42,17 @@ - #endif - - #include "xmalloc.h" - #include "buffer.h" - #include "log.h" - - #include "sftp.h" - #include "sftp-common.h" -+#include "sftp-chrootenv.h" - - /* Clear contents of attributes structure */ - void - attrib_clear(Attrib *a) - { - a->flags = 0; - a->size = 0; - a->uid = 0; -@@ -193,23 +194,23 @@ ls_file(const char *name, const struct s - int ulen, glen, sz = 0; - struct tm *ltime = localtime(&st->st_mtime); - char *user, *group; - char buf[1024], mode[11+1], tbuf[12+1], ubuf[11+1], gbuf[11+1]; - char sbuf[FMT_SCALED_STRSIZE]; - time_t now; - - strmode(st->st_mode, mode); -- if (!remote) { -+ if (!remote && !chroot_no_tree) { - user = user_from_uid(st->st_uid, 0); - } else { - snprintf(ubuf, sizeof ubuf, "%u", (u_int)st->st_uid); - user = ubuf; - } -- if (!remote) { -+ if (!remote && !chroot_no_tree) { - group = group_from_gid(st->st_gid, 0); - } else { - snprintf(gbuf, sizeof gbuf, "%u", (u_int)st->st_gid); - group = gbuf; - } - if (ltime != NULL) { - now = time(NULL); - if (now - (365*24*60*60)/2 < st->st_mtime && -diff --git a/openssh-6.6p1/sftp-server-main.c b/openssh-6.6p1/sftp-server-main.c ---- a/openssh-6.6p1/sftp-server-main.c -+++ b/openssh-6.6p1/sftp-server-main.c -@@ -17,21 +17,24 @@ - - #include "includes.h" - - #include - #include - #include - #include - #include -+#include - - #include "log.h" - #include "sftp.h" - #include "misc.h" - -+int chroot_no_tree = 0; -+ - void - cleanup_exit(int i) - { - sftp_server_cleanup_exit(i); - } - - int - main(int argc, char **argv) -diff --git a/openssh-6.6p1/sftp.c b/openssh-6.6p1/sftp.c ---- a/openssh-6.6p1/sftp.c -+++ b/openssh-6.6p1/sftp.c -@@ -109,16 +109,18 @@ struct complete_ctx { - char **remote_pathp; - }; - - int remote_glob(struct sftp_conn *, const char *, int, - int (*)(const char *, int), glob_t *); /* proto for sftp-glob.c */ - - extern char *__progname; - -+int chroot_no_tree = 0; -+ - /* Separators for interactive commands */ - #define WHITESPACE " \t\r\n" - - /* ls flags */ - #define LS_LONG_VIEW 0x0001 /* Full view ala ls -l */ - #define LS_SHORT_VIEW 0x0002 /* Single row view ala ls -1 */ - #define LS_NUMERIC_VIEW 0x0004 /* Long view with numeric uid/gid */ - #define LS_NAME_SORT 0x0008 /* Sort by name (default) */ -diff --git a/openssh-6.6p1/sshd_config.0 b/openssh-6.6p1/sshd_config.0 ---- a/openssh-6.6p1/sshd_config.0 -+++ b/openssh-6.6p1/sshd_config.0 -@@ -189,16 +189,24 @@ DESCRIPTION - session this requires at least a shell, typically sh(1), and - basic /dev nodes such as null(4), zero(4), stdin(4), stdout(4), - stderr(4), arandom(4) and tty(4) devices. For file transfer - sessions using ``sftp'', no additional configuration of the - environment is necessary if the in-process sftp server is used, - though sessions which use logging do require /dev/log inside the - chroot directory (see sftp-server(8) for details). - -+ In the special case when only sftp is used, not ssh nor scp, it -+ is possible to use ChrootDirectory %h or ChrootDirectory -+ /some/path/%u. The file system containing this directory must be -+ mounted with options nodev and either nosuid or noexec. The owner -+ of the directory should be the user. The ownership of the other -+ components of the path must fulfill the usual conditions. No adi- -+ tional files are required to be present in the directory. -+ - The default is not to chroot(2). - - Ciphers - Specifies the ciphers allowed for protocol version 2. Multiple - ciphers must be comma-separated. The supported ciphers are: - - ``3des-cbc'', ``aes128-cbc'', ``aes192-cbc'', ``aes256-cbc'', - ``aes128-ctr'', ``aes192-ctr'', ``aes256-ctr'', -diff --git a/openssh-6.6p1/sshd_config.5 b/openssh-6.6p1/sshd_config.5 ---- a/openssh-6.6p1/sshd_config.5 -+++ b/openssh-6.6p1/sshd_config.5 -@@ -324,16 +324,27 @@ For file transfer sessions using - no additional configuration of the environment is necessary if the - in-process sftp server is used, - though sessions which use logging do require - .Pa /dev/log - inside the chroot directory (see - .Xr sftp-server 8 - for details). - .Pp -+In the special case when only sftp is used, not ssh nor scp, -+it is possible to use -+.Cm ChrootDirectory -+%h or -+.Cm ChrootDirectory -+/some/path/%u. The file system containing this directory must be -+mounted with options nodev and either nosuid or noexec. The owner of the -+directory should be the user. The ownership of the other components of the path -+must fulfill the usual conditions. No aditional files are required to be present -+in the directory. -+.Pp - The default is not to - .Xr chroot 2 . - .It Cm Ciphers - Specifies the ciphers allowed for protocol version 2. - Multiple ciphers must be comma-separated. - The supported ciphers are: - .Pp - .Dq 3des-cbc , diff --git a/openssh-6.6p1.tar.gz b/openssh-6.6p1.tar.gz deleted file mode 100644 index f9e5859..0000000 --- a/openssh-6.6p1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:48c1f0664b4534875038004cc4f3555b8329c2a81c1df48db5c517800de203bb -size 1282502 diff --git a/openssh-6.6p1.tar.gz.asc b/openssh-6.6p1.tar.gz.asc deleted file mode 100644 index defd54e..0000000 --- a/openssh-6.6p1.tar.gz.asc +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (OpenBSD) - -iQGlAwUAUyEVxtPl9Wttkg0wAQr39wx/SkCPbWVsEG2Do7IXKg1FudhKIt8QGQZC -4bNvnwFbFZ/RNEv+BZRKH7AmgNLXn6/VTlRkifF3osrvJ6gh8EfQMkNPB5WcRz5h -c4KdAcL6u/KFxku0x/hjqUaAV980HlUFvAmGv3/YTL8n14uRBRlrVCnG5q1LmIv7 -piBnb+FrAivrNV+PUMkkrC6XKrfR2ns+ZtfgwBQGQ/VuJTQZPOUMp/GLViHBxz4l -G0H52bolzAIunzBxXF9fWwFU8JFtCEharFr7jYuLQzViUPCaf3L9w3yPb2S24wnU -772CEyGbdCJVLmtD9ObaNKk0We6hdc6Dz+mx/JbHkoWSw0LYdHFbjFR75vjNENYh -evRgqLCP91micfhZDQqX6tOLnMfBjxCjHsCYvMlDACiEvxb1Ct6Fm9m1lXIGUsh3 -ssScaCvQItMAvQdjQOdCXS7Zcucfzzx3Fd8Q2X/h2R81yYv6JjYQy7aBV/DaFDzP -/BhCwnq5sP6XW6rHRZGYXhMaAEjZml8ySRFEzW+esnGf9vSJgnQ+Kw== -=H2K/ ------END PGP SIGNATURE----- diff --git a/openssh-6.6p1-X11-forwarding.patch b/openssh-7.2p2-X11_trusted_forwarding.patch similarity index 75% rename from openssh-6.6p1-X11-forwarding.patch rename to openssh-7.2p2-X11_trusted_forwarding.patch index e8c8ef8..ea1353d 100644 --- a/openssh-6.6p1-X11-forwarding.patch +++ b/openssh-7.2p2-X11_trusted_forwarding.patch @@ -1,10 +1,14 @@ +# HG changeset patch +# Parent e75958369c26f618744c229ef1a9925d8ccb1dcb # enable trusted X11 forwarding by default in both sshd and sshsystem-wide # configuration # bnc#50836 (was suse #35836) +Enable Trusted X11 forwarding by default, since the security benefits of +having it disabled are negligible these days with XI2 being widely used. -diff --git a/openssh-6.6p1/ssh_config b/openssh-6.6p1/ssh_config ---- a/openssh-6.6p1/ssh_config -+++ b/openssh-6.6p1/ssh_config +diff --git a/openssh-7.2p2/ssh_config b/openssh-7.2p2/ssh_config +--- a/openssh-7.2p2/ssh_config ++++ b/openssh-7.2p2/ssh_config @@ -12,19 +12,30 @@ # Any configuration value is only changed the first time it is set. # Thus, host-specific definitions should be at the beginning of the @@ -26,8 +30,8 @@ diff --git a/openssh-6.6p1/ssh_config b/openssh-6.6p1/ssh_config +# keystrokes as you type, just like any other X11 client could do. +# Set this to "no" here for global effect or in your own ~/.ssh/config +# file if you want to have the remote X11 authentification data to -+# expire after two minutes after remote login. -+ForwardX11Trusted yes ++# expire after twenty minutes after remote login. ++ ForwardX11Trusted yes + # RhostsRSAAuthentication no # RSAAuthentication yes @@ -37,9 +41,9 @@ diff --git a/openssh-6.6p1/ssh_config b/openssh-6.6p1/ssh_config # GSSAPIDelegateCredentials no # BatchMode no # CheckHostIP yes -diff --git a/openssh-6.6p1/sshd_config b/openssh-6.6p1/sshd_config ---- a/openssh-6.6p1/sshd_config -+++ b/openssh-6.6p1/sshd_config +diff --git a/openssh-7.2p2/sshd_config b/openssh-7.2p2/sshd_config +--- a/openssh-7.2p2/sshd_config ++++ b/openssh-7.2p2/sshd_config @@ -94,17 +94,17 @@ AuthorizedKeysFile .ssh/authorized_keys # If you just want the PAM account and session checks to run without # PAM authentication, then enable this but set PasswordAuthentication @@ -58,4 +62,4 @@ diff --git a/openssh-6.6p1/sshd_config b/openssh-6.6p1/sshd_config #PrintLastLog yes #TCPKeepAlive yes #UseLogin no - UsePrivilegeSeparation sandbox # Default for new installations. + #UsePrivilegeSeparation sandbox diff --git a/openssh-7.2p2-allow_root_password_login.patch b/openssh-7.2p2-allow_root_password_login.patch new file mode 100644 index 0000000..c3ac349 --- /dev/null +++ b/openssh-7.2p2-allow_root_password_login.patch @@ -0,0 +1,95 @@ +# HG changeset patch +# Parent dff5e86b989543049cc51bb57e75a63c1942cda3 +Allow root login with password by default. While less secure than upstream +default of forbidding access to the root account with a password, we are +temporarily introducing this change to keep the default used in older OpenSSH +versions shipped with SLE. + +diff --git a/openssh-7.2p2/servconf.c b/openssh-7.2p2/servconf.c +--- a/openssh-7.2p2/servconf.c ++++ b/openssh-7.2p2/servconf.c +@@ -233,17 +233,17 @@ fill_default_server_options(ServerOption + options->pid_file = xstrdup(_PATH_SSH_DAEMON_PID_FILE); + if (options->server_key_bits == -1) + options->server_key_bits = 1024; + if (options->login_grace_time == -1) + options->login_grace_time = 120; + if (options->key_regeneration_time == -1) + options->key_regeneration_time = 3600; + if (options->permit_root_login == PERMIT_NOT_SET) +- options->permit_root_login = PERMIT_NO_PASSWD; ++ options->permit_root_login = PERMIT_YES; + if (options->ignore_rhosts == -1) + options->ignore_rhosts = 1; + if (options->ignore_user_known_hosts == -1) + options->ignore_user_known_hosts = 0; + if (options->print_motd == -1) + options->print_motd = 1; + if (options->print_lastlog == -1) + options->print_lastlog = 1; +diff --git a/openssh-7.2p2/sshd_config b/openssh-7.2p2/sshd_config +--- a/openssh-7.2p2/sshd_config ++++ b/openssh-7.2p2/sshd_config +@@ -36,17 +36,17 @@ + # Logging + # obsoletes QuietMode and FascistLogging + #SyslogFacility AUTH + #LogLevel INFO + + # Authentication: + + #LoginGraceTime 2m +-#PermitRootLogin prohibit-password ++#PermitRootLogin yes + #StrictModes yes + #MaxAuthTries 6 + #MaxSessions 10 + + #RSAAuthentication yes + #PubkeyAuthentication yes + + # The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 +diff --git a/openssh-7.2p2/sshd_config.0 b/openssh-7.2p2/sshd_config.0 +--- a/openssh-7.2p2/sshd_config.0 ++++ b/openssh-7.2p2/sshd_config.0 +@@ -710,17 +710,17 @@ DESCRIPTION + restrictions and permit any forwarding requests. An argument of + M-bM-^@M-^\noneM-bM-^@M-^] can be used to prohibit all forwarding requests. By + default all port forwarding requests are permitted. + + PermitRootLogin + Specifies whether root can log in using ssh(1). The argument + must be M-bM-^@M-^\yesM-bM-^@M-^], M-bM-^@M-^\prohibit-passwordM-bM-^@M-^], M-bM-^@M-^\without-passwordM-bM-^@M-^], + M-bM-^@M-^\forced-commands-onlyM-bM-^@M-^], or M-bM-^@M-^\noM-bM-^@M-^]. The default is +- M-bM-^@M-^\prohibit-passwordM-bM-^@M-^]. ++ M-bM-^@M-^\yesM-bM-^@M-^]. + + If this option is set to M-bM-^@M-^\prohibit-passwordM-bM-^@M-^] or + M-bM-^@M-^\without-passwordM-bM-^@M-^], password and keyboard-interactive + authentication are disabled for root. + + If this option is set to M-bM-^@M-^\forced-commands-onlyM-bM-^@M-^], root login with + public key authentication will be allowed, but only if the + command option has been specified (which may be useful for taking +diff --git a/openssh-7.2p2/sshd_config.5 b/openssh-7.2p2/sshd_config.5 +--- a/openssh-7.2p2/sshd_config.5 ++++ b/openssh-7.2p2/sshd_config.5 +@@ -1213,17 +1213,17 @@ Specifies whether root can log in using + The argument must be + .Dq yes , + .Dq prohibit-password , + .Dq without-password , + .Dq forced-commands-only , + or + .Dq no . + The default is +-.Dq prohibit-password . ++.Dq yes . + .Pp + If this option is set to + .Dq prohibit-password + or + .Dq without-password , + password and keyboard-interactive authentication are disabled for root. + .Pp + If this option is set to diff --git a/openssh-6.6p1-blocksigalrm.patch b/openssh-7.2p2-blocksigalrm.patch similarity index 79% rename from openssh-6.6p1-blocksigalrm.patch rename to openssh-7.2p2-blocksigalrm.patch index 1cd7f05..fdc1fe1 100644 --- a/openssh-6.6p1-blocksigalrm.patch +++ b/openssh-7.2p2-blocksigalrm.patch @@ -1,18 +1,21 @@ -# block SIGALRM while logging through syslog to prevent deadlocks (through -# grace_alarm_handler) -# bnc#57354 +# HG changeset patch +# Parent a80e23747c8fbba7302c5a7ccb6b206d96093e42 +block SIGALRM while logging through syslog to prevent deadlocks +(through grace_alarm_handler()) -diff --git a/openssh-6.6p1/log.c b/openssh-6.6p1/log.c ---- a/openssh-6.6p1/log.c -+++ b/openssh-6.6p1/log.c -@@ -47,16 +47,17 @@ +bnc#57354 + +diff --git a/openssh-7.2p2/log.c b/openssh-7.2p2/log.c +--- a/openssh-7.2p2/log.c ++++ b/openssh-7.2p2/log.c +@@ -46,16 +46,17 @@ + #include #include #include #if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS) # include #endif - #include "xmalloc.h" #include "log.h" +#include @@ -23,7 +26,7 @@ diff --git a/openssh-6.6p1/log.c b/openssh-6.6p1/log.c static char *argv0; static log_handler_fn *log_handler; static void *log_handler_ctx; -@@ -384,16 +385,17 @@ do_log(LogLevel level, const char *fmt, +@@ -383,16 +384,17 @@ do_log(LogLevel level, const char *fmt, { #if defined(HAVE_OPENLOG_R) && defined(SYSLOG_DATA_INIT) struct syslog_data sdata = SYSLOG_DATA_INIT; @@ -41,7 +44,7 @@ diff --git a/openssh-6.6p1/log.c b/openssh-6.6p1/log.c switch (level) { case SYSLOG_LEVEL_FATAL: -@@ -442,20 +444,29 @@ do_log(LogLevel level, const char *fmt, +@@ -441,20 +443,29 @@ do_log(LogLevel level, const char *fmt, tmp_handler = log_handler; log_handler = NULL; tmp_handler(level, fmtbuf, log_handler_ctx); diff --git a/openssh-7.2p2-disable_short_DH_parameters.patch b/openssh-7.2p2-disable_short_DH_parameters.patch new file mode 100644 index 0000000..8f3ef15 --- /dev/null +++ b/openssh-7.2p2-disable_short_DH_parameters.patch @@ -0,0 +1,345 @@ +# HG changeset patch +# Parent 7e46491ef372d47617499c58acf2ea66216858d2 + +Raise minimal size of DH group parameters to 2048 bits like upstream did in +7.2. 1024b values are believed to be in breaking range for state adversaries +and the default moduli shipped with openssh have been around long enough to +make it more likely for them to be broken. + +Also provide an option that allows the client to accept shorter (RFC4419 +compliant) parameters. + +CVE-2015-4000 (LOGJAM) +bsc#932483 + +diff --git a/openssh-7.2p2/dh.c b/openssh-7.2p2/dh.c +--- a/openssh-7.2p2/dh.c ++++ b/openssh-7.2p2/dh.c +@@ -37,16 +37,18 @@ + #include + + #include "dh.h" + #include "pathnames.h" + #include "log.h" + #include "misc.h" + #include "ssherr.h" + ++int dh_grp_min = DH_GRP_MIN; ++ + static int + parse_prime(int linenum, char *line, struct dhgroup *dhg) + { + char *cp, *arg; + char *strsize, *gen, *prime; + const char *errstr = NULL; + long long n; + +diff --git a/openssh-7.2p2/dh.h b/openssh-7.2p2/dh.h +--- a/openssh-7.2p2/dh.h ++++ b/openssh-7.2p2/dh.h +@@ -43,16 +43,17 @@ int dh_gen_key(DH *, int); + int dh_pub_is_valid(DH *, BIGNUM *); + + u_int dh_estimate(int); + + /* + * Max value from RFC4419. + * Miniumum increased in light of DH precomputation attacks. + */ ++#define DH_GRP_MIN_RFC 1024 + #define DH_GRP_MIN 2048 + #define DH_GRP_MAX 8192 + + /* + * Values for "type" field of moduli(5) + * Specifies the internal structure of the prime modulus. + */ + #define MODULI_TYPE_UNKNOWN (0) +diff --git a/openssh-7.2p2/kexgexc.c b/openssh-7.2p2/kexgexc.c +--- a/openssh-7.2p2/kexgexc.c ++++ b/openssh-7.2p2/kexgexc.c +@@ -46,29 +46,32 @@ + #include "packet.h" + #include "dh.h" + #include "ssh2.h" + #include "compat.h" + #include "dispatch.h" + #include "ssherr.h" + #include "sshbuf.h" + ++/* import from dh.c */ ++extern int dh_grp_min; ++ + static int input_kex_dh_gex_group(int, u_int32_t, void *); + static int input_kex_dh_gex_reply(int, u_int32_t, void *); + + int + kexgex_client(struct ssh *ssh) + { + struct kex *kex = ssh->kex; + int r; + u_int nbits; + + nbits = dh_estimate(kex->dh_need * 8); + +- kex->min = DH_GRP_MIN; ++ kex->min = dh_grp_min; + kex->max = DH_GRP_MAX; + kex->nbits = nbits; + if (datafellows & SSH_BUG_DHGEX_LARGE) + kex->nbits = MIN(kex->nbits, 4096); + /* New GEX request */ + if ((r = sshpkt_start(ssh, SSH2_MSG_KEX_DH_GEX_REQUEST)) != 0 || + (r = sshpkt_put_u32(ssh, kex->min)) != 0 || + (r = sshpkt_put_u32(ssh, kex->nbits)) != 0 || +@@ -104,16 +107,22 @@ input_kex_dh_gex_group(int type, u_int32 + goto out; + } + if ((r = sshpkt_get_bignum2(ssh, p)) != 0 || + (r = sshpkt_get_bignum2(ssh, g)) != 0 || + (r = sshpkt_get_end(ssh)) != 0) + goto out; + if ((bits = BN_num_bits(p)) < 0 || + (u_int)bits < kex->min || (u_int)bits > kex->max) { ++ if (bits < kex->min && bits >= DH_GRP_MIN_RFC) ++ logit("DH parameter offered by the server (%d bits) " ++ "is considered insecure. " ++ "You can lower the accepted the minimum " ++ "via the KexDHMin option.", ++ bits); + r = SSH_ERR_DH_GEX_OUT_OF_RANGE; + goto out; + } + if ((kex->dh = dh_new_group(g, p)) == NULL) { + r = SSH_ERR_ALLOC_FAIL; + goto out; + } + p = g = NULL; /* belong to kex->dh now */ +diff --git a/openssh-7.2p2/readconf.c b/openssh-7.2p2/readconf.c +--- a/openssh-7.2p2/readconf.c ++++ b/openssh-7.2p2/readconf.c +@@ -56,16 +56,17 @@ + #include "misc.h" + #include "readconf.h" + #include "match.h" + #include "kex.h" + #include "mac.h" + #include "uidswap.h" + #include "myproposal.h" + #include "digest.h" ++#include "dh.h" + + /* Format of the configuration file: + + # Configuration data is parsed as follows: + # 1. command line options + # 2. user-specific file + # 3. system-wide file + # Any configuration value is only changed the first time it is set. +@@ -148,17 +149,18 @@ typedef enum { + oClearAllForwardings, oNoHostAuthenticationForLocalhost, + oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, + oAddressFamily, oGssAuthentication, oGssDelegateCreds, + oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, + oSendEnv, oControlPath, oControlMaster, oControlPersist, + oHashKnownHosts, + oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, + oVisualHostKey, +- oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass, ++ oKexAlgorithms, oKexDHMin, ++ oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass, + oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots, + oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs, + oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys, + oFingerprintHash, oUpdateHostkeys, oHostbasedKeyTypes, + oPubkeyAcceptedKeyTypes, + oIgnoredUnknownOption, oDeprecated, oUnsupported + } OpCodes; + +@@ -260,16 +262,17 @@ static struct { + { "hashknownhosts", oHashKnownHosts }, + { "tunnel", oTunnel }, + { "tunneldevice", oTunnelDevice }, + { "localcommand", oLocalCommand }, + { "permitlocalcommand", oPermitLocalCommand }, + { "visualhostkey", oVisualHostKey }, + { "useroaming", oDeprecated }, + { "kexalgorithms", oKexAlgorithms }, ++ { "kexdhmin", oKexDHMin }, + { "ipqos", oIPQoS }, + { "requesttty", oRequestTTY }, + { "proxyusefdpass", oProxyUseFdpass }, + { "canonicaldomains", oCanonicalDomains }, + { "canonicalizefallbacklocal", oCanonicalizeFallbackLocal }, + { "canonicalizehostname", oCanonicalizeHostname }, + { "canonicalizemaxdots", oCanonicalizeMaxDots }, + { "canonicalizepermittedcnames", oCanonicalizePermittedCNAMEs }, +@@ -280,16 +283,19 @@ static struct { + { "updatehostkeys", oUpdateHostkeys }, + { "hostbasedkeytypes", oHostbasedKeyTypes }, + { "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes }, + { "ignoreunknown", oIgnoreUnknown }, + + { NULL, oBadOption } + }; + ++/* import from dh.c */ ++extern int dh_grp_min; ++ + /* + * Adds a local TCP/IP port forward to options. Never returns if there is an + * error. + */ + + void + add_local_forward(Options *options, const struct Forward *newfwd) + { +@@ -1157,16 +1163,20 @@ parse_int: + filename, linenum); + if (!kex_names_valid(*arg == '+' ? arg + 1 : arg)) + fatal("%.200s line %d: Bad SSH2 KexAlgorithms '%s'.", + filename, linenum, arg ? arg : ""); + if (*activep && options->kex_algorithms == NULL) + options->kex_algorithms = xstrdup(arg); + break; + ++ case oKexDHMin: ++ intptr = &options->kex_dhmin; ++ goto parse_int; ++ + case oHostKeyAlgorithms: + charptr = &options->hostkeyalgorithms; + parse_keytypes: + arg = strdelim(&s); + if (!arg || *arg == '\0') + fatal("%.200s line %d: Missing argument.", + filename, linenum); + if (!sshkey_names_valid2(*arg == '+' ? arg + 1 : arg, 1)) +@@ -1664,16 +1674,17 @@ initialize_options(Options * options) + options->address_family = -1; + options->connection_attempts = -1; + options->connection_timeout = -1; + options->number_of_password_prompts = -1; + options->cipher = -1; + options->ciphers = NULL; + options->macs = NULL; + options->kex_algorithms = NULL; ++ options->kex_dhmin = -1; + options->hostkeyalgorithms = NULL; + options->protocol = SSH_PROTO_UNKNOWN; + options->num_identity_files = 0; + options->num_certificate_files = 0; + options->hostname = NULL; + options->host_key_alias = NULL; + options->proxy_command = NULL; + options->user = NULL; +@@ -1805,16 +1816,23 @@ fill_default_options(Options * options) + options->address_family = AF_UNSPEC; + if (options->connection_attempts == -1) + options->connection_attempts = 1; + if (options->number_of_password_prompts == -1) + options->number_of_password_prompts = 3; + /* Selected in ssh_login(). */ + if (options->cipher == -1) + options->cipher = SSH_CIPHER_NOT_SET; ++ if (options->kex_dhmin == -1) ++ options->kex_dhmin = DH_GRP_MIN; ++ else { ++ options->kex_dhmin = MAX(options->kex_dhmin, DH_GRP_MIN_RFC); ++ options->kex_dhmin = MIN(options->kex_dhmin, DH_GRP_MAX); ++ } ++ dh_grp_min = options->kex_dhmin; + /* options->hostkeyalgorithms, default set in myproposals.h */ + if (options->protocol == SSH_PROTO_UNKNOWN) + options->protocol = SSH_PROTO_2; + if (options->add_keys_to_agent == -1) + options->add_keys_to_agent = 0; + if (options->num_identity_files == 0) { + if (options->protocol & SSH_PROTO_1) { + add_identity_file(options, "~/", +diff --git a/openssh-7.2p2/readconf.h b/openssh-7.2p2/readconf.h +--- a/openssh-7.2p2/readconf.h ++++ b/openssh-7.2p2/readconf.h +@@ -69,16 +69,17 @@ typedef struct { + * aborting connection attempt */ + int number_of_password_prompts; /* Max number of password + * prompts. */ + int cipher; /* Cipher to use. */ + char *ciphers; /* SSH2 ciphers in order of preference. */ + char *macs; /* SSH2 macs in order of preference. */ + char *hostkeyalgorithms; /* SSH2 server key types in order of preference. */ + char *kex_algorithms; /* SSH2 kex methods in order of preference. */ ++ int kex_dhmin; /* minimum bit length of the DH group parameter */ + int protocol; /* Protocol in order of preference. */ + char *hostname; /* Real host to connect. */ + char *host_key_alias; /* hostname alias for .ssh/known_hosts */ + char *proxy_command; /* Proxy command for connecting the host. */ + char *user; /* User to log in as. */ + int escape_char; /* Escape character; -2 = none */ + + u_int num_system_hostfiles; /* Paths for /etc/ssh/ssh_known_hosts */ +diff --git a/openssh-7.2p2/ssh_config.0 b/openssh-7.2p2/ssh_config.0 +--- a/openssh-7.2p2/ssh_config.0 ++++ b/openssh-7.2p2/ssh_config.0 +@@ -606,16 +606,29 @@ DESCRIPTION + ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, + diffie-hellman-group-exchange-sha256, + diffie-hellman-group-exchange-sha1, + diffie-hellman-group14-sha1 + + The list of available key exchange algorithms may also be + obtained using the -Q option of ssh(1) with an argument of M-bM-^@M-^\kexM-bM-^@M-^]. + ++ KexDHMin ++ Specifies the minimum accepted bit length of the DH group parameter p. ++ As per RFC4419, this is 1024 bits however, this has increasingly ++ been seen as insecure, which prompted the change to 2048 bits. ++ Setting this option allows the client to accept parameters shorter ++ than the current minimum, down to the RFC specified 1024 bits. ++ Using this option may be needed when connecting to servers that ++ only know short DH group parameters. ++ ++ Note that using this option can severly impact security and thus ++ should be viewed as a temporary fix of last resort and all efforts ++ should be made to fix the server. ++ + LocalCommand + Specifies a command to execute on the local machine after + successfully connecting to the server. The command string + extends to the end of the line, and is executed with the user's + shell. The following escape character substitutions will be + performed: M-bM-^@M-^X%dM-bM-^@M-^Y (local user's home directory), M-bM-^@M-^X%hM-bM-^@M-^Y (remote host + name), M-bM-^@M-^X%lM-bM-^@M-^Y (local host name), M-bM-^@M-^X%nM-bM-^@M-^Y (host name as provided on the + command line), M-bM-^@M-^X%pM-bM-^@M-^Y (remote port), M-bM-^@M-^X%rM-bM-^@M-^Y (remote user name) or +diff --git a/openssh-7.2p2/ssh_config.5 b/openssh-7.2p2/ssh_config.5 +--- a/openssh-7.2p2/ssh_config.5 ++++ b/openssh-7.2p2/ssh_config.5 +@@ -1092,16 +1092,28 @@ diffie-hellman-group14-sha1 + .Ed + .Pp + The list of available key exchange algorithms may also be obtained using the + .Fl Q + option of + .Xr ssh 1 + with an argument of + .Dq kex . ++.It Cm KexDHMin ++Specifies the minimum accepted bit length of the DH group parameter p. ++As per RFC4419, this is 1024 bits however, this has increasingly ++been seen as insecure, which prompted the change to 2048 bits. ++Setting this option allows the client to accept parameters shorter ++than the current minimum, down to the RFC specified 1024 bits. ++Using this option may be needed when connecting to servers that ++only know short DH group parameters. ++ ++Note that using this option can severly impact security and thus ++should be viewed as a temporary fix of last resort and all efforts ++should be made to fix the server. + .It Cm LocalCommand + Specifies a command to execute on the local machine after successfully + connecting to the server. + The command string extends to the end of the line, and is executed with + the user's shell. + The following escape character substitutions will be performed: + .Ql %d + (local user's home directory), diff --git a/openssh-6.6p1-pam-fix3.patch b/openssh-7.2p2-dont_use_pthreads_in_PAM.patch similarity index 71% rename from openssh-6.6p1-pam-fix3.patch rename to openssh-7.2p2-dont_use_pthreads_in_PAM.patch index 1ea333c..dc2abf2 100644 --- a/openssh-6.6p1-pam-fix3.patch +++ b/openssh-7.2p2-dont_use_pthreads_in_PAM.patch @@ -1,10 +1,12 @@ +# HG changeset patch +# Parent 779a907d59d4907d10a8f0b3f52a38d8bdf115b6 # posix threads are generally not supported nor safe # (see upstream log from 2005-05-24) -diff --git a/openssh-6.6p1/auth-pam.c b/openssh-6.6p1/auth-pam.c ---- a/openssh-6.6p1/auth-pam.c -+++ b/openssh-6.6p1/auth-pam.c -@@ -781,17 +781,19 @@ sshpam_query(void *ctx, char **name, cha +diff --git a/openssh-7.2p2/auth-pam.c b/openssh-7.2p2/auth-pam.c +--- a/openssh-7.2p2/auth-pam.c ++++ b/openssh-7.2p2/auth-pam.c +@@ -782,17 +782,19 @@ sshpam_query(void *ctx, char **name, cha } if (type == PAM_SUCCESS) { if (!sshpam_authctxt->valid || diff --git a/openssh-6.6p1-eal3.patch b/openssh-7.2p2-eal3.patch similarity index 70% rename from openssh-6.6p1-eal3.patch rename to openssh-7.2p2-eal3.patch index a3058d3..49e8b7b 100644 --- a/openssh-6.6p1-eal3.patch +++ b/openssh-7.2p2-eal3.patch @@ -1,9 +1,11 @@ -# fix paths and references in sshd man pages +# HG changeset patch +# Parent 8a9b47df710e3a0bbea4af0f9274bb175944a8a9 +fix paths and references in sshd man pages -diff --git a/openssh-6.6p1/sshd.8 b/openssh-6.6p1/sshd.8 ---- a/openssh-6.6p1/sshd.8 -+++ b/openssh-6.6p1/sshd.8 -@@ -875,17 +875,17 @@ See +diff --git a/openssh-7.2p2/sshd.8 b/openssh-7.2p2/sshd.8 +--- a/openssh-7.2p2/sshd.8 ++++ b/openssh-7.2p2/sshd.8 +@@ -901,17 +901,17 @@ See If this file exists, .Nm refuses to let anyone except root log in. @@ -22,7 +24,8 @@ diff --git a/openssh-6.6p1/sshd.8 b/openssh-6.6p1/sshd.8 .It Pa /etc/ssh/ssh_host_key .It Pa /etc/ssh/ssh_host_dsa_key .It Pa /etc/ssh/ssh_host_ecdsa_key -@@ -956,17 +956,17 @@ The content of this file is not sensitiv +@@ -981,17 +981,17 @@ The content of this file is not sensitiv + .Xr scp 1 , .Xr sftp 1 , .Xr ssh 1 , .Xr ssh-add 1 , @@ -30,7 +33,6 @@ diff --git a/openssh-6.6p1/sshd.8 b/openssh-6.6p1/sshd.8 .Xr ssh-keygen 1 , .Xr ssh-keyscan 1 , .Xr chroot 2 , - .Xr hosts_access 5 , -.Xr login.conf 5 , +.Xr login.defs 5 , .Xr moduli 5 , @@ -41,19 +43,19 @@ diff --git a/openssh-6.6p1/sshd.8 b/openssh-6.6p1/sshd.8 OpenSSH is a derivative of the original and free ssh 1.2.12 release by Tatu Ylonen. Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, -diff --git a/openssh-6.6p1/sshd_config.5 b/openssh-6.6p1/sshd_config.5 ---- a/openssh-6.6p1/sshd_config.5 -+++ b/openssh-6.6p1/sshd_config.5 -@@ -278,18 +278,17 @@ The contents of the specified file are s +diff --git a/openssh-7.2p2/sshd_config.5 b/openssh-7.2p2/sshd_config.5 +--- a/openssh-7.2p2/sshd_config.5 ++++ b/openssh-7.2p2/sshd_config.5 +@@ -370,18 +370,17 @@ for details). + The contents of the specified file are sent to the remote user before authentication is allowed. If the argument is .Dq none then no banner is displayed. - This option is only available for protocol version 2. By default, no banner is displayed. .It Cm ChallengeResponseAuthentication Specifies whether challenge-response authentication is allowed (e.g. via --PAM or though authentication styles supported in +-PAM or through authentication styles supported in -.Xr login.conf 5 ) +PAM) The default is @@ -62,9 +64,9 @@ diff --git a/openssh-6.6p1/sshd_config.5 b/openssh-6.6p1/sshd_config.5 Specifies the pathname of a directory to .Xr chroot 2 to after authentication. - All components of the pathname must be root-owned directories that are - not writable by any other user or group. -@@ -576,17 +575,17 @@ and + At session startup + .Xr sshd 8 +@@ -766,17 +765,17 @@ and .Pa .shosts files will not be used in .Cm RhostsRSAAuthentication diff --git a/openssh-6.6p1-pam-fix2.patch b/openssh-7.2p2-enable_PAM_by_default.patch similarity index 87% rename from openssh-6.6p1-pam-fix2.patch rename to openssh-7.2p2-enable_PAM_by_default.patch index 16c0db9..14530a1 100644 --- a/openssh-6.6p1-pam-fix2.patch +++ b/openssh-7.2p2-enable_PAM_by_default.patch @@ -1,9 +1,11 @@ +# HG changeset patch +# Parent 40536816550c893d5ee67f90f3a917e79f73a163 # force PAM in defaullt install (this was removed from upstream in 3.8p1) # bnc#46749 -diff --git a/openssh-6.6p1/sshd_config b/openssh-6.6p1/sshd_config ---- a/openssh-6.6p1/sshd_config -+++ b/openssh-6.6p1/sshd_config +diff --git a/openssh-7.2p2/sshd_config b/openssh-7.2p2/sshd_config +--- a/openssh-7.2p2/sshd_config ++++ b/openssh-7.2p2/sshd_config @@ -64,17 +64,17 @@ AuthorizedKeysFile .ssh/authorized_keys #HostbasedAuthentication no # Change to yes if you don't trust ~/.ssh/known_hosts for diff --git a/openssh-6.6p1-xauthlocalhostname.patch b/openssh-7.2p2-hostname_changes_when_forwarding_X.patch similarity index 83% rename from openssh-6.6p1-xauthlocalhostname.patch rename to openssh-7.2p2-hostname_changes_when_forwarding_X.patch index c054cfe..6e24097 100644 --- a/openssh-6.6p1-xauthlocalhostname.patch +++ b/openssh-7.2p2-hostname_changes_when_forwarding_X.patch @@ -1,10 +1,13 @@ -# handle hostname changes when forwarding X -# bnc#98627 +# HG changeset patch +# Parent d5e9457ee640bdd816edb9c67792cddb00c229b9 +handle hostname changes when forwarding X -diff --git a/openssh-6.6p1/session.c b/openssh-6.6p1/session.c ---- a/openssh-6.6p1/session.c -+++ b/openssh-6.6p1/session.c -@@ -1146,17 +1146,17 @@ copy_environment(char **source, char *** +bnc#98627 + +diff --git a/openssh-7.2p2/session.c b/openssh-7.2p2/session.c +--- a/openssh-7.2p2/session.c ++++ b/openssh-7.2p2/session.c +@@ -1154,17 +1154,17 @@ copy_environment(char **source, char *** debug3("Copy environment: %s=%s", var_name, var_val); child_set_env(env, envsize, var_name, var_val); @@ -23,7 +26,7 @@ diff --git a/openssh-6.6p1/session.c b/openssh-6.6p1/session.c #if !defined (HAVE_LOGIN_CAP) && !defined (HAVE_CYGWIN) char *path = NULL; #endif -@@ -1333,25 +1333,27 @@ do_setup_env(Session *s, const char *she +@@ -1341,25 +1341,27 @@ do_setup_env(Session *s, const char *she read_environment_file(&env, &envsize, buf); } if (debug_flag) { @@ -52,7 +55,7 @@ diff --git a/openssh-6.6p1/session.c b/openssh-6.6p1/session.c do_xauth = s->display != NULL && s->auth_proto != NULL && s->auth_data != NULL; -@@ -1395,22 +1397,30 @@ do_rc_files(Session *s, const char *shel +@@ -1404,22 +1406,30 @@ do_rc_files(Session *s, const char *shel "%.500s add %.100s %.100s %.100s\n", options.xauth_location, s->auth_display, s->auth_proto, s->auth_data); @@ -83,7 +86,7 @@ diff --git a/openssh-6.6p1/session.c b/openssh-6.6p1/session.c } static void -@@ -1664,16 +1674,17 @@ child_close_fds(void) +@@ -1681,16 +1691,17 @@ child_close_fds(void) * ids, and executing the command or shell. */ #define ARGV_MAX 10 @@ -101,7 +104,7 @@ diff --git a/openssh-6.6p1/session.c b/openssh-6.6p1/session.c /* remove hostkey from the child's memory */ destroy_sensitive_data(); -@@ -1730,17 +1741,17 @@ do_child(Session *s, const char *command +@@ -1747,17 +1758,17 @@ do_child(Session *s, const char *command * legal, and means /bin/sh. */ shell = (pw->pw_shell[0] == '\0') ? _PATH_BSHELL : pw->pw_shell; @@ -120,8 +123,8 @@ diff --git a/openssh-6.6p1/session.c b/openssh-6.6p1/session.c /* we have to stash the hostname before we close our socket. */ if (options.use_login) hostname = get_remote_name_or_ip(utmp_len, -@@ -1799,17 +1810,17 @@ do_child(Session *s, const char *command - strerror(errno)); +@@ -1816,17 +1827,17 @@ do_child(Session *s, const char *command + } if (r) exit(1); } diff --git a/openssh-6.6p1-lastlog.patch b/openssh-7.2p2-lastlog.patch similarity index 67% rename from openssh-6.6p1-lastlog.patch rename to openssh-7.2p2-lastlog.patch index 4aceaee..31398d1 100644 --- a/openssh-6.6p1-lastlog.patch +++ b/openssh-7.2p2-lastlog.patch @@ -1,10 +1,12 @@ +# HG changeset patch +# Parent 9b5b0f2772591aaeb0ecd4c982a9d64242ed6c8b # set uid for functions that use it to seek in lastlog and wtmp files # bnc#18024 (was suse #3024) -diff --git a/openssh-6.6p1/sshlogin.c b/openssh-6.6p1/sshlogin.c ---- a/openssh-6.6p1/sshlogin.c -+++ b/openssh-6.6p1/sshlogin.c -@@ -128,16 +128,17 @@ record_login(pid_t pid, const char *tty, +diff --git a/openssh-7.2p2/sshlogin.c b/openssh-7.2p2/sshlogin.c +--- a/openssh-7.2p2/sshlogin.c ++++ b/openssh-7.2p2/sshlogin.c +@@ -129,16 +129,17 @@ record_login(pid_t pid, const char *tty, { struct logininfo *li; diff --git a/openssh-6.6p1-pam-check-locks.patch b/openssh-7.2p2-pam_check_locks.patch similarity index 78% rename from openssh-6.6p1-pam-check-locks.patch rename to openssh-7.2p2-pam_check_locks.patch index 1ac4580..e222ebf 100644 --- a/openssh-6.6p1-pam-check-locks.patch +++ b/openssh-7.2p2-pam_check_locks.patch @@ -1,11 +1,14 @@ -# new option UsePAMCheckLocks to enforce checking for locked accounts while -# UsePAM is used -# bnc#708678, FATE#312033 +# HG changeset patch +# Parent 9b211a1de83fa39e4b7bb36c8bd1b5fdc2bd8085 +new option UsePAMCheckLocks to enforce checking for locked accounts while +UsePAM is used -diff --git a/openssh-6.6p1/auth.c b/openssh-6.6p1/auth.c ---- a/openssh-6.6p1/auth.c -+++ b/openssh-6.6p1/auth.c -@@ -103,17 +103,17 @@ allowed_user(struct passwd * pw) +bnc#708678, FATE#312033 + +diff --git a/openssh-7.2p2/auth.c b/openssh-7.2p2/auth.c +--- a/openssh-7.2p2/auth.c ++++ b/openssh-7.2p2/auth.c +@@ -104,17 +104,17 @@ allowed_user(struct passwd * pw) struct spwd *spw = NULL; #endif @@ -24,7 +27,7 @@ diff --git a/openssh-6.6p1/auth.c b/openssh-6.6p1/auth.c #endif /* USE_SHADOW */ /* grab passwd field for locked account check */ -@@ -123,17 +123,17 @@ allowed_user(struct passwd * pw) +@@ -124,17 +124,17 @@ allowed_user(struct passwd * pw) #ifdef USE_LIBIAF passwd = get_iaf_password(pw); #else @@ -43,10 +46,10 @@ diff --git a/openssh-6.6p1/auth.c b/openssh-6.6p1/auth.c #endif #ifdef LOCKED_PASSWD_PREFIX if (strncmp(passwd, LOCKED_PASSWD_PREFIX, -diff --git a/openssh-6.6p1/servconf.c b/openssh-6.6p1/servconf.c ---- a/openssh-6.6p1/servconf.c -+++ b/openssh-6.6p1/servconf.c -@@ -66,16 +66,17 @@ extern Buffer cfg; +diff --git a/openssh-7.2p2/servconf.c b/openssh-7.2p2/servconf.c +--- a/openssh-7.2p2/servconf.c ++++ b/openssh-7.2p2/servconf.c +@@ -69,16 +69,17 @@ extern Buffer cfg; void initialize_server_options(ServerOptions *options) @@ -60,16 +63,16 @@ diff --git a/openssh-6.6p1/servconf.c b/openssh-6.6p1/servconf.c /* Standard Options */ options->num_ports = 0; options->ports_from_cmdline = 0; + options->queued_listen_addrs = NULL; + options->num_queued_listens = 0; options->listen_addrs = NULL; options->address_family = -1; - options->num_host_key_files = 0; - options->num_host_cert_files = 0; -@@ -157,16 +158,18 @@ initialize_server_options(ServerOptions - } - +@@ -195,16 +196,18 @@ assemble_algorithms(ServerOptions *o) void fill_default_server_options(ServerOptions *options) { + int i; + /* Portable-specific options */ if (options->use_pam == -1) options->use_pam = 0; @@ -83,7 +86,7 @@ diff --git a/openssh-6.6p1/servconf.c b/openssh-6.6p1/servconf.c /* fill default hostkeys for protocols */ if (options->protocol & SSH_PROTO_1) options->host_key_files[options->num_host_key_files++] = -@@ -317,17 +320,17 @@ fill_default_server_options(ServerOption +@@ -391,17 +394,17 @@ fill_default_server_options(ServerOption #endif } @@ -95,14 +98,14 @@ diff --git a/openssh-6.6p1/servconf.c b/openssh-6.6p1/servconf.c - sUsePAM, + sUsePAM, sUsePAMChecklocks, /* Standard Options */ - sPort, sHostKeyFile, sServerKeyBits, sLoginGraceTime, sKeyRegenerationTime, - sPermitRootLogin, sLogFacility, sLogLevel, + sPort, sHostKeyFile, sServerKeyBits, sLoginGraceTime, + sKeyRegenerationTime, sPermitRootLogin, sLogFacility, sLogLevel, sRhostsRSAAuthentication, sRSAAuthentication, sKerberosAuthentication, sKerberosOrLocalPasswd, sKerberosTicketCleanup, sKerberosGetAFSToken, sKerberosTgtPassing, sChallengeResponseAuthentication, sPasswordAuthentication, sKbdInteractiveAuthentication, -@@ -362,18 +365,20 @@ typedef enum { +@@ -441,18 +444,20 @@ typedef enum { static struct { const char *name; ServerOpCodes opcode; @@ -123,7 +126,7 @@ diff --git a/openssh-6.6p1/servconf.c b/openssh-6.6p1/servconf.c { "hostdsakey", sHostKeyFile, SSHCFG_GLOBAL }, /* alias */ { "hostkeyagent", sHostKeyAgent, SSHCFG_GLOBAL }, { "pidfile", sPidFile, SSHCFG_GLOBAL }, -@@ -870,16 +875,19 @@ process_server_config_line(ServerOptions +@@ -1005,16 +1010,19 @@ process_server_config_line(ServerOptions } } @@ -143,10 +146,10 @@ diff --git a/openssh-6.6p1/servconf.c b/openssh-6.6p1/servconf.c /* ignore ports from configfile if cmdline specifies ports */ if (options->ports_from_cmdline) return 0; -diff --git a/openssh-6.6p1/servconf.h b/openssh-6.6p1/servconf.h ---- a/openssh-6.6p1/servconf.h -+++ b/openssh-6.6p1/servconf.h -@@ -160,16 +160,17 @@ typedef struct { +diff --git a/openssh-7.2p2/servconf.h b/openssh-7.2p2/servconf.h +--- a/openssh-7.2p2/servconf.h ++++ b/openssh-7.2p2/servconf.h +@@ -167,16 +167,17 @@ typedef struct { */ u_int num_authkeys_files; /* Files containing public keys */ @@ -164,17 +167,17 @@ diff --git a/openssh-6.6p1/servconf.h b/openssh-6.6p1/servconf.h char *chroot_directory; char *revoked_keys_file; char *trusted_user_ca_keys; -diff --git a/openssh-6.6p1/sshd_config.0 b/openssh-6.6p1/sshd_config.0 ---- a/openssh-6.6p1/sshd_config.0 -+++ b/openssh-6.6p1/sshd_config.0 -@@ -728,16 +728,24 @@ DESCRIPTION +diff --git a/openssh-7.2p2/sshd_config.0 b/openssh-7.2p2/sshd_config.0 +--- a/openssh-7.2p2/sshd_config.0 ++++ b/openssh-7.2p2/sshd_config.0 +@@ -946,16 +946,24 @@ DESCRIPTION Because PAM challenge-response authentication usually serves an equivalent role to password authentication, you should disable either PasswordAuthentication or ChallengeResponseAuthentication. If UsePAM is enabled, you will not be able to run sshd(8) as a - non-root user. The default is ``no''. + non-root user. The default is M-bM-^@M-^\noM-bM-^@M-^]. + UsePAMCheckLocks + When set to ``yes'', the checks whether the account has been @@ -191,11 +194,11 @@ diff --git a/openssh-6.6p1/sshd_config.0 b/openssh-6.6p1/sshd_config.0 that has the privilege of the authenticated user. The goal of privilege separation is to prevent privilege escalation by containing any corruption within the unprivileged processes. The - default is ``yes''. If UsePrivilegeSeparation is set to -diff --git a/openssh-6.6p1/sshd_config.5 b/openssh-6.6p1/sshd_config.5 ---- a/openssh-6.6p1/sshd_config.5 -+++ b/openssh-6.6p1/sshd_config.5 -@@ -1214,16 +1214,28 @@ or + argument must be M-bM-^@M-^\yesM-bM-^@M-^], M-bM-^@M-^\noM-bM-^@M-^], or M-bM-^@M-^\sandboxM-bM-^@M-^]. If +diff --git a/openssh-7.2p2/sshd_config.5 b/openssh-7.2p2/sshd_config.5 +--- a/openssh-7.2p2/sshd_config.5 ++++ b/openssh-7.2p2/sshd_config.5 +@@ -1578,16 +1578,28 @@ or .Pp If .Cm UsePAM diff --git a/openssh-6.6p1-pts.patch b/openssh-7.2p2-pts_names_formatting.patch similarity index 78% rename from openssh-6.6p1-pts.patch rename to openssh-7.2p2-pts_names_formatting.patch index fd5776e..dc31981 100644 --- a/openssh-6.6p1-pts.patch +++ b/openssh-7.2p2-pts_names_formatting.patch @@ -1,10 +1,12 @@ +# HG changeset patch +# Parent 94fb9a9ff763462af43304fc73c2913a07829226 # use same lines naming as utempter (prevents problems with using different # formats in ?tmp? files) -diff --git a/openssh-6.6p1/loginrec.c b/openssh-6.6p1/loginrec.c ---- a/openssh-6.6p1/loginrec.c -+++ b/openssh-6.6p1/loginrec.c -@@ -538,17 +538,17 @@ getlast_entry(struct logininfo *li) +diff --git a/openssh-7.2p2/loginrec.c b/openssh-7.2p2/loginrec.c +--- a/openssh-7.2p2/loginrec.c ++++ b/openssh-7.2p2/loginrec.c +@@ -541,17 +541,17 @@ getlast_entry(struct logininfo *li) /* * 'line' string utility functions * @@ -23,7 +25,7 @@ diff --git a/openssh-6.6p1/loginrec.c b/openssh-6.6p1/loginrec.c */ -@@ -599,16 +599,20 @@ line_abbrevname(char *dst, const char *s +@@ -602,16 +602,20 @@ line_abbrevname(char *dst, const char *s /* Always skip prefix if present */ if (strncmp(src, "/dev/", 5) == 0) src += 5; diff --git a/openssh-6.6p1-xauth.patch b/openssh-7.2p2-remove_xauth_cookies_on_exit.patch similarity index 50% rename from openssh-6.6p1-xauth.patch rename to openssh-7.2p2-remove_xauth_cookies_on_exit.patch index 52224cf..cf75750 100644 --- a/openssh-6.6p1-xauth.patch +++ b/openssh-7.2p2-remove_xauth_cookies_on_exit.patch @@ -1,24 +1,23 @@ -# try to remove xauth cookies on logout -# bnc#98815 +# HG changeset patch +# Parent c7d5ac7548d3bc695559aee7e28569e422b6aadf +try to remove xauth cookies on logout -diff --git a/openssh-6.6p1/session.c b/openssh-6.6p1/session.c ---- a/openssh-6.6p1/session.c -+++ b/openssh-6.6p1/session.c -@@ -2510,18 +2510,50 @@ session_exit_message(Session *s, int sta - if (c->ostate != CHAN_OUTPUT_CLOSED) - chan_write_failed(c); - } - - void - session_close(Session *s) - { +bnc#98815 + +diff --git a/openssh-7.2p2/session.c b/openssh-7.2p2/session.c +--- a/openssh-7.2p2/session.c ++++ b/openssh-7.2p2/session.c +@@ -2540,16 +2540,44 @@ session_close(Session *s) u_int i; -+ int do_xauth; - debug("session_close: session %d pid %ld", s->self, (long)s->pid); -+ -+ do_xauth = (s->display != NULL) && (s->auth_proto != NULL) && (s->auth_data != NULL); -+ if (do_xauth && options.xauth_location != NULL) { + verbose("Close session: user %s from %.200s port %d id %d", + s->pw->pw_name, + get_remote_ipaddr(), + get_remote_port(), + s->self); + ++ if ((s->display != NULL) && (s->auth_proto != NULL) && ++ (s->auth_data != NULL) && (options.xauth_location != NULL)) { + pid_t pid; + FILE *f; + char cmd[1024]; @@ -29,10 +28,10 @@ diff --git a/openssh-6.6p1/session.c b/openssh-6.6p1/session.c + + /* Remove authority data from .Xauthority if appropriate. */ + debug("Running %.500s remove %.100s\n", -+ options.xauth_location, s->auth_display); ++ options.xauth_location, s->auth_display); + + snprintf(cmd, sizeof cmd, "unset XAUTHORITY && HOME=\"%.200s\" %s -q -", -+ s->pw->pw_dir, options.xauth_location); ++ s->pw->pw_dir, options.xauth_location); + f = popen(cmd, "w"); + if (f) { + fprintf(f, "remove %s\n", s->auth_display); @@ -41,9 +40,7 @@ diff --git a/openssh-6.6p1/session.c b/openssh-6.6p1/session.c + error("Could not run %s\n", cmd); + exit(0); + } else if (pid > 0) { -+ int status; -+ -+ waitpid(pid, &status, 0); ++ waitpid(pid, NULL, 0); + } + } + diff --git a/openssh-7.2p2-seccomp_getuid.patch b/openssh-7.2p2-seccomp_getuid.patch new file mode 100644 index 0000000..ed4e9de --- /dev/null +++ b/openssh-7.2p2-seccomp_getuid.patch @@ -0,0 +1,31 @@ +# HG changeset patch +# Parent 4f03a27aa55b0beebf232844353779e182cd2497 +add 'getuid' syscall to list of allowed ones to prevent the sanboxed thread +from being killed by the seccomp filter + +diff --git a/openssh-7.2p2/sandbox-seccomp-filter.c b/openssh-7.2p2/sandbox-seccomp-filter.c +--- a/openssh-7.2p2/sandbox-seccomp-filter.c ++++ b/openssh-7.2p2/sandbox-seccomp-filter.c +@@ -142,16 +142,22 @@ static const struct sock_filter preauth_ + SC_ALLOW(exit_group), + #endif + #ifdef __NR_getpgid + SC_ALLOW(getpgid), + #endif + #ifdef __NR_getpid + SC_ALLOW(getpid), + #endif ++#ifdef __NR_getuid ++ SC_ALLOW(getuid), ++#endif ++#ifdef __NR_getuid32 ++ SC_ALLOW(getuid32), ++#endif + #ifdef __NR_getrandom + SC_ALLOW(getrandom), + #endif + #ifdef __NR_gettimeofday + SC_ALLOW(gettimeofday), + #endif + #ifdef __NR_madvise + SC_ALLOW(madvise), diff --git a/openssh-7.2p2-seccomp_stat.patch b/openssh-7.2p2-seccomp_stat.patch new file mode 100644 index 0000000..fa13564 --- /dev/null +++ b/openssh-7.2p2-seccomp_stat.patch @@ -0,0 +1,30 @@ +# HG changeset patch +# Parent 51a94ce61ff5c6908d747d8bc5806e18c6f5c114 +Allow the stat() syscall for OpenSSL re-seed patch +(which causes OpenSSL use stat() on some file) + +bnc#912436 + +diff --git a/openssh-7.2p2/sandbox-seccomp-filter.c b/openssh-7.2p2/sandbox-seccomp-filter.c +--- a/openssh-7.2p2/sandbox-seccomp-filter.c ++++ b/openssh-7.2p2/sandbox-seccomp-filter.c +@@ -130,16 +130,19 @@ static const struct sock_filter preauth_ + SC_ALLOW(brk), + #endif + #ifdef __NR_clock_gettime + SC_ALLOW(clock_gettime), + #endif + #ifdef __NR_close + SC_ALLOW(close), + #endif ++#ifdef __NR_stat ++ SC_ALLOW(stat), ++#endif + #ifdef __NR_exit + SC_ALLOW(exit), + #endif + #ifdef __NR_exit_group + SC_ALLOW(exit_group), + #endif + #ifdef __NR_getpgid + SC_ALLOW(getpgid), diff --git a/openssh-7.2p2-send_locale.patch b/openssh-7.2p2-send_locale.patch new file mode 100644 index 0000000..226a55d --- /dev/null +++ b/openssh-7.2p2-send_locale.patch @@ -0,0 +1,53 @@ +# HG changeset patch +# Parent fdeedfd2266d642837d86b9b7b3cdc6c00e9535d +send locales in default configuration +bnc#65747 + +diff --git a/openssh-7.2p2/ssh_config b/openssh-7.2p2/ssh_config +--- a/openssh-7.2p2/ssh_config ++++ b/openssh-7.2p2/ssh_config +@@ -26,16 +26,21 @@ Host * + # security reasons: Someone stealing the authentification data on the + # remote side (the "spoofed" X-server by the remote sshd) can read your + # keystrokes as you type, just like any other X11 client could do. + # Set this to "no" here for global effect or in your own ~/.ssh/config + # file if you want to have the remote X11 authentification data to + # expire after twenty minutes after remote login. + ForwardX11Trusted yes + ++# This enables sending locale enviroment variables LC_* LANG, see ssh_config(5). ++ SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES ++ SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT ++ SendEnv LC_IDENTIFICATION LC_ALL ++ + # RhostsRSAAuthentication no + # RSAAuthentication yes + # PasswordAuthentication yes + # HostbasedAuthentication no + # GSSAPIAuthentication no + # GSSAPIDelegateCredentials no + # BatchMode no + # CheckHostIP yes +diff --git a/openssh-7.2p2/sshd_config b/openssh-7.2p2/sshd_config +--- a/openssh-7.2p2/sshd_config ++++ b/openssh-7.2p2/sshd_config +@@ -120,14 +120,19 @@ X11Forwarding yes + #VersionAddendum none + + # no default banner path + #Banner none + + # override default of no subsystems + Subsystem sftp /usr/libexec/sftp-server + ++# This enables accepting locale enviroment variables LC_* LANG, see sshd_config(5). ++AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES ++AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT ++AcceptEnv LC_IDENTIFICATION LC_ALL ++ + # Example of overriding settings on a per-user basis + #Match User anoncvs + # X11Forwarding no + # AllowTcpForwarding no + # PermitTTY no + # ForceCommand cvs server diff --git a/openssh-7.2p2.tar.gz b/openssh-7.2p2.tar.gz new file mode 100644 index 0000000..41c8e60 --- /dev/null +++ b/openssh-7.2p2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a72781d1a043876a224ff1b0032daa4094d87565a68528759c1c2cab5482548c +size 1499808 diff --git a/openssh-askpass-gnome.changes b/openssh-askpass-gnome.changes index 3a8dbfa..9f0b69b 100644 --- a/openssh-askpass-gnome.changes +++ b/openssh-askpass-gnome.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Apr 17 23:27:51 UTC 2016 - pcerny@suse.com + +- upgrade to 7.2p2 + +------------------------------------------------------------------- +Tue Feb 10 13:28:56 UTC 2015 - pcerny@suse.com + +- changing license to 2-clause BSD to match source + ------------------------------------------------------------------- Fri Apr 11 21:50:51 UTC 2014 - pcerny@suse.com diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec index 883a1e8..a21c1be 100644 --- a/openssh-askpass-gnome.spec +++ b/openssh-askpass-gnome.spec @@ -26,11 +26,11 @@ BuildRequires: openssl-devel BuildRequires: pam-devel BuildRequires: tcpd-devel BuildRequires: update-desktop-files -Version: 6.6p1 +Version: 7.2p2 Release: 0 Requires: openssh = %{version} Summary: A GNOME-Based Passphrase Dialog for OpenSSH -License: BSD-3-Clause +License: BSD-2-Clause Group: Productivity/Networking/SSH Url: http://www.openssh.com/ %define _name openssh diff --git a/openssh.changes b/openssh.changes index ccd8f5d..ab6ab13 100644 --- a/openssh.changes +++ b/openssh.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Mon May 30 00:30:16 UTC 2016 - pcerny@suse.com + +- enable trusted X11 forwarding by default + [-X11_trusted_forwarding] +- set UID for lastlog properly [-lastlog] +- enable use of PAM by default [-enable_PAM_by_default] +- copy command line arguments properly [-saveargv-fix] +- do not use pthreads in PAM code [-dont_use_pthreads_in_PAM] +- fix paths in documentation [-eal3] +- prevent race consitions triggered by SIGALRM [-blocksigalrm] +- do send and accept locale environment variables by default + [-send_locale] +- handle hostnames changes during X forwarding + [-hostname_changes_when_forwarding_X] +- try to remove xauth cookies on exit + [-remove_xauth_cookies_on_exit] +- properly format pts names for ?tmp? log files + [-pts_names_formatting] +- check locked accounts when using PAM [-pam_check_locks] +- chenge default PermitRootLogin to 'yes' to prevent unwanted + surprises on updates from older versions. + See README.SUSE for details + [-allow_root_password_login] +- Disable DH parameters under 2048 bits by default and allow + lowering the limit back to the RFC 4419 specified minimum + through an option (bsc#932483, bsc#948902) + [-disable_short_DH_parameters] +- Add getuid() and stat() syscalls to the seccomp filter + (bsc#912436) + [-seccomp_getuid, -seccomp_stat] + +------------------------------------------------------------------- +Fri May 27 23:27:51 UTC 2016 - pcerny@suse.com + +- upgrade to 7.2p2 - upstream package without any SUSE patches + ------------------------------------------------------------------- Fri Apr 29 15:56:38 UTC 2016 - pcerny@suse.com diff --git a/openssh.keyring b/openssh.keyring deleted file mode 100644 index 2ee88c6..0000000 --- a/openssh.keyring +++ /dev/null @@ -1,75 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2 - -mQGdBFKmggUBDICUNqm4cNh7tdEbwaNhbnwqLiHpILeXT6sddGI0Stz5ofB1uvIH -m9kXYG5XUUwlc5ywjIZm2JeuKqrd/6wAz5laLagFA6k86EZzzuBE3b5FxSQ4EN4K -5XZEJo61xASEF7z1mQCiqoA6/F407ht7nNoiVE95kOmqJlv4cqbpCw3n8f2VW+mV -UH6MYRZVrYAC9NnJWv24rem2fjgFhNT1/bx44G7H9bVJqL7hMEGa+xYQBI3YT/ul -Eu9HYmLFVeiZm1gB1eKXW7jS4ctLl5uPrxayA5DX/qNB2yqgVVlIKFwUm8gGPGPO -nsNKo0xBseE7E0F/KeGpaT5aS9yFgPm9A652Jx9felYgb0e9Ipt3lxriPQwgF/cx -LGuP/WEbN5fpWFnuV0ViklusuVI2e8GHJGU5bQD5AlzvWu4Sv6oBOcDCabScydY7 -IxPBk/XBWCF9QDIa2qa32Mc9dYc8EnJszPeVCHX5hG23omDRmdLGLwH7F+CuBvCx -AKCymZtJl5DhRmnhdzRg9d+0VG4hLF7O06ANABEBAAG0H0RhbWllbiBNaWxsZXIg -PGRqbUBtaW5kcm90Lm9yZz6IRgQQEQIABgUCUqaL3wAKCRDOjssDhv+cSJ3/AJ9A -OzD63ySM9nuuN1RFeAF93TvfiACfTDrEIgeC56rU3HPTQTB3/VSxOOiIRgQQEQIA -BgUCUySGrwAKCRCL2C5vMLlLXMCbAKCAGwbnFNCw8bdGjwaki24gkEaZmwCgkxGd -ELraZAovvTR0eTj0gUvuwfqIRgQQEQgABgUCUunoHgAKCRDJgoDHj/T6aQDxAJ0V -2/z0s2QB7VYraCmN1bibFdUKxQCbB/34YVXDHr3IpNfByu+/b2CUPVaJARwEEAEC -AAYFAlSaCosACgkQX44uZGtPstCdXQf6AzFR2af55lQ37p/IB/VMweJ+neq+p0rT -mwvY0hjivPsaBhtvcvvAfjnD7O24TqmZ2DgnAIaKOndXyq7IgJu9T3hhNu7+fsTe -vlT0fgldS5b30a0wvq/QmeansC2GawxXBMWgyPx/OzNFOOHQtbFswg/8Fduv3W2F -/QD0vY4EV4cJe2mvwmdMriWQO3BHDk8pkdA9SU/TtHYqLqm9r3p4+C0aemcvyf1m -XC+DmYJKxA5C/xHv7sZyYapJY4RxQHrsYXgBWwYyoSP/0FFix2NajMTuirrQXAau -D4cRpM7tOjcQpYjfWllT67daAYTtwfzb9iC0JB2ApjMMBP0BAUANEIkBzQQTAQIA -JwIbAwUJDUfrsQIeAQIXgAUCUqaMnAQLCQgHBhUKCQgLAgUWAgMBAAAKCRDT5fVr -bZINMHZMDH0TWjM8kpQZYk9l5+qxKvwqw7oOndC4+vDZnCCjZB94JP67M0DkAoIM -gBpgSlVtCy+7iwPLx0BbX4cQ0LFWsxdYb5IfjWVx0B0jiKjQ8YdVAOXjZHmNfd72 -l+NgJAAtW/kENd10rrTnifLESa51DcgIUJhchypBsDWd+PdSTTqMaG4z30Hb9qRv -EKgVKJRf24cNko1gAalTv8UIX3EJkXgp31PC/LLXuMMiDuSbf9DgnL75U/wXK8Tk -mMF0tFBIHNIb0YKO/1/IpZbtLRsxjgPdIoq38mbVdyEQyClGvh4GmAKzevE7WFeP -Oqbe173u7Lr+rwK4lS26kmw8pz1aHj6iBRmJ8LS1rtSvFmnzJlNG89JTFiuW8PMz -fZUMtDcVfpjaLhU2jjw9IkwD4E9THsNNxkohe3jnvOwsPiMXixF3A6T9AX8ZcKQf -YYDIodYI9cg576MheCK5qNypmb1wBaMveGJ1KiEp95+8qTOyDvmYOaOG8C0Odwhu -YiYk2Nch7Y9BTiJj1WrmLS+VpUqAGApKiQIcBBABAgAGBQJTF5i3AAoJECPNT7oM -AX3yAaoP/jSWlN++0Sms0WgN67JHDZhXpU+uiumaKS2VXXakIeAKu8kra6KIqmTa -dmm1zSJ83yhr6q3TjnCaOMLcSCEaCeizeMHeUbLPiM1zlcXH3jqpZxIPJ2lZTsyS -eAEAQwT30NIjySlOX5Ba/ZknQ8iiqqkZM1PBxqYIcjN8ijOY59L4NQnTsdn0m6pA -e1m16zD3sGljVvJeQuvoyaqxnOEQhzfnYjziFIkTbRKh0bk2jq3GjpYKjm0H0yDz -r1xcG5R31DZb+n5tWDKDYUX+PtDh8ypgzobTBQ1JTl7e2qeu/EpbFccRqsu1S9kJ -yC3jyYzpk2Bf8mfsfH6Z+FUR8AEKW67vBQQFRIV0H4WCBazI2k1/ibNoaLqKJNDh -0j3p89XAdlXdie8Cr+kd0XQJ/ExqaBPpTiVWGFeEVxo9cC18zFv8N8ZvOnEBwJZ7 -7uaiKYAjNUEfE8W7RX0bZgkIS5gXcuFRgLDcHqWEhFTasSObmNx8rrbmkZUnyuct -CFu3iYAAOvpBZNEXXnwU5S//G19gjfNlLQSBcCn6A4fJo1szPhC9VD9suf21FkZY -Z2dGT1U1CYmw46wsb6ZyG8hd56fD3VkMF6fs123NuCmKJwdv4dCAtKXeizm3Kwuq -fiItPr+CZlF7fgBSvxSllErP3fRio6w6ueu/2nMdxq/+VqSSfi0jiQIcBBABAgAG -BQJTGxrFAAoJEGXrljbwLFcEA1wQALFhneSP944km15LMqr4AGOaStxSWv+Fr3Nc -Dv/LXOZ9olMHGZIrAV2yl6hW0vPOiQXJGM2+t1H5Q2gbktPt/F5LD/lR8cxMOCfD -bVA5nUzi52mY7J6rv15AmJNzlxOrUsOxGIp2AuBFI+NLcmzW1vA4VN8oY22zePYS -sAyANODpYLwzmLvWh/n6Gkb9Dcr5d5M6clPJlvyCjT3HOkmLCPBTv/I4lm004pLW -+pepwfmHi1XoXDXLChrBU0caV63+KdIKaSkZafGhhdOSeMT2ti6squ+9VBm6g207 -ZaU46wzATdVfCJkhAPk8HMi/853vqXPhl06VFi3KYrL6tsSie0X6vNlMfkQ1obdh -2KHVtqSFhO+0pwjLQ6Ei5X0MIYk2M8XFUIV1RPmQ4RdvfbMuJpyXLBxTY2ItB70Z -HvEmXOTYLYAhAH+UvSODocIP24I/mdyPbiTxgpYVa8pMFw70aA/1zPWftZCYWe0l -98imcUW2YPknLl3bxOV+CI4g5XFW/84qxS1Ty228vIK7GmnZx2AMyaSA0w84d9wQ -nxJcrNSS1M3uYvHLICEr4HWP+lTj8wFd3kd0URnB8Ybc7zsy/Rroy/KPKArhbCHb -9O+w+KuC5f1Bu4uZc/o2Zckp5zfKI7xtUbW914PB9hbo+TXkTBre9nZkSQjODL6w -PLIanYFvuQGdBFKmggUBDIDU53B+nBcpyH47TRbUWxBIxwSNqEaajzhZOugz+qNN -3tiyV3fTQ8y/fCRCfZZ2HJNxr8SaRbR9VMZJiztne/lKk9/SmthKOZ+7xaVejPrg -Cl1eoYeOP0oB6rY65S1avChuCJATNTgfGXP3hf/rkGAbmTs5PITcnpuBFwzAkKAK -TCMrznBtsGQYf4mj2j9nD1M9zNBwTsGYZiSQs0BdvDuiYoE4vhnrD2xdOjP1SdDQ -QH2zhO8BscYpf3LY8RCNk37CTNHcNq9YHuqXy8dkhGaykCwMAm8NPWh+w227wwHz -AlzG9lqhnuP3BQtimdo1jH3HESGBsH2jWYFxix0OPfHPmOuC2r9yl2AYLpuD5rAN -z/KVDWY2CUp9jw/2EUiEgA1mKWeYCWTkZKhZyU//r2b67fgoqgdThhzcjWk81wvo -3KLRuHyYep71Z50p+h3tjjIzVLbR9dpLi+ssiUqDFuwOlaJauTSW1XTe7ILt6oN7 -efPMZb/YYtMePnGwDb4fAa0+ibmabOO9Xk8U2lLtr3QlABEBAAGJAbUEGAECAA8F -AlKmggUCGwwFCQ1H67EACgkQ0+X1a22SDTARJwx/ZCMNabddrAnE0DymqrGsV5MS -j4YRLOdVFNR6mutQV3UYfDfepoC+ouLFn7Hxyv7UaP98l3l6IhUl9EthteULyy7w -lleeB9fRWG4xxShv8VOKR+lyhiRHOuJSwkQHf86aOUuMaCdCbkbP1NXWK3IXdvOg -eRHyy9YQoorM2ggQ8ctTfLtupKQ6uOdjdtl91VGHrXxduNXbw0y6hmxXwTik65Cj -L7ezkiOYh/+aRKIUTdUnB1o96bbdSxdq0Vv96gL8CGLSIJ3/yKgXCL6gdPY+e30e -vNUXoTyAFU7e8qjpQmANOv1C3bs1zp4cvQ7mPnSKez2hv/cOg4Lc/kDTzOGX7Djr -rIYS/n4Sz+6xQCz/ieDiSwjcNMsr1iCPvSXmgG4wVh3dvkoZV8AiUZzmbAg4gbjV -gsjNlOsa465PKaPAJ0L1xRknpHYK/9XHSG1nSGoN3JoM7Qij04b9bazZPvXrS1j2 -JzgzAEIV6bPAUQsgEggc1j+f/CybFAaQjc6Pzomk5VWBHmVdZH4GsZwGORITKA== -=qGXK ------END PGP PUBLIC KEY BLOCK----- diff --git a/openssh.spec b/openssh.spec index 5dd129b..f70988e 100644 --- a/openssh.spec +++ b/openssh.spec @@ -86,25 +86,19 @@ BuildRequires: pam-devel %if %{uses_systemd} BuildRequires: pkgconfig(systemd) %{?systemd_requires} -%else -PreReq: %{insserv_prereq} %endif -PreReq: pwdutils %{fillup_prereq} coreutils -Conflicts: nonfreessh -Recommends: xauth -Recommends: %{name}-helpers -Version: 6.6p1 +BuildRequires: tcpd-devel +PreReq: pwdutils %{insserv_prereq} %{fillup_prereq} coreutils +Version: 7.2p2 Release: 0 Summary: Secure Shell Client and Server (Remote Login Program) -License: BSD-3-Clause and MIT +License: BSD-2-Clause and MIT Group: Productivity/Networking/SSH Url: http://www.openssh.com/ Source: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz -Source42: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc -Source43: openssh.keyring Source1: sshd.init Source2: sshd.pamd -Source3: README.SuSE +Source3: README.SUSE Source4: README.kerberos Source5: ssh.reg Source6: ssh-askpass @@ -112,49 +106,31 @@ Source7: sshd.fw Source8: sysconfig.ssh Source9: sshd-gen-keys-start Source10: sshd.service -Patch0: openssh-6.6p1-curve25519-6.6.1p1.patch -Patch1: openssh-6.6p1-key-converter.patch -Patch2: openssh-6.6p1-X11-forwarding.patch -Patch3: openssh-6.6p1-lastlog.patch -Patch4: openssh-6.6p1-pam-fix2.patch -Patch5: openssh-6.6p1-saveargv-fix.patch -Patch6: openssh-6.6p1-pam-fix3.patch -Patch7: openssh-6.6p1-gssapimitm.patch -Patch8: openssh-6.6p1-eal3.patch -Patch9: openssh-6.6p1-blocksigalrm.patch -Patch10: openssh-6.6p1-send_locale.patch -Patch11: openssh-6.6p1-xauthlocalhostname.patch -Patch12: openssh-6.6p1-xauth.patch -Patch13: openssh-6.6p1-default-protocol.patch -Patch14: openssh-6.6p1-pts.patch -Patch15: openssh-6.6p1-pam-check-locks.patch -Patch16: openssh-6.6p1-fingerprint_hash.patch -Patch17: openssh-6.6p1-fips.patch -Patch18: openssh-6.6p1-audit1-remove_duplicit_audit.patch -Patch19: openssh-6.6p1-audit2-better_audit_of_user_actions.patch -Patch20: openssh-6.6p1-audit3-key_auth_usage.patch -Patch21: openssh-6.6p1-audit3-key_auth_usage-fips.patch -Patch22: openssh-6.6p1-audit4-kex_results.patch -Patch23: openssh-6.6p1-audit4-kex_results-fips.patch -Patch24: openssh-6.6p1-audit5-session_key_destruction.patch -Patch25: openssh-6.6p1-audit6-server_key_destruction.patch -Patch26: openssh-6.6p1-audit7-libaudit_compat.patch -Patch27: openssh-6.6p1-audit8-libaudit_dns_timeouts.patch -Patch28: openssh-6.6p1-seed-prng.patch -Patch29: openssh-6.6p1-gssapi_key_exchange.patch -Patch30: openssh-6.6p1-login_options.patch -Patch31: openssh-6.6p1-disable-openssl-abi-check.patch -Patch32: openssh-6.6p1-no_fork-no_pid_file.patch -Patch33: openssh-6.6p1-host_ident.patch -Patch34: openssh-6.6p1-sftp_homechroot.patch -Patch35: openssh-6.6p1-sftp_force_permissions.patch -Patch36: openssh-6.6p1-seccomp_getuid.patch -Patch37: openssh-6.6p1-seccomp_stat.patch -Patch38: openssh-6.6p1-X_forward_with_disabled_ipv6.patch -Patch39: openssh-6.6p1-fips-checks.patch -Patch40: openssh-6.6p1-ldap.patch -Patch41: CVE-2016-0777_CVE-2016-0778.patch +Source11: README.FIPS +Source12: cavs_driver-ssh.pl +Patch00: openssh-7.2p2-allow_root_password_login.patch +Patch01: openssh-7.2p2-X11_trusted_forwarding.patch +Patch02: openssh-7.2p2-lastlog.patch +Patch03: openssh-7.2p2-enable_PAM_by_default.patch +Patch04: openssh-7.2p2-dont_use_pthreads_in_PAM.patch +Patch05: openssh-7.2p2-eal3.patch +Patch06: openssh-7.2p2-blocksigalrm.patch +Patch07: openssh-7.2p2-send_locale.patch +Patch08: openssh-7.2p2-hostname_changes_when_forwarding_X.patch +Patch09: openssh-7.2p2-remove_xauth_cookies_on_exit.patch +Patch10: openssh-7.2p2-pts_names_formatting.patch +Patch11: openssh-7.2p2-pam_check_locks.patch +Patch12: openssh-7.2p2-disable_short_DH_parameters.patch +Patch13: openssh-7.2p2-seccomp_getuid.patch +Patch14: openssh-7.2p2-seccomp_stat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +Conflicts: nonfreessh +Recommends: audit +Recommends: xauth +Recommends: %{name}-helpers = %{version}-%{release} +Conflicts: %{name}-fips < %{version}-%{release} , %{name}-fips > %{version}-%{release} +%define CHECKSUM_SUFFIX .hmac +%define CHECKSUM_HMAC_KEY "HMAC_KEY:OpenSSH-FIPS@SLE" %description SSH (Secure Shell) is a program for logging into and executing commands @@ -169,76 +145,58 @@ also be forwarded over the secure channel. %package helpers Summary: OpenSSH AuthorizedKeysCommand helpers Group: Productivity/Networking/SSH -Requires: openssh +Requires: %{name} = %{version}-%{release} %description helpers Helper applications for OpenSSH which retrieve keys from various sources. %package fips -Summary: OpenSSH FIPS cryptomodule hashes +Summary: OpenSSH FIPS cryptomodule HMACs Group: Productivity/Networking/SSH -Requires: openssh +Requires: %{name} = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} , %{name} > %{version}-%{release} +Obsoletes: %{name}-hmac %description fips Hashes that together with the main package form the FIPS certifiable cryptomodule. +%package cavs +Summary: OpenSSH FIPS cryptomodule CAVS tests +Group: Productivity/Networking/SSH +Requires: %{name} = %{version}-%{release} + +%description cavs +FIPS140 CAVS tests related parts of the OpenSSH package + + %prep %setup -q -%patch0 -p2 -#patch1 -p2 -%patch2 -p2 -%patch3 -p2 -%patch4 -p2 -%patch5 -p2 -%patch6 -p2 -%patch7 -p2 -%patch8 -p2 -%patch9 -p2 +%patch00 -p2 +%patch01 -p2 +%patch02 -p2 +%patch03 -p2 +%patch04 -p2 +%patch05 -p2 +%patch06 -p2 +%patch07 -p2 +%patch08 -p2 +%patch09 -p2 %patch10 -p2 %patch11 -p2 %patch12 -p2 %patch13 -p2 %patch14 -p2 -%patch15 -p2 -%patch16 -p2 -%patch17 -p2 -%patch18 -p2 -%patch19 -p2 -%patch20 -p2 -%patch21 -p2 -%patch22 -p2 -%patch23 -p2 -%patch24 -p2 -%patch25 -p2 -%patch26 -p2 -%if 0%{?suse_version} > 1310 -%patch27 -p2 -%endif -%patch28 -p2 -%patch29 -p2 -%patch30 -p2 -%patch31 -p2 -%patch32 -p2 -%patch33 -p2 -%patch34 -p2 -%patch35 -p2 -%patch36 -p2 -%patch37 -p2 -%patch38 -p2 -%patch39 -p2 -%patch40 -p2 -%patch41 -p0 -cp %{SOURCE3} %{SOURCE4} . +cp %{SOURCE3} %{SOURCE4} %{SOURCE11} . %build -# set libexec dir in the LDAP patch -sed -i.libexec 's,@LIBEXECDIR@,%{_libexecdir}/ssh,' \ - $( grep -Rl @LIBEXECDIR@ \ - $( grep "^+++" %{PATCH40} | sed -r 's@^.+/([^/\t ]+).*$@\1@' ) - ) +#### set libexec dir in the LDAP patch +###sed -i.libexec 's,@LIBEXECDIR@,%{_libexecdir}/ssh,' \ +### $( grep -Rl @LIBEXECDIR@ \ +### $( grep "^+++" %{PATCH40} | sed -r 's@^.+/([^/\t ]+).*$@\1@' ) +### ) autoreconf -fiv %ifarch s390 s390x %sparc @@ -247,22 +205,17 @@ PIEFLAGS="-fPIE" PIEFLAGS="-fpie" %endif CFLAGS="%{optflags} $PIEFLAGS -fstack-protector" -#%if 0%{?suse_version} < 1230 -#CFLAGS="-lrt $CFLAGS" -#%endif CXXFLAGS="%{optflags} $PIEFLAGS -fstack-protector" LDFLAGS="-pie -Wl,--as-needed" -#%if 0%{?suse_version} < 1230 -#LDFLAGS="-lrt $LDFLAGS" -#%endif #CPPFLAGS="%{optflags} -DUSE_INTERNAL_B64" export LDFLAGS CFLAGS CXXFLAGS CPPFLAGS -./configure \ +%configure \ --prefix=%{_prefix} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ --sysconfdir=%{_sysconfdir}/ssh \ --libexecdir=%{_libexecdir}/ssh \ + --with-tcp-wrappers \ %if %{has_libselinux} --with-selinux \ %endif @@ -330,6 +283,7 @@ install -m 644 %{SOURCE7} %{buildroot}%{_fwdefdir}/sshd # askpass wrapper sed -e "s,@LIBEXECDIR@,%{_libexecdir},g" < %{SOURCE6} > %{buildroot}%{_libexecdir}/ssh/ssh-askpass +sed -e "s,@LIBEXECDIR@,%{_libexecdir},g" < %{SOURCE12} > %{buildroot}%{_libexecdir}/ssh/cavs_driver-ssh.pl rm -f %{buildroot}%{_datadir}/Ssh.bin # sshd keys generator wrapper install -D -m 0755 %{SOURCE9} %{buildroot}%{_sbindir}/sshd-gen-keys-start @@ -342,13 +296,12 @@ install -D -m 0755 %{SOURCE9} %{buildroot}%{_sbindir}/sshd-gen-keys-start # this shows up earlier because otherwise the %expand of # the macro is too late. %{expand:%%global __os_install_post {%__os_install_post - for b in \ %{_bindir}/ssh \ %{_sbindir}/sshd \ %{_libexecdir}/ssh/sftp-server \ ; do - ( printf "\03"; openssl dgst -sha256 -binary < %{buildroot}$b ) > %{buildroot}$b.chk + openssl dgst -sha256 -binary -hmac %{CHECKSUM_HMAC_KEY} < %{buildroot}$b > %{buildroot}$b%{CHECKSUM_SUFFIX} done }} @@ -376,6 +329,10 @@ getent passwd sshd >/dev/null || %{_sbindir}/useradd -r -g sshd -d /var/lib/sshd %endif %postun +# The openssh-fips trigger script for openssh will normally restart sshd once +# it gets installed, so only restart the service here is openssh-fips is not +# present +rpm -q openssh-fips >& /dev/null && DISABLE_RESTART_ON_UPDATE=yes %if %{uses_systemd} %service_del_postun sshd.service %else @@ -383,13 +340,17 @@ getent passwd sshd >/dev/null || %{_sbindir}/useradd -r -g sshd -d /var/lib/sshd %{insserv_cleanup} %endif +%triggerin -n openssh-fips -- %{name} = %{version}-%{release} +%restart_on_update sshd + %files %defattr(-,root,root) -%exclude %{_bindir}/*.chk -%exclude %{_sbindir}/*.chk -%exclude %{_libexecdir}/ssh/sftp-server.chk +%exclude %{_bindir}/ssh%{CHECKSUM_SUFFIX} +%exclude %{_sbindir}/sshd%{CHECKSUM_SUFFIX} +%exclude %{_libexecdir}/ssh/sftp-server%{CHECKSUM_SUFFIX} +%exclude %{_libexecdir}/ssh/cavs* %dir %attr(755,root,root) /var/lib/sshd -%doc README.SuSE README.kerberos ChangeLog OVERVIEW README TODO LICENCE CREDITS +%doc README.SUSE README.kerberos README.FIPS ChangeLog OVERVIEW README TODO LICENCE CREDITS %attr(0755,root,root) %dir %{_sysconfdir}/ssh %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/moduli %verify(not mode) %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config @@ -405,7 +366,7 @@ getent passwd sshd >/dev/null || %{_sbindir}/useradd -r -g sshd -d /var/lib/sshd %attr(0755,root,root) %{_bindir}/* %attr(0755,root,root) %{_sbindir}/* %attr(0755,root,root) %dir %{_libexecdir}/ssh -%exclude %{_libexecdir}/ssh/ssh-ldap* +###%exclude %{_libexecdir}/ssh/ssh-ldap* %attr(0755,root,root) %{_libexecdir}/ssh/* %attr(0444,root,root) %doc %{_mandir}/man1/* %attr(0444,root,root) %doc %{_mandir}/man5/* @@ -424,15 +385,19 @@ getent passwd sshd >/dev/null || %{_sbindir}/useradd -r -g sshd -d /var/lib/sshd %files helpers %defattr(-,root,root) %attr(0755,root,root) %dir %{_sysconfdir}/ssh -%verify(not mode) %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ldap.conf +###%verify(not mode) %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ldap.conf %attr(0755,root,root) %dir %{_libexecdir}/ssh -%attr(0755,root,root) %{_libexecdir}/ssh/ssh-ldap* -%doc HOWTO.ldap-keys openssh-lpk-openldap.schema openssh-lpk-sun.schema +###%attr(0755,root,root) %{_libexecdir}/ssh/ssh-ldap* +###%doc HOWTO.ldap-keys openssh-lpk-openldap.schema openssh-lpk-sun.schema %files fips %defattr(-,root,root) -%attr(0444,root,root) %{_bindir}/ssh.chk -%attr(0444,root,root) %{_sbindir}/sshd.chk -%attr(0444,root,root) %{_libexecdir}/ssh/sftp-server.chk +%attr(0444,root,root) %{_bindir}/ssh%{CHECKSUM_SUFFIX} +%attr(0444,root,root) %{_sbindir}/sshd%{CHECKSUM_SUFFIX} +%attr(0444,root,root) %{_libexecdir}/ssh/sftp-server%{CHECKSUM_SUFFIX} + +%files cavs +%defattr(-,root,root) +%attr(0755,root,root) %{_libexecdir}/ssh/cavs* %changelog diff --git a/ssh-askpass b/ssh-askpass index e76e836..5d8616e 100644 --- a/ssh-askpass +++ b/ssh-askpass @@ -24,13 +24,6 @@ if [ -z "$SESSION" ] ; then fi fi -if [ -n "$SSH_AUTH_SOCK" ] ; then - # Ensure that ssh can use the ssh support of the gpg-agent - case "$SSH_AUTH_SOCK" in - */S.gpg-agent.ssh) gpg-connect-agent /bye < /dev/null ;; - esac -fi - GNOME_SSH_ASKPASS="@LIBEXECDIR@/ssh/gnome-ssh-askpass" KDE_SSH_ASKPASS="@LIBEXECDIR@/ssh/ksshaskpass" X11_SSH_ASKPASS="@LIBEXECDIR@/ssh/x11-ssh-askpass" diff --git a/sshd.init b/sshd.init index 92d9589..7a92141 100644 --- a/sshd.init +++ b/sshd.init @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (c) 1995-2013 SuSE GmbH Nuernberg, Germany. +# Copyright (c) 1995-2013 SUSE # # Author: Jiri Smid # @@ -39,12 +39,12 @@ SSHD_PIDFILE=/var/run/sshd.init.pid # rc_reset clear local rc status (overall remains) # rc_exit exit appropriate to overall rc status -soft_stop() { +function soft_stop () { echo -n "Shutting down the listening SSH daemon" killproc -p $SSHD_PIDFILE -TERM $SSHD_BIN } -force_stop() { +function force_stop () { echo -n "Shutting down SSH daemon *with all active connections*" trap '' TERM killall sshd 2>/dev/null