diff options
author | Colin Watson <cjwatson@debian.org> | 2006-05-12 09:46:51 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2006-05-12 09:46:51 +0000 |
commit | 2a3e00306c9b3b4db71a777a7c3ccb70e470c675 (patch) | |
tree | f00af0128b0ac750d739384f111000c1c97007e4 /monitor.c | |
parent | 2ee73b36b9a35daeaa4b065046882dc1f5f551b6 (diff) |
* Update to current GSSAPI patch from
http://www.sxw.org.uk/computing/patches/openssh-4.3p2-gsskex-20060223.patch
(closes: #352042).
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -1644,6 +1644,7 @@ mm_get_kex(Buffer *m) | |||
1644 | kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; | 1644 | kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; |
1645 | #ifdef GSSAPI | 1645 | #ifdef GSSAPI |
1646 | kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; | 1646 | kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; |
1647 | kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server; | ||
1647 | #endif | 1648 | #endif |
1648 | kex->server = 1; | 1649 | kex->server = 1; |
1649 | kex->hostkey_type = buffer_get_int(m); | 1650 | kex->hostkey_type = buffer_get_int(m); |
@@ -1942,10 +1943,13 @@ mm_answer_gss_userok(int sock, Buffer *m) | |||
1942 | int | 1943 | int |
1943 | mm_answer_gss_sign(int socket, Buffer *m) | 1944 | mm_answer_gss_sign(int socket, Buffer *m) |
1944 | { | 1945 | { |
1945 | gss_buffer_desc data, hash; | 1946 | gss_buffer_desc data; |
1947 | gss_buffer_desc hash = GSS_C_EMPTY_BUFFER; | ||
1946 | OM_uint32 major, minor; | 1948 | OM_uint32 major, minor; |
1949 | u_int len; | ||
1947 | 1950 | ||
1948 | data.value = buffer_get_string(m, &data.length); | 1951 | data.value = buffer_get_string(m, &len); |
1952 | data.length = len; | ||
1949 | if (data.length != 20) | 1953 | if (data.length != 20) |
1950 | fatal("%s: data length incorrect: %d", __func__, data.length); | 1954 | fatal("%s: data length incorrect: %d", __func__, data.length); |
1951 | 1955 | ||