|
 |
dac93df |
diff -up gnutls-2.10.1/lib/gnutls_handshake.c.errors gnutls-2.10.1/lib/gnutls_handshake.c
|
|
|
dac93df |
--- gnutls-2.10.1/lib/gnutls_handshake.c.errors 2010-07-25 10:35:31.000000000 +0200
|
|
|
dac93df |
+++ gnutls-2.10.1/lib/gnutls_handshake.c 2010-09-13 17:16:05.000000000 +0200
|
|
|
dac93df |
@@ -2769,7 +2769,7 @@ _gnutls_handshake_client (gnutls_session
|
|
|
dac93df |
case STATE1:
|
|
|
dac93df |
ret = _gnutls_send_hello (session, AGAIN (STATE1));
|
|
|
dac93df |
STATE = STATE1;
|
|
|
dac93df |
- IMED_RET ("send hello", ret, 0);
|
|
|
dac93df |
+ IMED_RET ("send hello", ret, 1);
|
|
|
dac93df |
|
|
|
dac93df |
case STATE2:
|
|
|
dac93df |
/* receive the server hello */
|
|
|
dac93df |
@@ -2849,7 +2849,7 @@ _gnutls_handshake_client (gnutls_session
|
|
|
dac93df |
ret =
|
|
|
dac93df |
_gnutls_send_client_certificate_verify (session, AGAIN (STATE9));
|
|
|
dac93df |
STATE = STATE9;
|
|
|
dac93df |
- IMED_RET ("send client certificate verify", ret, 0);
|
|
|
dac93df |
+ IMED_RET ("send client certificate verify", ret, 1);
|
|
|
dac93df |
|
|
|
dac93df |
STATE = STATE0;
|
|
|
dac93df |
default:
|
|
|
dac93df |
@@ -3002,7 +3002,7 @@ _gnutls_handshake_server (gnutls_session
|
|
|
dac93df |
case STATE2:
|
|
|
dac93df |
ret = _gnutls_send_hello (session, AGAIN (STATE2));
|
|
|
dac93df |
STATE = STATE2;
|
|
|
dac93df |
- IMED_RET ("send hello", ret, 0);
|
|
|
dac93df |
+ IMED_RET ("send hello", ret, 1);
|
|
|
dac93df |
|
|
|
dac93df |
case STATE70:
|
|
|
dac93df |
if (session->security_parameters.extensions.do_send_supplemental)
|
|
|
dac93df |
@@ -3044,7 +3044,7 @@ _gnutls_handshake_server (gnutls_session
|
|
|
dac93df |
GNUTLS_HANDSHAKE_SERVER_HELLO_DONE,
|
|
|
dac93df |
AGAIN (STATE6));
|
|
|
dac93df |
STATE = STATE6;
|
|
|
dac93df |
- IMED_RET ("send server hello done", ret, 0);
|
|
|
dac93df |
+ IMED_RET ("send server hello done", ret, 1);
|
|
|
dac93df |
|
|
|
dac93df |
case STATE71:
|
|
|
dac93df |
if (session->security_parameters.extensions.do_recv_supplemental)
|
|
|
dac93df |
@@ -3119,7 +3119,7 @@ _gnutls_handshake_common (gnutls_session
|
|
|
dac93df |
#endif
|
|
|
dac93df |
|
|
|
dac93df |
ret = _gnutls_send_handshake_final (session, FALSE);
|
|
|
dac93df |
- IMED_RET ("send handshake final", ret, 0);
|
|
|
dac93df |
+ IMED_RET ("send handshake final", ret, 1);
|
|
|
dac93df |
|
|
|
dac93df |
/* only store if we are not resuming */
|
|
|
dac93df |
if (session->security_parameters.entity == GNUTLS_SERVER)
|
|
|
dac93df |
@@ -3132,7 +3132,7 @@ _gnutls_handshake_common (gnutls_session
|
|
|
dac93df |
{ /* if we are a client not resuming - or we are a server resuming */
|
|
|
dac93df |
|
|
|
dac93df |
ret = _gnutls_send_handshake_final (session, TRUE);
|
|
|
dac93df |
- IMED_RET ("send handshake final 2", ret, 0);
|
|
|
dac93df |
+ IMED_RET ("send handshake final 2", ret, 1);
|
|
|
dac93df |
|
|
|
dac93df |
#ifdef ENABLE_SESSION_TICKET
|
|
|
dac93df |
switch (STATE)
|