#include "auth/gensec/gensec_tstream.h"
#include "lib/tsocket/tsocket.h"
#include "lib/tsocket/tsocket_internal.h"
-
+#include "auth/gensec/gensec_toplevel_proto.h"
static const struct tstream_context_ops tstream_gensec_ops;
struct gensec_security *gensec_security;
- bool wrap;
-
int error;
struct {
tgss->gensec_security = gensec_security;
tgss->error = 0;
- if (gensec_have_feature(gensec_security, GENSEC_FEATURE_SIGN) ||
- gensec_have_feature(gensec_security, GENSEC_FEATURE_SEAL)) {
- tgss->wrap = true;
- } else {
- tgss->wrap = false;
+ if (!gensec_have_feature(gensec_security, GENSEC_FEATURE_SIGN) &&
+ !gensec_have_feature(gensec_security, GENSEC_FEATURE_SEAL)) {
+ talloc_free(gensec_stream);
+ return NT_STATUS_INVALID_PARAMETER;
}
tgss->write.max_unwrapped_size = gensec_max_input_size(gensec_security);
struct tstream_gensec *tgss =
tstream_context_data(stream,
struct tstream_gensec);
- ssize_t ret;
-
- if (!tgss->plain_stream) {
- errno = ENOTCONN;
- return -1;
- }
if (tgss->error != 0) {
errno = tgss->error;
return -1;
}
- if (tgss->wrap) {
- return tgss->read.left;
- }
-
- ret = tstream_pending_bytes(tgss->plain_stream);
- if (ret == -1) {
- tgss->error = errno;
- return -1;
- }
-
- return ret;
+ return tgss->read.left;
}
struct tstream_gensec_readv_state {
int ret;
};
-static void tstream_gensec_readv_plain_done(struct tevent_req *subreq);
static void tstream_gensec_readv_wrapped_next(struct tevent_req *req);
static struct tevent_req *tstream_gensec_readv_send(TALLOC_CTX *mem_ctx,
struct tstream_gensec);
struct tevent_req *req;
struct tstream_gensec_readv_state *state;
- struct tevent_req *subreq;
- ssize_t ret;
req = tevent_req_create(mem_ctx, &state,
struct tstream_gensec_readv_state);
return NULL;
}
- ret = tstream_gensec_pending_bytes(stream);
- if (ret == -1) {
- tevent_req_error(req, errno);
+ if (tgss->error != 0) {
+ tevent_req_error(req, tgss->error);
return tevent_req_post(req, ev);
}
state->stream = stream;
state->ret = 0;
- if (!tgss->wrap) {
- subreq = tstream_readv_send(state,
- ev,
- tgss->plain_stream,
- vector,
- count);
- if (tevent_req_nomem(subreq,req)) {
- return tevent_req_post(req, ev);
- }
- tevent_req_set_callback(subreq,
- tstream_gensec_readv_plain_done,
- req);
-
- return req;
- }
-
/*
* we make a copy of the vector so we can change the structure
*/
return req;
}
-static void tstream_gensec_readv_plain_done(struct tevent_req *subreq)
-{
- struct tevent_req *req =
- tevent_req_callback_data(subreq,
- struct tevent_req);
- struct tstream_gensec_readv_state *state =
- tevent_req_data(req,
- struct tstream_gensec_readv_state);
- struct tstream_gensec *tgss =
- tstream_context_data(state->stream,
- struct tstream_gensec);
- int ret;
- int sys_errno;
-
- ret = tstream_readv_recv(subreq, &sys_errno);
- TALLOC_FREE(subreq);
- if (ret == -1) {
- tgss->error = sys_errno;
- tevent_req_error(req, sys_errno);
- return;
- }
-
- state->ret = ret;
-
- tevent_req_done(req);
-}
-
static int tstream_gensec_readv_next_vector(struct tstream_context *unix_stream,
void *private_data,
TALLOC_CTX *mem_ctx,
memcpy(base, tgss->read.unwrapped.data + tgss->read.ofs, len);
base += len;
- state->vector[0].iov_base = base;
+ state->vector[0].iov_base = (char *) base;
state->vector[0].iov_len -= len;
tgss->read.ofs += len;
vector[0].iov_base = (char *)state->wrapped.hdr;
vector[0].iov_len = sizeof(state->wrapped.hdr);
} else if (!state->wrapped.asked_for_blob) {
- state->wrapped.asked_for_blob = true;
uint32_t msg_len;
+ state->wrapped.asked_for_blob = true;
+
msg_len = RIVAL(state->wrapped.hdr, 0);
- if (msg_len > 0x00FFFFFF) {
+ /*
+ * I got a Windows 2012R2 server responding with
+ * a message of 0x1b28a33.
+ */
+ if (msg_len > 0x0FFFFFFF) {
errno = EMSGSIZE;
return -1;
}
int ret;
};
-static void tstream_gensec_writev_plain_done(struct tevent_req *subreq);
static void tstream_gensec_writev_wrapped_next(struct tevent_req *req);
static struct tevent_req *tstream_gensec_writev_send(TALLOC_CTX *mem_ctx,
struct tstream_gensec);
struct tevent_req *req;
struct tstream_gensec_writev_state *state;
- struct tevent_req *subreq;
- ssize_t ret;
int i;
int total;
int chunk;
return NULL;
}
- ret = tstream_gensec_pending_bytes(stream);
- if (ret == -1) {
- tevent_req_error(req, errno);
+ if (tgss->error != 0) {
+ tevent_req_error(req, tgss->error);
return tevent_req_post(req, ev);
}
state->stream = stream;
state->ret = 0;
- if (!tgss->wrap) {
- subreq = tstream_writev_send(state,
- ev,
- tgss->plain_stream,
- vector,
- count);
- if (tevent_req_nomem(subreq, req)) {
- return tevent_req_post(req, ev);
- }
- tevent_req_set_callback(subreq, tstream_gensec_writev_plain_done, req);
-
- return req;
- }
-
/*
* we make a copy of the vector so we can change the structure
*/
return req;
}
-static void tstream_gensec_writev_plain_done(struct tevent_req *subreq)
-{
- struct tevent_req *req =
- tevent_req_callback_data(subreq,
- struct tevent_req);
- struct tstream_gensec_writev_state *state =
- tevent_req_data(req,
- struct tstream_gensec_writev_state);
- struct tstream_gensec *tgss =
- tstream_context_data(state->stream,
- struct tstream_gensec);
- int ret;
- int sys_errno;
-
- ret = tstream_writev_recv(subreq, &sys_errno);
- TALLOC_FREE(subreq);
- if (ret < 0) {
- tgss->error = sys_errno;
- tevent_req_error(req, sys_errno);
- return;
- }
-
- state->ret = ret;
-
- tevent_req_done(req);
-}
-
static void tstream_gensec_writev_wrapped_done(struct tevent_req *subreq);
static void tstream_gensec_writev_wrapped_next(struct tevent_req *req)
memcpy(state->unwrapped.blob.data + state->unwrapped.ofs, base, len);
base += len;
- state->vector[0].iov_base = base;
+ state->vector[0].iov_base = (char *) base;
state->vector[0].iov_len -= len;
state->unwrapped.ofs += len;
struct tstream_gensec);
struct tevent_req *req;
struct tstream_gensec_disconnect_state *state;
- ssize_t ret;
req = tevent_req_create(mem_ctx, &state,
struct tstream_gensec_disconnect_state);
return NULL;
}
- ret = tstream_gensec_pending_bytes(stream);
- if (ret == -1) {
- tevent_req_error(req, errno);
+ if (tgss->error != 0) {
+ tevent_req_error(req, tgss->error);
return tevent_req_post(req, ev);
}
* on the plain stream!
*/
tgss->plain_stream = NULL;
+ tgss->error = ENOTCONN;
tevent_req_done(req);
return tevent_req_post(req, ev);
git.samba.org / samba.git / blobdiff