[selene-tls] push by p...@querna.org - Server hello done doesn't actually hve any data in it. on 2011-08-15 01:19 GMT

[selen...@googlecode.com]

Revision: 4344ecfca291
Author: Paul Querna <pqu...@apache.org>
Date: Sun Aug 14 18:19:20 2011
Log: Server hello done doesn't actually hve any data in it.

http://code.google.com/p/selene-tls/source/detail?r=4344ecfca291

Modified:
/lib/parser/handshake_messages/server_hello_done.c

=======================================
--- /lib/parser/handshake_messages/server_hello_done.c Sun Aug 14 18:27:53
2011
+++ /lib/parser/handshake_messages/server_hello_done.c Sun Aug 14 18:19:20
2011
@@ -60,6 +60,8 @@
{
shd_baton_t *shb = (shd_baton_t*)baton;

+ slnDbg(hs->s, "parse_server_hello_done_step");
+
switch (shb->state) {
case SLN_HS_SERVER_HELLO_DONE_LENGTH:
{
@@ -72,18 +74,14 @@

return SELENE_SUCCESS;
}
-
-static selene_error_t*
-parse_server_hello_done_finish(sln_hs_baton_t *hs, void *baton)
-{
- return selene_publish(hs->s, SELENE__EVENT_HS_GOT_SERVER_HELLO_DONE);
-}

static void
parse_server_hello_done_destroy(sln_hs_baton_t *hs, void *baton)
{
shd_baton_t *shd = (shd_baton_t*)baton;

+ slnDbg(hs->s, "parse_server_hello_done_destroy");
+
sln_free(hs->s, shd);
}

@@ -92,12 +90,16 @@
{
shd_baton_t *shd = sln_calloc(hs->s, sizeof(shd_baton_t));
shd->state = SLN_HS_SERVER_HELLO_DONE_LENGTH;
+ slnDbg(hs->s, "sln_handshake_parse_server_hello_done_setup");
hs->baton->msg.server_hello_done = &shd->shd;
hs->current_msg_step = parse_server_hello_done_step;
- hs->current_msg_finish = parse_server_hello_done_finish;
+ hs->current_msg_finish = NULL;
hs->current_msg_destroy = parse_server_hello_done_destroy;
- v->next = TOK_COPY_BYTES;
- v->wantlen = 3;
+
+ v->next = TOK_DONE;
+ v->wantlen = 0;
*baton = (void*)shd;
- return SELENE_SUCCESS;
-}
+
+ /* SHD has no fields, so on setup we just emit the event. */
+ return selene_publish(hs->s, SELENE__EVENT_HS_GOT_SERVER_HELLO_DONE);
+}