[csw-devel] SF.net SVN: gar:[3855] csw/mgar/pkg/openssh/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Sat Mar 21 18:30:33 CET 2009
Revision: 3855
http://gar.svn.sourceforge.net/gar/?rev=3855&view=rev
Author: chninkel
Date: 2009-03-21 17:30:32 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
openssh: updated to 5.2p1
openssh: split the ssh client in a separate package
Modified Paths:
--------------
csw/mgar/pkg/openssh/trunk/Makefile
csw/mgar/pkg/openssh/trunk/checksums
csw/mgar/pkg/openssh/trunk/files/CSWossh.depend
csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype
csw/mgar/pkg/openssh/trunk/files/changelog.CSW
Added Paths:
-----------
csw/mgar/pkg/openssh/trunk/files/CSWosshclient.depend
csw/mgar/pkg/openssh/trunk/files/CSWosshclient.gspec
csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype
csw/mgar/pkg/openssh/trunk/files/openssh-5.2p1-gsskex-20081003.patch
Removed Paths:
-------------
csw/mgar/pkg/openssh/trunk/files/cyrus.conf
csw/mgar/pkg/openssh/trunk/files/imapd.conf
csw/mgar/pkg/openssh/trunk/files/openssh-5.1p1-gsskex-20081003.patch
Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile 2009-03-21 12:55:15 UTC (rev 3854)
+++ csw/mgar/pkg/openssh/trunk/Makefile 2009-03-21 17:30:32 UTC (rev 3855)
@@ -1,5 +1,5 @@
GARNAME = openssh
-GARVERSION = 5.1
+GARVERSION = 5.2
RELEASE = p1
GSSKEX_PATCH_VERSION = $(GARVERSION)$(RELEASE)
GSSKEX_PATCH_DATE = 20081003
@@ -25,19 +25,20 @@
DISTNAME = $(GARNAME)-$(DISTVERSION)
DISTFILES = $(GARNAME)-$(DISTVERSION).tar.gz
+DISTFILES += i.conf r.conf
+DISTFILES += changelog.CSW
DISTFILES += $(call admfiles,CSWossh,depend checkinstall preinstall postinstall prototype)
-DISTFILES += changelog.CSW
DISTFILES += sshd_config
DISTFILES += cswopenssh svc-cswopenssh cswopenssh.xml
-DISTFILES += i.conf r.conf
DISTFILES += openssh
+DISTFILES += $(call admfiles,CSWosshclient,depend prototype)
# Script created to workaround a upgrade bug between
# package = 4.6,REV=2007.07.30_rev=p1 and later package
DISTFILES += openssh_restart_workaround.sh
+# The GSSAPI key exchange patch
PATCHDIRLEVEL = 0
-# The GSSAPI key exchange patch
PATCHFILES = openssh-$(GSSKEX_PATCH_VERSION)-gsskex-$(GSSKEX_PATCH_DATE).patch
# Prevent TIOCSCTTY from being used to avoid error:
@@ -73,8 +74,9 @@
# adding documentation files
post-install:
- mkdir -p $(DESTDIR)/$(docdir)/openssh/
+ mkdir -p $(DESTDIR)/$(docdir)/openssh/ $(DESTDIR)/$(docdir)/openssh_client/
cd $(WORKSRC) && ginstall $(DOCFILES) $(DESTDIR)/$(docdir)/openssh/
+ cd $(WORKSRC) && ginstall $(DOCFILES) $(DESTDIR)/$(docdir)/openssh_client/
SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE)
Modified: csw/mgar/pkg/openssh/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssh/trunk/checksums 2009-03-21 12:55:15 UTC (rev 3854)
+++ csw/mgar/pkg/openssh/trunk/checksums 2009-03-21 17:30:32 UTC (rev 3855)
@@ -1,19 +1,22 @@
-03f2d0c1b5ec60d4ac9997a146d2faec download/openssh-5.1p1.tar.gz
+ada79c7328a8551bdf55c95e631e7dad download/openssh-5.2p1.tar.gz
+dc212745af1f549ce2a236401bf97c1b download/i.conf
+5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf
+2ace8f24d32978fb8d550a1648483d5f download/changelog.CSW
d1c2c49bcd3b65a601946e8316b0b018 download/CSWossh.gspec
-a85143ec7bc4aeb7a444f591be5ef439 download/CSWossh.depend
+6e91d098018d7e1855b626ea463b8a29 download/CSWossh.depend
1d3d6d477c09e59c514e637fa3a2f7a4 download/CSWossh.checkinstall
0993813fa5c752215f892cb67c86816f download/CSWossh.preinstall
e9e93bfda8a883bca632c712d9c359f6 download/CSWossh.postinstall
-25f7a58f2a19feb40811e9d7df5bca26 download/CSWossh.prototype
-7614576845be17fc3ee2f6fea7b83695 download/changelog.CSW
+0251175f92d2ec655f033cfdf58aa0d8 download/CSWossh.prototype
0c7fca2f4bee3ecd489ebd85fdd8cdee download/sshd_config
73416a82ca98ba40e7b86ea94d0339cf download/cswopenssh
8e23e1f856f36e8e084a9283d22a7cbf download/svc-cswopenssh
547a915f1712c35dc79dc41378001ca9 download/cswopenssh.xml
-dc212745af1f549ce2a236401bf97c1b download/i.conf
-5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf
fd50a65230ec1ead7949e8500844b0bf download/openssh
+17fca1c009ef012c158b7051dd0f2b5a download/CSWosshclient.gspec
+1055c346c01d99d09572d978fad10256 download/CSWosshclient.depend
+3446a3185dddc9a63b28c588685c629e download/CSWosshclient.prototype
bd0f690fbb3abcbffe7924ae3016c8c3 download/openssh_restart_workaround.sh
-48c42896b94afb1126050647b6442751 download/openssh-5.1p1-gsskex-20081003.patch
+05420ca20fada7ec02bd9474701abc4b download/openssh-5.2p1-gsskex-20081003.patch
04da9aaea49aa4b026f156a48e577a19 download/don_t_use_TIOCSCTTY.patch
38a20d4c63ada0a7a68226cf5e8af9c5 download/no_x_forwarding_bug.patch
Modified: csw/mgar/pkg/openssh/trunk/files/CSWossh.depend
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWossh.depend 2009-03-21 12:55:15 UTC (rev 3854)
+++ csw/mgar/pkg/openssh/trunk/files/CSWossh.depend 2009-03-21 17:30:32 UTC (rev 3855)
@@ -2,3 +2,4 @@
P CSWtcpwrap
P CSWzlib
P CSWkrb5lib
+P CSWosshclient
Modified: csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype 2009-03-21 12:55:15 UTC (rev 3854)
+++ csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype 2009-03-21 17:30:32 UTC (rev 3855)
@@ -1,20 +1,10 @@
i i.conf=i.conf
i r.conf=r.conf
f none /etc/init.d/openssh=openssh 0755 root bin
-f none /opt/csw/bin/scp 0755 root bin
-f none /opt/csw/bin/sftp 0755 root bin
-s none /opt/csw/bin/slogin=./ssh
-f none /opt/csw/bin/ssh 0755 root bin
-f none /opt/csw/bin/ssh-add 0755 root bin
-f none /opt/csw/bin/ssh-agent 0755 root bin
-f none /opt/csw/bin/ssh-keygen 0755 root bin
-f none /opt/csw/bin/ssh-keyscan 0755 root bin
-e conf /opt/csw/etc/ssh/moduli 0644 root bin
-e conf /opt/csw/etc/ssh/ssh_config 0644 root bin
f none /opt/csw/etc/ssh/sshd_config.CSW=sshd_config 0744 root bin
+e conf /opt/csw/etc/ssh/moduli 0644 root bin
d none /opt/csw/libexec 0755 root bin
f none /opt/csw/libexec/sftp-server 0755 root bin
-f none /opt/csw/libexec/ssh-keysign 4711 root bin
f none /opt/csw/sbin/sshd 0755 root bin
f none /opt/csw/share/Ssh.bin 0644 root bin
d none /opt/csw/share/doc/openssh 0755 root bin
@@ -33,18 +23,8 @@
f none /opt/csw/share/doc/openssh/README.tun 0644 root bin
f none /opt/csw/share/doc/openssh/TODO 0644 root bin
f none /opt/csw/share/doc/openssh/WARNING.RNG 0644 root bin
-f none /opt/csw/share/man/man1/scp.1 0644 root bin
-f none /opt/csw/share/man/man1/sftp.1 0644 root bin
-s none /opt/csw/share/man/man1/slogin.1=./ssh.1
-f none /opt/csw/share/man/man1/ssh-add.1 0644 root bin
-f none /opt/csw/share/man/man1/ssh-agent.1 0644 root bin
-f none /opt/csw/share/man/man1/ssh-keygen.1 0644 root bin
-f none /opt/csw/share/man/man1/ssh-keyscan.1 0644 root bin
-f none /opt/csw/share/man/man1/ssh.1 0644 root bin
-f none /opt/csw/share/man/man5/ssh_config.5 0644 root bin
f none /opt/csw/share/man/man5/sshd_config.5 0644 root bin
f none /opt/csw/share/man/man8/sftp-server.8 0644 root bin
-f none /opt/csw/share/man/man8/ssh-keysign.8 0644 root bin
f none /opt/csw/share/man/man8/sshd.8 0644 root bin
d none /opt/csw/share/openssh 0755 root bin
f none /opt/csw/share/openssh/openssh_restart_workaround.sh=openssh_restart_workaround.sh 0755 root bin
Added: csw/mgar/pkg/openssh/trunk/files/CSWosshclient.depend
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshclient.depend (rev 0)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshclient.depend 2009-03-21 17:30:32 UTC (rev 3855)
@@ -0,0 +1,3 @@
+P CSWosslrt
+P CSWzlib
+P CSWkrb5lib
Added: csw/mgar/pkg/openssh/trunk/files/CSWosshclient.gspec
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshclient.gspec (rev 0)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshclient.gspec 2009-03-21 17:30:32 UTC (rev 3855)
@@ -0,0 +1,4 @@
+%var bitname openssh_client
+%var pkgname CSWosshclient
+%include url file://%{PKGLIB}/csw_dyndepend.gspec
+%copyright url file://%{WORKSRC}/LICENCE
Added: csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype (rev 0)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype 2009-03-21 17:30:32 UTC (rev 3855)
@@ -0,0 +1,39 @@
+i i.conf=i.conf
+i r.conf=r.conf
+f none /opt/csw/bin/scp 0755 root bin
+f none /opt/csw/bin/sftp 0755 root bin
+s none /opt/csw/bin/slogin=./ssh
+f none /opt/csw/bin/ssh 0755 root bin
+f none /opt/csw/bin/ssh-add 0755 root bin
+f none /opt/csw/bin/ssh-agent 0755 root bin
+f none /opt/csw/bin/ssh-keygen 0755 root bin
+f none /opt/csw/bin/ssh-keyscan 0755 root bin
+e conf /opt/csw/etc/ssh/ssh_config 0644 root bin
+d none /opt/csw/libexec 0755 root bin
+f none /opt/csw/libexec/ssh-keysign 4711 root bin
+d none /opt/csw/share/doc/openssh_client 0755 root bin
+f none /opt/csw/share/doc/openssh_client/changelog.CSW=changelog.CSW 0644 root bin
+f none /opt/csw/share/doc/openssh_client/CREDITS 0644 root bin
+f none /opt/csw/share/doc/openssh_client/ChangeLog 0644 root bin
+f none /opt/csw/share/doc/openssh_client/ChangeLog.gssapi 0644 root bin
+f none /opt/csw/share/doc/openssh_client/INSTALL 0644 root bin
+f none /opt/csw/share/doc/openssh_client/LICENCE 0644 root bin
+f none /opt/csw/share/doc/openssh_client/OVERVIEW 0644 root bin
+f none /opt/csw/share/doc/openssh_client/README 0644 root bin
+f none /opt/csw/share/doc/openssh_client/README.dns 0644 root bin
+f none /opt/csw/share/doc/openssh_client/README.platform 0644 root bin
+f none /opt/csw/share/doc/openssh_client/README.privsep 0644 root bin
+f none /opt/csw/share/doc/openssh_client/README.smartcard 0644 root bin
+f none /opt/csw/share/doc/openssh_client/README.tun 0644 root bin
+f none /opt/csw/share/doc/openssh_client/TODO 0644 root bin
+f none /opt/csw/share/doc/openssh_client/WARNING.RNG 0644 root bin
+f none /opt/csw/share/man/man1/scp.1 0644 root bin
+f none /opt/csw/share/man/man1/sftp.1 0644 root bin
+s none /opt/csw/share/man/man1/slogin.1=./ssh.1
+f none /opt/csw/share/man/man1/ssh-add.1 0644 root bin
+f none /opt/csw/share/man/man1/ssh-agent.1 0644 root bin
+f none /opt/csw/share/man/man1/ssh-keygen.1 0644 root bin
+f none /opt/csw/share/man/man1/ssh-keyscan.1 0644 root bin
+f none /opt/csw/share/man/man1/ssh.1 0644 root bin
+f none /opt/csw/share/man/man5/ssh_config.5 0644 root bin
+f none /opt/csw/share/man/man8/ssh-keysign.8 0644 root bin
Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-03-21 12:55:15 UTC (rev 3854)
+++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-03-21 17:30:32 UTC (rev 3855)
@@ -1,3 +1,9 @@
+openssh (5.1,REV=2008.02.15_rev=p1) unstable
+
+ * Package rebuild to solve incorrect package push in repository tree.
+
+ -- Yann Rouillard <yann at opencsw.org> Sat, 06 Dec 2008 15:36:48 +0100
+
openssh (5.1,REV=2008.12.06_rev=p1) unstable
* Added test for configuration file existence in sysV init script
Deleted: csw/mgar/pkg/openssh/trunk/files/cyrus.conf
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/cyrus.conf 2009-03-21 12:55:15 UTC (rev 3854)
+++ csw/mgar/pkg/openssh/trunk/files/cyrus.conf 2009-03-21 17:30:32 UTC (rev 3855)
@@ -1,42 +0,0 @@
-# standard standalone server implementation
-
-START {
- # do not delete this entry!
- recover cmd="/opt/csw/sbin/ctl_cyrusdb -r"
-
- # this is only necessary if using idled for IMAP IDLE
-# idled cmd="idled"
-}
-
-# UNIX sockets start with a slash and are put into /var/imap/sockets
-SERVICES {
- # add or remove based on preferences
- imap cmd="imapd" listen="imap" prefork=5
-# imaps cmd="imapd -s" listen="imaps" prefork=1
- pop3 cmd="pop3d" listen="pop3" prefork=3
-# pop3s cmd="pop3d -s" listen="pop3s" prefork=1
- sieve cmd="timsieved" listen="sieve" prefork=0
-
- # these are only necessary if receiving/exporting usenet via NNTP
-# nntp cmd="nntpd" listen="nntp" prefork=3
-# nntps cmd="nntpd -s" listen="nntps" prefork=1
-
- # at least one LMTP is required for delivery
-# lmtp cmd="lmtpd" listen="lmtp" prefork=0
- lmtpunix cmd="lmtpd" listen="/opt/csw/var/cyrus/config/socket/lmtp" prefork=1
-
- # this is only necessary if using notifications
-# notify cmd="notifyd" listen="/opt/csw/var/cyrus/config/socket/notify" proto="udp" prefork=1
-}
-
-EVENTS {
- # this is required
- checkpoint cmd="/opt/csw/sbin/ctl_cyrusdb -c" period=30
-
- # this is only necessary if using duplicate delivery suppression,
- # Sieve or NNTP
- delprune cmd="/opt/csw/sbin/cyr_expire -E 3" at=0400
-
- # this is only necessary if caching TLS sessions
- tlsprune cmd="/opt/csw/sbin/tls_prune" at=0400
-}
Deleted: csw/mgar/pkg/openssh/trunk/files/imapd.conf
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/imapd.conf 2009-03-21 12:55:15 UTC (rev 3854)
+++ csw/mgar/pkg/openssh/trunk/files/imapd.conf 2009-03-21 17:30:32 UTC (rev 3855)
@@ -1,63 +0,0 @@
-# The path where cyrus store its database files for
-# mailboxes list, seen states, folder subscription lists, ...
-configdirectory: /opt/csw/var/cyrus/config
-
-# The path where cyrus will store inboxes and folders
-partition-default: /opt/csw/var/cyrus/mail
-
-# The path where cyrus store sieve filters
-sievedir: /opt/csw/var/cyrus/sieve
-
-# Names of admins user who will have right to delete and
-# change acls of any mailboxes
-admins: cyrus
-
-# Put "yes" if you prefer to use "/" as the folder separator
-# useful if you need to use "." in folder names
-unixhierarchysep: no
-
-# Put "yes" here if you prefer user folders to be on the same
-# level with INBOX instead of being subfolders of INBOX.
-# useful if you migrate from uw imap
-altnamespace: no
-
-# Cyrus respect RFC 822 which prohibits 8 bits characters in headers.
-# By default cyrus will replace them with the "X" character.
-# As many bad MUA send this kind of messages, you cant put "no" here
-# if you want Cyrus to leave these characters untouched.
-# Note this will make IMAP SEARCH not work for these messages.
-munge8bit: yes
-
-# The sasl mechanism to use to authenticate user.
-# The possible values are: saslauthd, pwcheck and auxprop
-sasl_pwcheck_method: saslauthd
-
-# Authentication mechanism to use, if you use saslauthd with
-# local user, you will have to enable plaintext only mechanism
-# i.e PLAIN and LOGIN
-# sasl_mech_list: PLAIN LOGIN
-
-# group checking can cause performance problems; uncomment to disable if groups are not needed
-# unix_group_enable:0
-
-# If this field is nonzero, inbox folder is automatically created
-# when a user successfully authenticate.
-# Its quota will be initialized with this value, put -1 here
-# if you want automatic inbox creation with unlimlited quota
-# autocreatequota: -1
-
-# Put "yes" here and set autocreatequota to a nonzero value
-# if you want INBOX to be automatically created when an email
-# is received
-# createonpost: yes
-
-# Certificate to use for TLS/SSL with all services
-# You can use imaps_tls_cert_file, pop3_tls_cert_file, imaps_tls_cert_file ... if you need
-# to use a different certificate file for each service.
-# tls_cert_file: disabled
-
-# Private key belonging to the certificate to use for TLS/SSL with all services
-# You can use imaps_tls_key_file, pop3_tls_key_file, imaps_tls_key_file ... if you need
-# to use a different key file for each service.
-# tls_key_file: disabled
-#
Deleted: csw/mgar/pkg/openssh/trunk/files/openssh-5.1p1-gsskex-20081003.patch
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/openssh-5.1p1-gsskex-20081003.patch 2009-03-21 12:55:15 UTC (rev 3854)
+++ csw/mgar/pkg/openssh/trunk/files/openssh-5.1p1-gsskex-20081003.patch 2009-03-21 17:30:32 UTC (rev 3855)
@@ -1,2164 +0,0 @@
-diff --speed-large-files --minimal -Nru ChangeLog.gssapi ChangeLog.gssapi
---- ChangeLog.gssapi 1970-01-01 01:00:00.000000000 +0100
-+++ ChangeLog.gssapi 2008-10-03 21:03:11.484172000 +0200
-@@ -0,0 +1,75 @@
-+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.
-+ <Bugzilla #928>
-+ - [ 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
-+ <Bugzilla #1225>
-+
-+20060829
-+ - [ gss-serv-krb5.c ]
-+ Fix CCAPI credentials cache name when creating KRB5CCNAME environment
-+ variable
-+
-+20060828
-+ - [ gss-genr.c ]
-+ Avoid Heimdal context freeing problem
-+ <Fixed upstream 20060829>
-+
-+20060818
-+ - [ gss-genr.c ssh-gss.h sshconnect2.c ]
-+ Make sure that SPENGO is disabled
-+ <Bugzilla #1218 - Fixed upstream 20060818>
-+
-+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)
-+ <Bugzilla #1220 >
-+ - [ gss-serv-krb5.c ]
-+ #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H
-+ (from jbasney AT ncsa.uiuc.edu)
-+ <Fixed upstream 20060304>
-+ - [ 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)
-+ <gssapi-with-mic support is Bugzilla #1008>
-diff --speed-large-files --minimal -Nru Makefile.in Makefile.in
---- Makefile.in 2008-07-08 16:21:12.000000000 +0200
-+++ Makefile.in 2008-10-03 21:03:11.502437600 +0200
-@@ -71,7 +71,7 @@
- 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-rsa.o dh.o kexdh.o \
- kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \
-- entropy.o scard-opensc.o gss-genr.o umac.o
-+ entropy.o scard-opensc.o gss-genr.o umac.o kexgssc.o
-
- SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
- sshconnect.o sshconnect1.o sshconnect2.o mux.o
-@@ -84,7 +84,7 @@
- auth2-none.o auth2-passwd.o auth2-pubkey.o \
- monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \
- auth-krb5.o \
-- auth2-gss.o gss-serv.o gss-serv-krb5.o \
-+ auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\
- loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
- audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o
-
-diff --speed-large-files --minimal -Nru auth-krb5.c auth-krb5.c
---- auth-krb5.c 2006-08-05 04:39:39.000000000 +0200
-+++ auth-krb5.c 2008-10-03 21:03:11.515772200 +0200
-@@ -166,8 +166,13 @@
-
- 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)
-@@ -219,15 +224,22 @@
- #ifndef HEIMDAL
- krb5_error_code
- ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) {
-- int tmpfd, ret;
-+ int ret;
- char ccname[40];
- mode_t old_umask;
-+#ifdef USE_CCAPI
-+ char cctemplate[] = "API:krb5cc_%d";
-+#else
-+ char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX";
-+ int tmpfd;
-+#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:"));
- umask(old_umask);
-@@ -242,6 +254,7 @@
- return errno;
- }
- close(tmpfd);
-+#endif
-
- return (krb5_cc_resolve(ctx, ccname, ccache));
- }
-diff --speed-large-files --minimal -Nru auth.h auth.h
---- auth.h 2008-07-02 14:37:30.000000000 +0200
-+++ auth.h 2008-10-03 21:03:11.527360800 +0200
-@@ -53,6 +53,7 @@
- int valid; /* user exists and is allowed to login */
- int attempt;
- int failures;
-+ int server_caused_failure;
- int force_pwchange;
- char *user; /* username sent by the client */
- char *service;
-diff --speed-large-files --minimal -Nru auth2-gss.c auth2-gss.c
---- auth2-gss.c 2007-12-02 12:59:45.000000000 +0100
-+++ auth2-gss.c 2008-10-03 21:03:11.539510000 +0200
-@@ -52,6 +52,39 @@
- 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));
-+
-+ buffer_free(&b);
-+ xfree(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)
-@@ -102,6 +135,7 @@
-
- if (!present) {
- xfree(doid);
-+ authctxt->server_caused_failure = 1;
- return (0);
- }
-
-@@ -109,6 +143,7 @@
- if (ctxt != NULL)
- ssh_gssapi_delete_ctx(&ctxt);
- xfree(doid);
-+ authctxt->server_caused_failure = 1;
- return (0);
- }
-
-@@ -292,6 +327,12 @@
- userauth_finish(authctxt, authenticated, "gssapi-with-mic");
- }
-
-+Authmethod method_gsskeyex = {
-+ "gssapi-keyex",
-+ userauth_gsskeyex,
-+ &options.gss_authentication
-+};
-+
- Authmethod method_gssapi = {
- "gssapi-with-mic",
- userauth_gssapi,
-diff --speed-large-files --minimal -Nru auth2.c auth2.c
---- auth2.c 2008-07-05 01:44:53.000000000 +0200
-+++ auth2.c 2008-10-03 21:03:53.828669000 +0200
-@@ -69,6 +69,7 @@
- extern Authmethod method_kbdint;
- extern Authmethod method_hostbased;
- #ifdef GSSAPI
-+extern Authmethod method_gsskeyex;
- extern Authmethod method_gssapi;
- #endif
-
-@@ -76,6 +77,7 @@
- &method_none,
- &method_pubkey,
- #ifdef GSSAPI
-+ &method_gsskeyex,
- &method_gssapi,
- #endif
- &method_passwd,
-@@ -264,6 +266,7 @@
- #endif
-
- authctxt->postponed = 0;
-+ authctxt->server_caused_failure = 0;
-
- /* try to authenticate user */
- m = authmethod_lookup(method);
-@@ -338,7 +341,9 @@
- /* Allow initial try of "none" auth without failure penalty */
- if (authctxt->attempt > 1 || strcmp(method, "none") != 0)
- authctxt->failures++;
-- if (authctxt->failures >= options.max_authtries) {
-+ /* Dont count server configuration issues against the client */
-+ if (!authctxt->server_caused_failure &&
-+ authctxt->failures++ > options.max_authtries) {
- #ifdef SSH_AUDIT_EVENTS
- PRIVSEP(audit_event(SSH_LOGIN_EXCEED_MAXTRIES));
- #endif
-diff --speed-large-files --minimal -Nru configure.ac configure.ac
---- configure.ac 2008-07-09 13:07:19.000000000 +0200
-+++ configure.ac 2008-10-03 21:03:11.603043400 +0200
-@@ -473,6 +473,30 @@
- [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 <Security/AuthSession.h>],
-+ [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 <Kerberos/Kerberos.h>],
-+ [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])
-diff --speed-large-files --minimal -Nru gss-genr.c gss-genr.c
---- gss-genr.c 2007-06-12 15:44:36.000000000 +0200
-+++ gss-genr.c 2008-10-03 21:03:11.633999400 +0200
-@@ -39,12 +39,160 @@
- #include "buffer.h"
- #include "log.h"
- #include "ssh2.h"
-+#include "cipher.h"
-+#include "key.h"
-+#include "kex.h"
-+#include <openssl/evp.h>
-
- #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) {
-+ gss_OID_set gss_supported;
-+ OM_uint32 min_status;
-+
-+ gss_indicate_mechs(&min_status, &gss_supported);
-+
-+ return(ssh_gssapi_kex_mechs(gss_supported, ssh_gssapi_check_mechanism,
-+ host));
-+}
-+
-+char *
-+ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check,
-+ const char *data) {
-+ 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++)
-+ xfree(gss_enc2oid[i].encoded);
-+ xfree(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]), data)) {
-+
-+ 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) {
-+ xfree(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:
-+ name += sizeof(KEX_GSS_GRP1_SHA1_ID) - 1;
-+ break;
-+ case KEX_GSS_GRP14_SHA1:
-+ name += sizeof(KEX_GSS_GRP14_SHA1_ID) - 1;
-+ break;
-+ case KEX_GSS_GEX_SHA1:
-+ 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)
-@@ -229,6 +377,9 @@
- 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);
-@@ -236,6 +387,19 @@
- 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)
-@@ -254,6 +418,10 @@
- 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 &&
-@@ -272,7 +440,7 @@
- GSS_C_NO_BUFFER);
- }
-
-- if (GSS_ERROR(major))
-+ if (GSS_ERROR(major) || intctx != NULL)
- ssh_gssapi_delete_ctx(ctx);
-
- return (!GSS_ERROR(major));
-diff --speed-large-files --minimal -Nru gss-serv-krb5.c gss-serv-krb5.c
---- gss-serv-krb5.c 2006-09-01 07:38:36.000000000 +0200
-+++ gss-serv-krb5.c 2008-10-03 21:03:11.653344000 +0200
-@@ -120,6 +120,7 @@
- krb5_principal princ;
- OM_uint32 maj_status, min_status;
- int len;
-+ const char *new_ccname;
-
- if (client->creds == NULL) {
- debug("No credentials stored");
-@@ -168,11 +169,16 @@
- 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)
-diff --speed-large-files --minimal -Nru gss-serv.c gss-serv.c
---- gss-serv.c 2008-05-19 07:05:07.000000000 +0200
-+++ gss-serv.c 2008-10-03 21:03:11.676150400 +0200
-@@ -1,7 +1,7 @@
- /* $OpenBSD: gss-serv.c,v 1.22 2008/05/08 12:02:23 djm Exp $ */
-
- /*
-- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
-+ * Copyright (c) 2001-2008 Simon Wilkinson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
-@@ -45,8 +45,12 @@
- #include "channels.h"
- #include "session.h"
- #include "misc.h"
-+#include "servconf.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,
-@@ -81,25 +85,32 @@
- 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))) {
-+ 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);
-
-- if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) {
- 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 */
-@@ -114,6 +125,28 @@
- }
-
- /* 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));
-+}
-+
-+/* Unprivileged */
-+int
-+ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data) {
-+ 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)
- {
-@@ -352,14 +385,4 @@
- return (0);
- }
-
--/* Privileged */
--OM_uint32
--ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
--{
-- ctx->major = gss_verify_mic(&ctx->minor, ctx->context,
-- gssbuf, gssmic, NULL);
--
-- return (ctx->major);
--}
--
- #endif
-diff --speed-large-files --minimal -Nru kex.c kex.c
---- kex.c 2007-06-05 10:30:18.000000000 +0200
-+++ kex.c 2008-10-03 21:03:11.691687000 +0200
-@@ -49,6 +49,10 @@
- #include "dispatch.h"
- #include "monitor.h"
-
-+#ifdef GSSAPI
-+#include "ssh-gss.h"
-+#endif
-+
- #define KEX_COOKIE_LEN 16
-
- #if OPENSSL_VERSION_NUMBER >= 0x00907000L
-@@ -327,6 +331,20 @@
- k->kex_type = KEX_DH_GEX_SHA256;
- k->evp_md = evp_ssh_sha256();
- #endif
-+#ifdef GSSAPI
-+ } else if (strncmp(k->name, KEX_GSS_GEX_SHA1_ID,
-+ sizeof(KEX_GSS_GEX_SHA1_ID) - 1) == 0) {
-+ k->kex_type = KEX_GSS_GEX_SHA1;
-+ k->evp_md = EVP_sha1();
-+ } else if (strncmp(k->name, KEX_GSS_GRP1_SHA1_ID,
-+ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1) == 0) {
-+ k->kex_type = KEX_GSS_GRP1_SHA1;
-+ k->evp_md = EVP_sha1();
-+ } else if (strncmp(k->name, KEX_GSS_GRP14_SHA1_ID,
-+ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1) == 0) {
-+ k->kex_type = KEX_GSS_GRP14_SHA1;
-+ k->evp_md = EVP_sha1();
-+#endif
- } else
- fatal("bad kex alg %s", k->name);
- }
-diff --speed-large-files --minimal -Nru kex.h kex.h
---- kex.h 2007-06-11 06:01:42.000000000 +0200
-+++ kex.h 2008-10-03 21:03:11.704292200 +0200
-@@ -64,6 +64,9 @@
- KEX_DH_GRP14_SHA1,
- KEX_DH_GEX_SHA1,
- KEX_DH_GEX_SHA256,
-+ KEX_GSS_GRP1_SHA1,
-+ KEX_GSS_GRP14_SHA1,
-+ KEX_GSS_GEX_SHA1,
- KEX_MAX
- };
-
-@@ -119,6 +122,11 @@
- sig_atomic_t done;
- int flags;
- const EVP_MD *evp_md;
-+#ifdef GSSAPI
-+ int gss_deleg_creds;
-+ int gss_trust_dns;
-+ char *gss_host;
-+#endif
- char *client_version_string;
- char *server_version_string;
- int (*verify_host_key)(Key *);
-@@ -141,6 +149,11 @@
- void kexgex_client(Kex *);
- void kexgex_server(Kex *);
-
-+#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 *);
-diff --speed-large-files --minimal -Nru kexgssc.c kexgssc.c
---- kexgssc.c 1970-01-01 01:00:00.000000000 +0100
-+++ kexgssc.c 2008-10-03 21:03:11.716704800 +0200
-@@ -0,0 +1,319 @@
-+/*
-+ * Copyright (c) 2001-2006 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 <openssl/crypto.h>
-+#include <openssl/bn.h>
-+
-+#include <string.h>
-+
-+#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;
-+ 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");
-+
-+ 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)
-+ xfree(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);
-+
-+ shared_secret = BN_new();
-+ BN_bin2bn(kbuf,kout, shared_secret);
-+ memset(kbuf, 0, klen);
-+ xfree(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, slen, /* server host key */
-+ dh->pub_key, /* e */
-+ dh_server_pub, /* f */
-+ shared_secret, /* K */
-+ &hash, &hashlen
-+ );
-+ break;
-+ case KEX_GSS_GEX_SHA1:
-+ kexgex_hash(
-+ kex->evp_md,
-+ 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, 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");
-+
-+ xfree(msg_tok.value);
-+
-+ DH_free(dh);
-+ if (serverhostkey)
-+ xfree(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 (gss_kex_context == NULL)
-+ gss_kex_context = ctxt;
-+ else
-+ ssh_gssapi_delete_ctx(&ctxt);
-+
-+ kex_derive_keys(kex, hash, hashlen, shared_secret);
-+ BN_clear_free(shared_secret);
-+ kex_finish(kex);
-+}
-+
-+#endif /* GSSAPI */
-diff --speed-large-files --minimal -Nru kexgsss.c kexgsss.c
---- kexgsss.c 1970-01-01 01:00:00.000000000 +0100
-+++ kexgsss.c 2008-10-03 21:03:11.727451400 +0200
-@@ -0,0 +1,271 @@
-+/*
-+ * Copyright (c) 2001-2006 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 <string.h>
-+
-+#include <openssl/crypto.h>
-+#include <openssl/bn.h>
-+
-+#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"
-+
-+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;
-+
-+ /* 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())
-+ ssh_gssapi_server_mechanisms();
-+
-+ 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));
-+
-+ xfree(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);
-+
-+ shared_secret = BN_new();
-+ BN_bin2bn(kbuf, kout, shared_secret);
-+ memset(kbuf, 0, klen);
-+ xfree(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->evp_md,
-+ 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_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(kex, hash, hashlen, shared_secret);
-+ BN_clear_free(shared_secret);
-+ kex_finish(kex);
-+}
-+#endif /* GSSAPI */
-diff --speed-large-files --minimal -Nru key.c key.c
---- key.c 2008-07-11 09:35:09.000000000 +0200
-+++ key.c 2008-10-03 21:03:11.748790400 +0200
-@@ -763,6 +763,8 @@
- return KEY_RSA;
- } else if (strcmp(name, "ssh-dss") == 0) {
- return KEY_DSA;
-+ } else if (strcmp(name, "null") == 0) {
-+ return KEY_NULL;
- }
- debug2("key_type_from_name: unknown key type '%s'", name);
- return KEY_UNSPEC;
-diff --speed-large-files --minimal -Nru key.h key.h
---- key.h 2008-06-12 20:40:35.000000000 +0200
-+++ key.h 2008-10-03 21:03:11.761785800 +0200
-@@ -34,6 +34,7 @@
- KEY_RSA1,
- KEY_RSA,
- KEY_DSA,
-+ KEY_NULL,
- KEY_UNSPEC
- };
- enum fp_type {
-diff --speed-large-files --minimal -Nru monitor.c monitor.c
---- monitor.c 2008-07-11 09:36:48.000000000 +0200
-+++ monitor.c 2008-10-03 21:03:11.786820800 +0200
-@@ -164,6 +164,7 @@
- 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 *);
- #endif
-
- #ifdef SSH_AUDIT_EVENTS
-@@ -233,11 +234,17 @@
- {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},
-+#endif
- {MONITOR_REQ_MODULI, 0, mm_answer_moduli},
- {MONITOR_REQ_SIGN, 0, mm_answer_sign},
- {MONITOR_REQ_PTY, 0, mm_answer_pty},
-@@ -342,6 +349,10 @@
- /* 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;
-
-@@ -419,6 +430,10 @@
- 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);
-@@ -1675,6 +1690,11 @@
- kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server;
- kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
- kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
-+#ifdef GSSAPI
-+ 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);
-@@ -1918,6 +1938,7 @@
- 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);
- }
-@@ -1968,4 +1989,42 @@
- /* 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;
-+
-+ data.value = buffer_get_string(m, &len);
-+ data.length = len;
-+ if (data.length != 20)
-+ fatal("%s: data length incorrect: %d", __func__, 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);
-+
-+ xfree(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);
-+
-+ return (0);
-+}
-+
- #endif /* GSSAPI */
-diff --speed-large-files --minimal -Nru monitor.h monitor.h
---- monitor.h 2006-03-26 05:30:02.000000000 +0200
-+++ monitor.h 2008-10-03 21:03:11.805411200 +0200
-@@ -53,6 +53,7 @@
- MONITOR_REQ_GSSSTEP, MONITOR_ANS_GSSSTEP,
- MONITOR_REQ_GSSUSEROK, MONITOR_ANS_GSSUSEROK,
- MONITOR_REQ_GSSCHECKMIC, MONITOR_ANS_GSSCHECKMIC,
-+ MONITOR_REQ_GSSSIGN, MONITOR_ANS_GSSSIGN,
- MONITOR_REQ_PAM_START,
- MONITOR_REQ_PAM_ACCOUNT, MONITOR_ANS_PAM_ACCOUNT,
- MONITOR_REQ_PAM_INIT_CTX, MONITOR_ANS_PAM_INIT_CTX,
-diff --speed-large-files --minimal -Nru monitor_wrap.c monitor_wrap.c
---- monitor_wrap.c 2008-07-11 09:36:48.000000000 +0200
-+++ monitor_wrap.c 2008-10-03 21:03:11.826698000 +0200
-@@ -1255,4 +1255,27 @@
- 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);
-+}
-+
- #endif /* GSSAPI */
-diff --speed-large-files --minimal -Nru monitor_wrap.h monitor_wrap.h
---- monitor_wrap.h 2006-08-05 04:39:40.000000000 +0200
-+++ monitor_wrap.h 2008-10-03 21:03:11.840740600 +0200
-@@ -59,6 +59,7 @@
- gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *);
- int mm_ssh_gssapi_userok(char *user);
- 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);
- #endif
-
- #ifdef USE_PAM
-diff --speed-large-files --minimal -Nru readconf.c readconf.c
---- readconf.c 2008-06-29 16:04:03.000000000 +0200
-+++ readconf.c 2008-10-03 21:03:11.864483000 +0200
-@@ -127,6 +127,8 @@
- oClearAllForwardings, oNoHostAuthenticationForLocalhost,
- oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
- oAddressFamily, oGssAuthentication, oGssDelegateCreds,
-+ oGssKeyEx,
-+ oGssTrustDns,
- oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
- oSendEnv, oControlPath, oControlMaster, oHashKnownHosts,
- oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
-@@ -164,10 +166,14 @@
- { "afstokenpassing", oUnsupported },
- #if defined(GSSAPI)
- { "gssapiauthentication", oGssAuthentication },
-+ { "gssapikeyexchange", oGssKeyEx },
- { "gssapidelegatecredentials", oGssDelegateCreds },
-+ { "gssapitrustdns", oGssTrustDns },
- #else
- { "gssapiauthentication", oUnsupported },
-+ { "gssapikeyexchange", oUnsupported },
- { "gssapidelegatecredentials", oUnsupported },
-+ { "gssapitrustdns", oUnsupported },
- #endif
- { "fallbacktorsh", oDeprecated },
- { "usersh", oDeprecated },
-@@ -444,10 +450,18 @@
- 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 oGssTrustDns:
-+ intptr = &options->gss_trust_dns;
-+ goto parse_flag;
-+
- case oBatchMode:
- intptr = &options->batch_mode;
- goto parse_flag;
-@@ -1016,7 +1030,9 @@
- options->pubkey_authentication = -1;
- options->challenge_response_authentication = -1;
- options->gss_authentication = -1;
-+ options->gss_keyex = -1;
- options->gss_deleg_creds = -1;
-+ options->gss_trust_dns = -1;
- options->password_authentication = -1;
- options->kbd_interactive_authentication = -1;
- options->kbd_interactive_devices = NULL;
-@@ -1106,8 +1122,12 @@
- 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_trust_dns == -1)
-+ options->gss_trust_dns = 0;
- if (options->password_authentication == -1)
- options->password_authentication = 1;
- if (options->kbd_interactive_authentication == -1)
-diff --speed-large-files --minimal -Nru readconf.h readconf.h
---- readconf.h 2008-06-29 16:04:03.000000000 +0200
-+++ readconf.h 2008-10-03 21:03:11.882030400 +0200
-@@ -44,7 +44,9 @@
- 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_trust_dns; /* Trust DNS for GSS canonicalization */
- int password_authentication; /* Try password
- * authentication. */
- int kbd_interactive_authentication; /* Try keyboard-interactive auth. */
-diff --speed-large-files --minimal -Nru servconf.c servconf.c
---- servconf.c 2008-07-04 05:51:12.000000000 +0200
-+++ servconf.c 2008-10-03 21:03:11.907984000 +0200
-@@ -92,7 +92,9 @@
- 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_strict_acceptor = -1;
- options->password_authentication = -1;
- options->kbd_interactive_authentication = -1;
- options->challenge_response_authentication = -1;
-@@ -209,8 +211,12 @@
- 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_strict_acceptor == -1)
-+ options->gss_strict_acceptor = 1;
- if (options->password_authentication == -1)
- options->password_authentication = 1;
- if (options->kbd_interactive_authentication == -1)
-@@ -299,7 +305,9 @@
- sBanner, sUseDNS, sHostbasedAuthentication,
- sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,
- sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
-- sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
-+ sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor,
-+ sGssKeyEx,
-+ sAcceptEnv, sPermitTunnel,
- sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
- sUsePrivilegeSeparation, sAllowAgentForwarding,
- sDeprecated, sUnsupported
-@@ -360,9 +368,13 @@
- #ifdef GSSAPI
- { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL },
- { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL },
-+ { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL },
-+ { "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL },
- #else
- { "gssapiauthentication", sUnsupported, SSHCFG_ALL },
- { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL },
-+ { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL },
-+ { "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL },
- #endif
- { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL },
- { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },
-@@ -882,10 +894,18 @@
- 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 sGssStrictAcceptor:
-+ intptr = &options->gss_strict_acceptor;
-+ goto parse_flag;
-+
- case sPasswordAuthentication:
- intptr = &options->password_authentication;
- goto parse_flag;
-diff --speed-large-files --minimal -Nru servconf.h servconf.h
---- servconf.h 2008-06-10 15:01:51.000000000 +0200
-+++ servconf.h 2008-10-03 21:03:11.935018800 +0200
-@@ -91,7 +91,9 @@
- 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_strict_acceptor; /* If true, restrict the GSSAPI acceptor name */
- int password_authentication; /* If true, permit password
- * authentication. */
- int kbd_interactive_authentication; /* If true, permit */
-diff --speed-large-files --minimal -Nru ssh-gss.h ssh-gss.h
---- ssh-gss.h 2007-06-12 15:40:39.000000000 +0200
-+++ ssh-gss.h 2008-10-03 21:03:11.947192800 +0200
-@@ -60,6 +60,17 @@
-
- #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;
-@@ -97,6 +108,7 @@
- } 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);
-@@ -119,6 +131,11 @@
- int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *);
-
- /* In the server */
-+typedef int ssh_gssapi_check_fn(Gssctxt **, gss_OID, const char *);
-+char *ssh_gssapi_client_mechanisms(const char *host);
-+char *ssh_gssapi_kex_mechs(gss_OID_set, ssh_gssapi_check_fn *, const char *);
-+gss_OID ssh_gssapi_id_kex(Gssctxt *, char *, int);
-+int ssh_gssapi_server_check_mech(Gssctxt **,gss_OID, const char *);
- OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
- int ssh_gssapi_userok(char *name);
- OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t);
-@@ -126,6 +143,8 @@
- void ssh_gssapi_cleanup_creds(void);
- void ssh_gssapi_storecreds(void);
-
-+char *ssh_gssapi_server_mechanisms(void);
-+int ssh_gssapi_oid_table_ok();
- #endif /* GSSAPI */
-
- #endif /* _SSH_GSS_H */
-diff --speed-large-files --minimal -Nru ssh_config ssh_config
---- ssh_config 2007-06-11 06:04:42.000000000 +0200
-+++ ssh_config 2008-10-03 21:03:11.958427200 +0200
-@@ -26,6 +26,8 @@
- # HostbasedAuthentication no
- # GSSAPIAuthentication no
- # GSSAPIDelegateCredentials no
-+# GSSAPIKeyExchange no
-+# GSSAPITrustDNS no
- # BatchMode no
- # CheckHostIP yes
- # AddressFamily any
-diff --speed-large-files --minimal -Nru ssh_config.5 ssh_config.5
---- ssh_config.5 2008-06-29 16:04:03.000000000 +0200
-+++ ssh_config.5 2008-10-03 21:03:11.981607200 +0200
-@@ -478,11 +478,28 @@
- 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 GSSAPIDelegateCredentials
- Forward (delegate) credentials to the server.
- The default is
- .Dq no .
- Note that this option applies to protocol version 2 only.
-+.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
-diff --speed-large-files --minimal -Nru sshconnect2.c sshconnect2.c
---- sshconnect2.c 2008-07-17 11:15:43.000000000 +0200
-+++ sshconnect2.c 2008-10-03 21:03:12.017715400 +0200
-@@ -102,9 +102,34 @@
- {
- 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);
-+ 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;
-@@ -132,6 +157,16 @@
- myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =
- options.hostkeyalgorithms;
-
-+#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);
-+ }
-+#endif
-+
- if (options.rekey_limit)
- packet_set_rekey_limit((u_int32_t)options.rekey_limit);
-
-@@ -141,10 +176,21 @@
- kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client;
- kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;
- kex->kex[KEX_DH_GEX_SHA256] = kexgex_client;
-+#ifdef GSSAPI
-+ 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
-+ kex->gss_deleg_creds = options.gss_deleg_creds;
-+ kex->gss_trust_dns = options.gss_trust_dns;
-+ kex->gss_host = gss_host;
-+#endif
-+
- xxx_kex = kex;
-
- dispatch_run(DISPATCH_BLOCK, &kex->done, kex);
-@@ -227,6 +273,7 @@
- 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 *);
-@@ -242,6 +289,10 @@
-
- Authmethod authmethods[] = {
- #ifdef GSSAPI
-+ {"gssapi-keyex",
-+ userauth_gsskeyex,
-+ &options.gss_authentication,
-+ NULL},
- {"gssapi-with-mic",
- userauth_gssapi,
- &options.gss_authentication,
-@@ -511,6 +562,12 @@
- static u_int mech = 0;
- OM_uint32 min;
- int ok = 0;
-+ char *gss_host = NULL;
-+
-+ if (options.gss_trust_dns)
-+ gss_host = (char *)get_canonical_hostname(1);
-+ else
-+ gss_host = (char *)authctxt->host;
-
- /* Try one GSSAPI method at a time, rather than sending them all at
- * once. */
-@@ -523,7 +580,7 @@
- /* 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)) {
- ok = 1; /* Mechanism works */
- } else {
- mech++;
-@@ -619,8 +676,8 @@
- {
- 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");
-@@ -727,6 +784,48 @@
- xfree(msg);
- xfree(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
-diff --speed-large-files --minimal -Nru sshd.c sshd.c
---- sshd.c 2008-07-11 09:36:49.000000000 +0200
-+++ sshd.c 2008-10-03 21:03:12.054280000 +0200
-@@ -120,6 +120,10 @@
- #include "monitor_fdpass.h"
- #include "version.h"
-
-+#ifdef USE_SECURITY_SESSION_API
-+#include <Security/AuthSession.h>
-+#endif
-+
- #ifdef LIBWRAP
- #include <tcpd.h>
- #include <syslog.h>
-@@ -1531,10 +1535,13 @@
- 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);
-@@ -1818,6 +1825,60 @@
- /* Log the connection. */
- verbose("Connection from %.500s port %d", remote_ip, remote_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
-@@ -2195,12 +2256,59 @@
-
- myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = 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;
-+#ifdef GSSAPI
-+ 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;
-diff --speed-large-files --minimal -Nru sshd_config sshd_config
---- sshd_config 2008-07-02 14:35:43.000000000 +0200
-+++ sshd_config 2008-10-03 21:03:12.082510000 +0200
-@@ -73,6 +73,8 @@
- # GSSAPI options
- #GSSAPIAuthentication no
- #GSSAPICleanupCredentials yes
-+#GSSAPIStrictAcceptorCheck yes
-+#GSSAPIKeyExchange no
-
- # Set this to 'yes' to enable PAM authentication, account processing,
- # and session processing. If this is enabled, PAM authentication will
-diff --speed-large-files --minimal -Nru sshd_config.5 sshd_config.5
---- sshd_config.5 2008-07-02 14:35:43.000000000 +0200
-+++ sshd_config.5 2008-10-03 21:03:12.104920600 +0200
-@@ -374,12 +374,35 @@
- 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 HostbasedAuthentication
- Specifies whether rhosts or /etc/hosts.equiv authentication together
- with successful public key client host authentication is allowed
Added: csw/mgar/pkg/openssh/trunk/files/openssh-5.2p1-gsskex-20081003.patch
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/openssh-5.2p1-gsskex-20081003.patch (rev 0)
+++ csw/mgar/pkg/openssh/trunk/files/openssh-5.2p1-gsskex-20081003.patch 2009-03-21 17:30:32 UTC (rev 3855)
@@ -0,0 +1,2170 @@
+diff -urN ChangeLog.gssapi ChangeLog.gssapi
+--- ChangeLog.gssapi 1970-01-01 01:00:00.000000000 +0100
++++ ChangeLog.gssapi 2008-10-03 21:03:11.484172000 +0200
+@@ -0,0 +1,75 @@
++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.
++ <Bugzilla #928>
++ - [ 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
++ <Bugzilla #1225>
++
++20060829
++ - [ gss-serv-krb5.c ]
++ Fix CCAPI credentials cache name when creating KRB5CCNAME environment
++ variable
++
++20060828
++ - [ gss-genr.c ]
++ Avoid Heimdal context freeing problem
++ <Fixed upstream 20060829>
++
++20060818
++ - [ gss-genr.c ssh-gss.h sshconnect2.c ]
++ Make sure that SPENGO is disabled
++ <Bugzilla #1218 - Fixed upstream 20060818>
++
++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)
++ <Bugzilla #1220 >
++ - [ gss-serv-krb5.c ]
++ #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H
++ (from jbasney AT ncsa.uiuc.edu)
++ <Fixed upstream 20060304>
++ - [ 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)
++ <gssapi-with-mic support is Bugzilla #1008>
+diff -urN openssh-5.2p1/Makefile.in openssh-5.2p1.new/Makefile.in
+--- Makefile.in 2008-11-05 06:20:46.000000000 +0100
++++ Makefile.in 2009-03-21 15:39:14.000000000 +0100
+@@ -71,7 +71,7 @@
+ 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-rsa.o dh.o kexdh.o \
+ kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \
+- entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o
++ entropy.o scard-opensc.o gss-genr.o umac.o kexgssc.o jpake.o schnorr.o
+
+ SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
+ sshconnect.o sshconnect1.o sshconnect2.o mux.o
+@@ -84,7 +84,7 @@
+ auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \
+ monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \
+ auth-krb5.o \
+- auth2-gss.o gss-serv.o gss-serv-krb5.o \
++ auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\
+ loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
+ audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o
+
+diff -urN openssh-5.2p1/auth-krb5.c openssh-5.2p1.new/auth-krb5.c
+--- auth-krb5.c 2006-08-05 04:39:39.000000000 +0200
++++ auth-krb5.c 2009-03-21 15:19:18.000000000 +0100
+@@ -166,8 +166,13 @@
+
+ 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)
+@@ -219,15 +224,22 @@
+ #ifndef HEIMDAL
+ krb5_error_code
+ ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) {
+- int tmpfd, ret;
++ int ret;
+ char ccname[40];
+ mode_t old_umask;
++#ifdef USE_CCAPI
++ char cctemplate[] = "API:krb5cc_%d";
++#else
++ char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX";
++ int tmpfd;
++#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:"));
+ umask(old_umask);
+@@ -242,6 +254,7 @@
+ return errno;
+ }
+ close(tmpfd);
++#endif
+
+ return (krb5_cc_resolve(ctx, ccname, ccache));
+ }
+diff -urN openssh-5.2p1/auth.h openssh-5.2p1.new/auth.h
+--- auth.h 2008-11-05 06:20:46.000000000 +0100
++++ auth.h 2009-03-21 15:19:18.000000000 +0100
+@@ -53,6 +53,7 @@
+ int valid; /* user exists and is allowed to login */
+ int attempt;
+ int failures;
++ int server_caused_failure;
+ int force_pwchange;
+ char *user; /* username sent by the client */
+ char *service;
+diff -urN openssh-5.2p1/auth2-gss.c openssh-5.2p1.new/auth2-gss.c
+--- auth2-gss.c 2007-12-02 12:59:45.000000000 +0100
++++ auth2-gss.c 2009-03-21 15:19:18.000000000 +0100
+@@ -52,6 +52,39 @@
+ 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));
++
++ buffer_free(&b);
++ xfree(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)
+@@ -102,6 +135,7 @@
+
+ if (!present) {
+ xfree(doid);
++ authctxt->server_caused_failure = 1;
+ return (0);
+ }
+
+@@ -109,6 +143,7 @@
+ if (ctxt != NULL)
+ ssh_gssapi_delete_ctx(&ctxt);
+ xfree(doid);
++ authctxt->server_caused_failure = 1;
+ return (0);
+ }
+
+@@ -292,6 +327,12 @@
+ userauth_finish(authctxt, authenticated, "gssapi-with-mic");
+ }
+
++Authmethod method_gsskeyex = {
++ "gssapi-keyex",
++ userauth_gsskeyex,
++ &options.gss_authentication
++};
++
+ Authmethod method_gssapi = {
+ "gssapi-with-mic",
+ userauth_gssapi,
+diff -urN openssh-5.2p1/auth2.c openssh-5.2p1.new/auth2.c
+--- auth2.c 2008-11-05 06:20:46.000000000 +0100
++++ auth2.c 2009-03-21 15:19:18.000000000 +0100
+@@ -69,6 +69,7 @@
+ extern Authmethod method_kbdint;
+ extern Authmethod method_hostbased;
+ #ifdef GSSAPI
++extern Authmethod method_gsskeyex;
+ extern Authmethod method_gssapi;
+ #endif
+ #ifdef JPAKE
+@@ -79,6 +80,7 @@
+ &method_none,
+ &method_pubkey,
+ #ifdef GSSAPI
++ &method_gsskeyex,
+ &method_gssapi,
+ #endif
+ #ifdef JPAKE
+@@ -274,6 +276,7 @@
+ #endif
+
+ authctxt->postponed = 0;
++ authctxt->server_caused_failure = 0;
+
+ /* try to authenticate user */
+ m = authmethod_lookup(method);
+@@ -348,7 +351,9 @@
+ /* Allow initial try of "none" auth without failure penalty */
+ if (authctxt->attempt > 1 || strcmp(method, "none") != 0)
+ authctxt->failures++;
+- if (authctxt->failures >= options.max_authtries) {
++ /* Dont count server configuration issues against the client */
++ if (!authctxt->server_caused_failure &&
++ authctxt->failures++ > options.max_authtries) {
+ #ifdef SSH_AUDIT_EVENTS
+ PRIVSEP(audit_event(SSH_LOGIN_EXCEED_MAXTRIES));
+ #endif
+diff -urN openssh-5.2p1/configure.ac openssh-5.2p1.new/configure.ac
+--- configure.ac 2009-02-16 05:37:03.000000000 +0100
++++ configure.ac 2009-03-21 15:19:19.000000000 +0100
+@@ -473,6 +473,30 @@
+ [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 <Security/AuthSession.h>],
++ [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 <Kerberos/Kerberos.h>],
++ [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])
+diff -urN openssh-5.2p1/gss-genr.c openssh-5.2p1.new/gss-genr.c
+--- gss-genr.c 2007-06-12 15:44:36.000000000 +0200
++++ gss-genr.c 2009-03-21 15:19:19.000000000 +0100
+@@ -39,12 +39,160 @@
+ #include "buffer.h"
+ #include "log.h"
+ #include "ssh2.h"
++#include "cipher.h"
++#include "key.h"
++#include "kex.h"
++#include <openssl/evp.h>
+
+ #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) {
++ gss_OID_set gss_supported;
++ OM_uint32 min_status;
++
++ gss_indicate_mechs(&min_status, &gss_supported);
++
++ return(ssh_gssapi_kex_mechs(gss_supported, ssh_gssapi_check_mechanism,
++ host));
++}
++
++char *
++ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check,
++ const char *data) {
++ 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++)
++ xfree(gss_enc2oid[i].encoded);
++ xfree(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]), data)) {
++
++ 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) {
++ xfree(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:
++ name += sizeof(KEX_GSS_GRP1_SHA1_ID) - 1;
++ break;
++ case KEX_GSS_GRP14_SHA1:
++ name += sizeof(KEX_GSS_GRP14_SHA1_ID) - 1;
++ break;
++ case KEX_GSS_GEX_SHA1:
++ 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)
+@@ -229,6 +377,9 @@
+ 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);
+@@ -236,6 +387,19 @@
+ 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)
+@@ -254,6 +418,10 @@
+ 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 &&
+@@ -272,7 +440,7 @@
+ GSS_C_NO_BUFFER);
+ }
+
+- if (GSS_ERROR(major))
++ if (GSS_ERROR(major) || intctx != NULL)
+ ssh_gssapi_delete_ctx(ctx);
+
+ return (!GSS_ERROR(major));
+diff -urN openssh-5.2p1/gss-serv-krb5.c openssh-5.2p1.new/gss-serv-krb5.c
+--- gss-serv-krb5.c 2006-09-01 07:38:36.000000000 +0200
++++ gss-serv-krb5.c 2009-03-21 15:19:19.000000000 +0100
+@@ -120,6 +120,7 @@
+ krb5_principal princ;
+ OM_uint32 maj_status, min_status;
+ int len;
++ const char *new_ccname;
+
+ if (client->creds == NULL) {
+ debug("No credentials stored");
+@@ -168,11 +169,16 @@
+ 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)
+diff -urN openssh-5.2p1/gss-serv.c openssh-5.2p1.new/gss-serv.c
+--- gss-serv.c 2008-05-19 07:05:07.000000000 +0200
++++ gss-serv.c 2009-03-21 15:19:19.000000000 +0100
+@@ -1,7 +1,7 @@
+ /* $OpenBSD: gss-serv.c,v 1.22 2008/05/08 12:02:23 djm Exp $ */
+
+ /*
+- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
++ * Copyright (c) 2001-2008 Simon Wilkinson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+@@ -45,8 +45,12 @@
+ #include "channels.h"
+ #include "session.h"
+ #include "misc.h"
++#include "servconf.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,
+@@ -81,25 +85,32 @@
+ 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))) {
++ 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);
+
+- if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) {
+ 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 */
+@@ -114,6 +125,28 @@
+ }
+
+ /* 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));
++}
++
++/* Unprivileged */
++int
++ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data) {
++ 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)
+ {
+@@ -352,14 +385,4 @@
+ return (0);
+ }
+
+-/* Privileged */
+-OM_uint32
+-ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
+-{
+- ctx->major = gss_verify_mic(&ctx->minor, ctx->context,
+- gssbuf, gssmic, NULL);
+-
+- return (ctx->major);
+-}
+-
+ #endif
+diff -urN openssh-5.2p1/kex.c openssh-5.2p1.new/kex.c
+--- kex.c 2008-11-03 09:19:12.000000000 +0100
++++ kex.c 2009-03-21 15:19:19.000000000 +0100
+@@ -49,6 +49,10 @@
+ #include "dispatch.h"
+ #include "monitor.h"
+
++#ifdef GSSAPI
++#include "ssh-gss.h"
++#endif
++
+ #define KEX_COOKIE_LEN 16
+
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list