diff options
author | Damien Miller <djm@mindrot.org> | 2003-11-17 22:18:21 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-11-17 22:18:21 +1100 |
commit | 0425d40194f36c57423c014b0730a9d344dbe019 (patch) | |
tree | 537527b6d0092152ee9f0c4ad01ea4bb41d8c271 /monitor_wrap.c | |
parent | c756e9b56e5b4649f120c417eb9bc99cf23db10f (diff) |
- markus@cvs.openbsd.org 2003/11/17 11:06:07
[auth2-gss.c gss-genr.c gss-serv.c monitor.c monitor.h monitor_wrap.c]
[monitor_wrap.h sshconnect2.c ssh-gss.h]
replace "gssapi" with "gssapi-with-mic"; from Simon Wilkinson;
test + ok jakob.
Diffstat (limited to 'monitor_wrap.c')
-rw-r--r-- | monitor_wrap.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index fe1460422..c685535d3 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: monitor_wrap.c,v 1.34 2003/10/15 09:48:45 markus Exp $"); | 28 | RCSID("$OpenBSD: monitor_wrap.c,v 1.35 2003/11/17 11:06:07 markus Exp $"); |
29 | 29 | ||
30 | #include <openssl/bn.h> | 30 | #include <openssl/bn.h> |
31 | #include <openssl/dh.h> | 31 | #include <openssl/dh.h> |
@@ -1134,6 +1134,25 @@ mm_ssh_gssapi_accept_ctx(Gssctxt *ctx, gss_buffer_desc *in, | |||
1134 | return (major); | 1134 | return (major); |
1135 | } | 1135 | } |
1136 | 1136 | ||
1137 | OM_uint32 | ||
1138 | mm_ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) | ||
1139 | { | ||
1140 | Buffer m; | ||
1141 | OM_uint32 major; | ||
1142 | |||
1143 | buffer_init(&m); | ||
1144 | buffer_put_string(&m, gssbuf->value, gssbuf->length); | ||
1145 | buffer_put_string(&m, gssmic->value, gssmic->length); | ||
1146 | |||
1147 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSCHECKMIC, &m); | ||
1148 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSCHECKMIC, | ||
1149 | &m); | ||
1150 | |||
1151 | major = buffer_get_int(&m); | ||
1152 | buffer_free(&m); | ||
1153 | return(major); | ||
1154 | } | ||
1155 | |||
1137 | int | 1156 | int |
1138 | mm_ssh_gssapi_userok(char *user) | 1157 | mm_ssh_gssapi_userok(char *user) |
1139 | { | 1158 | { |