diff options
| author |   djm <djm@openbsd.org> | 2006-08-18 13:54:54 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2006-08-18 13:54:54 +0000 |
| commit | 8def7019d645858150f12448809d0fa99d1d033a (patch) | |
| tree | ac78ef1ab97c82721ed71c8ebcd4c4aa569e5d32 /usr.bin/ssh/sshconnect2.c | |
| parent | py-cairo/py-gtk2 deathlock of dependencies. Not fixed yet. (diff) | |
| download | wireguard-openbsd-8def7019d645858150f12448809d0fa99d1d033a.tar.xz wireguard-openbsd-8def7019d645858150f12448809d0fa99d1d033a.zip | |
bz #1218 - disable SPNEGO as per RFC4462; diff from simon AT sxw.org.uk
ok markus@
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect2.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index b6b1bad5a63..57f4b26b628 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.160 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.161 2006/08/18 13:54:54 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -505,25 +505,18 @@ userauth_gssapi(Authctxt *authctxt) /* Check to see if the mechanism is usable before we offer it */ while (mech < gss_supported->count && !ok) { - if (gssctxt) - ssh_gssapi_delete_ctx(&gssctxt); - ssh_gssapi_build_ctx(&gssctxt); - ssh_gssapi_set_oid(gssctxt, &gss_supported->elements[mech]); - /* My DER encoding requires length<128 */ if (gss_supported->elements[mech].length < 128 && - !GSS_ERROR(ssh_gssapi_import_name(gssctxt, - authctxt->host))) { + ssh_gssapi_check_mechanism(&gssctxt, + &gss_supported->elements[mech], authctxt->host)) { ok = 1; /* Mechanism works */ } else { mech++; } } - if (!ok) { - ssh_gssapi_delete_ctx(&gssctxt); + if (!ok) return 0; - } authctxt->methoddata=(void *)gssctxt; |