summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2021-02-04 08:56:33 +0100
committerDaiki Ueno <ueno@gnu.org>2021-02-04 09:24:59 +0100
commit987a2a7892dc37c11ca4c584a0f9f17bb91403cd (patch)
tree486496cb7fbee2a06d2d372aa1fb66f1513e81c3
parent4cea6b2fe9566238949157d821bd31f0e1fd2816 (diff)
downloadgnutls-987a2a7892dc37c11ca4c584a0f9f17bb91403cd.tar.gz
handshake: replace TRUE and FALSE with <stdbool.h>
Signed-off-by: Daiki Ueno <ueno@gnu.org>
-rw-r--r--lib/handshake.c23
1 files changed, 10 insertions, 13 deletions
diff --git a/lib/handshake.c b/lib/handshake.c
index 0f305cd75e..da1d598e6e 100644
--- a/lib/handshake.c
+++ b/lib/handshake.c
@@ -61,9 +61,6 @@
#include <valgrind/memcheck.h>
#endif
-#define TRUE 1
-#define FALSE 0
-
static int check_if_null_comp_present(gnutls_session_t session,
uint8_t * data, int datalen);
static int handshake_client(gnutls_session_t session);
@@ -3093,7 +3090,7 @@ static int handshake_client(gnutls_session_t session)
case STATE16:
STATE = STATE16;
if (!session->internals.resumed) {
- ret = send_handshake_final(session, TRUE);
+ ret = send_handshake_final(session, true);
IMED_RET("send handshake final 2", ret, 1);
} else {
ret = _gnutls_recv_new_session_ticket(session);
@@ -3123,17 +3120,17 @@ static int handshake_client(gnutls_session_t session)
IMED_RET("recv handshake new session ticket", ret,
1);
} else {
- ret = recv_handshake_final(session, TRUE);
+ ret = recv_handshake_final(session, true);
IMED_RET("recv handshake final", ret, 1);
}
FALLTHROUGH;
case STATE19:
STATE = STATE19;
if (!session->internals.resumed) {
- ret = recv_handshake_final(session, FALSE);
+ ret = recv_handshake_final(session, false);
IMED_RET("recv handshake final 2", ret, 1);
} else {
- ret = send_handshake_final(session, FALSE);
+ ret = send_handshake_final(session, false);
IMED_RET("send handshake final", ret, 1);
}
@@ -3245,7 +3242,7 @@ static int send_handshake_final(gnutls_session_t session, int init)
}
/* Initialize the connection session (start encryption) - in case of client
*/
- if (init == TRUE) {
+ if (init) {
ret = _gnutls_connection_state_init(session);
if (ret < 0) {
gnutls_assert();
@@ -3330,7 +3327,7 @@ static int recv_handshake_final(gnutls_session_t session, int init)
session->internals.dtls.hsk_read_seq++;
/* Initialize the connection session (start encryption) - in case of server */
- if (init == TRUE) {
+ if (init) {
ret = _gnutls_connection_state_init(session);
if (ret < 0) {
gnutls_assert();
@@ -3524,10 +3521,10 @@ static int handshake_server(gnutls_session_t session)
case STATE15:
STATE = STATE15;
if (!session->internals.resumed) { /* if we are not resuming */
- ret = recv_handshake_final(session, TRUE);
+ ret = recv_handshake_final(session, true);
IMED_RET("recv handshake final", ret, 1);
} else {
- ret = send_handshake_final(session, TRUE);
+ ret = send_handshake_final(session, true);
IMED_RET("send handshake final 2", ret, 1);
}
FALLTHROUGH;
@@ -3541,7 +3538,7 @@ static int handshake_server(gnutls_session_t session)
case STATE17:
STATE = STATE17;
if (!session->internals.resumed) { /* if we are not resuming */
- ret = send_handshake_final(session, FALSE);
+ ret = send_handshake_final(session, false);
IMED_RET("send handshake final", ret, 1);
if (session->security_parameters.entity ==
@@ -3552,7 +3549,7 @@ static int handshake_server(gnutls_session_t session)
(session);
}
} else {
- ret = recv_handshake_final(session, FALSE);
+ ret = recv_handshake_final(session, false);
IMED_RET("recv handshake final 2", ret, 1);
}