Merge remote-tracking branch 'origin/fix/security-hardening' into merge-all-v2

# Conflicts:
#	src/client/client_cli.c
#	src/client/scanner.c
#	src/client/scanner.h
#	src/server/server.c
#	src/shared/config.c
#	src/shared/config.h
#	src/shared/file.c
#	src/shared/file.h
#	src/shared/log.c
#	src/shared/protocol.c
#	src/shared/transport_ssh.c
#	src/shared/transport_tcp.c
#	src/shared/transport_tcp.h
#	src/shared/transport_tls.c
#	src/shared/utils.c

src/shared/protocol.h

@@ -20,7 +20,10 @@ enum NET_STATUS {
   STATUS_MANIFEST,
   STATUS_CHECK,
   STATUS_DELTA_SIGNATURE,
-  STATUS_DELTA_DATA
+  STATUS_DELTA_DATA,
+  STATUS_KEEPALIVE,
+  STATUS_ABORT,
+  STATUS_CHECK_BATCH
 };
 
 void io_set_fds(int read_fd, int write_fd);