GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 08:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

when the client requests a rehandshake accept there request.

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2014-01-21 17:24:29 +01:00
parent 6a9600aa61
commit d8162d3c0b
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tlslib.c
View File

@@ -116,7 +116,7 @@ ssize_t tls_recv(gnutls_session_t session, void *data, size_t data_size)
do {
ret = gnutls_record_recv(session, data, data_size);
} while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
} while (ret < 0 && (ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN));
return ret;
}

22
src/worker-vpn.c
View File

@@ -1499,7 +1499,7 @@ static int connect_handler(worker_st * ws)
if (FD_ISSET(ws->conn_fd, &rfds) || tls_pending != 0) {
ret =
gnutls_record_recv(ws->session, ws->buffer,
tls_recv(ws->session, ws->buffer,
ws->buffer_size);
oclog(ws, LOG_DEBUG, "received %d byte(s) (TLS)", ret);
@@ -1534,6 +1534,15 @@ static int connect_handler(worker_st * ws)
}
}
}
if (ret == GNUTLS_E_REHANDSHAKE) {
/* rekey? */
oclog(ws, LOG_INFO, "client requested rehandshake on TLS channel");
do {
ret = gnutls_handshake(ws->session);
} while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
GNUTLS_FATAL_ERR(ret);
}
}
if (ws->udp_state > UP_WAIT_FD
@@ -1543,7 +1552,7 @@ static int connect_handler(worker_st * ws)
case UP_ACTIVE:
case UP_INACTIVE:
ret =
gnutls_record_recv(ws->dtls_session,
tls_recv(ws->dtls_session,
ws->buffer,
ws->buffer_size);
oclog(ws, LOG_DEBUG,
@@ -1573,6 +1582,15 @@ static int connect_handler(worker_st * ws)
oclog(ws, LOG_DEBUG,
"no data received (%d)", ret);
if (ret == GNUTLS_E_REHANDSHAKE) {
/* rekey? */
oclog(ws, LOG_INFO, "client requested rehandshake on DTLS channel");
do {
ret = gnutls_handshake(ws->dtls_session);
} while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
GNUTLS_FATAL_ERR(ret);
}
udp_recv_time = now;
break;
case UP_SETUP: