ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

secur32: Handle extra data in schan_InitializeSecurityContextW.

Browse Source
This commit is contained in:
Piotr Caban 2010-09-17 10:18:41 +02:00 committed by Alexandre Julliard
parent 98ed9bcdf0
commit cdf8d455c2
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/secur32/schannel.c
View File

@ -775,6 +775,14 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
/* Perform the TLS handshake */ /* Perform the TLS handshake */
err = pgnutls_handshake(ctx->session); err = pgnutls_handshake(ctx->session);
if(transport.in.offset && transport.in.offset != pInput->pBuffers[0].cbBuffer) {
if(pInput->cBuffers<2 || pInput->pBuffers[1].BufferType!=SECBUFFER_EMPTY)
return SEC_E_INVALID_TOKEN;
pInput->pBuffers[1].BufferType = SECBUFFER_EXTRA;
pInput->pBuffers[1].cbBuffer = pInput->pBuffers[0].cbBuffer-transport.in.offset;
}
out_buffers = &transport.out; out_buffers = &transport.out;
if (out_buffers->current_buffer_idx != -1) if (out_buffers->current_buffer_idx != -1)
{ {

19
dlls/secur32/tests/schannel.c
View File

@ -586,7 +586,7 @@ static void test_communication(void)
return; return;
} }
/* Create a socket and connect to mail.google.com */ /* Create a socket and connect to www.codeweavers.com */
ret = WSAStartup(0x0202, &wsa_data); ret = WSAStartup(0x0202, &wsa_data);
if (ret) if (ret)
{ {
@ -636,6 +636,23 @@ static void test_communication(void)
0, 0, NULL, 0, &context, &buffers[0], &attrs, NULL); 0, 0, NULL, 0, &context, &buffers[0], &attrs, NULL);
ok(status == SEC_I_CONTINUE_NEEDED, "Expected SEC_I_CONTINUE_NEEDED, got %08x\n", status); ok(status == SEC_I_CONTINUE_NEEDED, "Expected SEC_I_CONTINUE_NEEDED, got %08x\n", status);
buffers[1].cBuffers = 1;
buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN;
data_size = buffers[0].pBuffers[0].cbBuffer;
status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost",
ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM,
0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL);
ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status);
buffers[0].pBuffers[0].cbBuffer = buf_size;
buffers[1].cBuffers = 4;
buffers[1].pBuffers[0].cbBuffer = buf_size;
status = pInitializeSecurityContextA(&cred_handle, NULL, (SEC_CHAR *)"localhost",
ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM,
0, 0, NULL, 0, &context, &buffers[0], &attrs, NULL);
ok(status == SEC_I_CONTINUE_NEEDED, "Expected SEC_I_CONTINUE_NEEDED, got %08x\n", status);
while (status == SEC_I_CONTINUE_NEEDED) while (status == SEC_I_CONTINUE_NEEDED)
{ {
buf = &buffers[0].pBuffers[0]; buf = &buffers[0].pBuffers[0];