Update Tor non-enclave part

Author: inasmkim

Tor/README

@@ -1,38 +1,24 @@
-1. compile & install Tor
-
-cd tor-0.2.5.10
-./configure
-make
-make install
-
-2. compile and execute enclave_process
+0.Prerequisite
+$ apt-get install libevent-dev 
 
-cd enclave_Tor
-gcc -Wall enclave_process.c -o enclave_process -lcrypto -lssl -lpthread -L./ libor-crypto.a libor.a -lm
-./enclave_process
+1. compile & install Tor
 
-3. Configurating Chutney
+$ cd tor-0.2.5.10
+$ ./configure --disable-asciidoc
+$ make
+$ make install
 
-cd chutney
-./chutney configure networks/basic
+2. Configurating Chutney
 
+$ cd chutney
+$ ./chutney configure networks/basic
+$ ./chutney start network/basic
 
 ===========================================
 
 [Remaining works]
 
-1. Modifying chutney
- - Currently, it uses identity_key, signing_key, certificate by reading a file written by tor-gencert
- - Through our modification, we save them as a data structure, not file.
- - communicate with enclave_process
-
-2. Find and modify tor code
- - After configuration is done, we will start tor using chutney
-  -> ./chutney start networks/basic
- - While executing, if several functions requires such data structures, we have to change them communcating with
-   enclave_process.
-
-3. Exit nodes
- - Summarize the attack scenario
- - Saving keys while relay creation (while configuration)
- - Find operations which requires secret onion key, secret_id_key or so on..
+1. Enclave_Tor with argc, argv
+2. Get warnings
+3. Manual and script for executing enclave_process
+4. Manual and script for executing chutney (Tor-non-enclave)

Tor/modesgx.h

@@ -0,0 +1,14 @@
+/*
+ * modesgx.h
+ */
+
+#ifndef TOR_MODESGX_H_
+#define TOR_MODESGX_H_
+
+#ifndef IPC_MODE
+#define IPC_MODE
+#endif
+
+#include <unistd.h>
+
+#endif /* TOR_MODESGX_H_ */

Tor/protocol.h

@@ -0,0 +1,85 @@
+/*
+ * protocol.h
+ */
+
+#ifndef TOR_PROTOCOL_H_
+#define TOR_PROTOCOL_H_
+
+#include <arpa/inet.h>
+#define TMP_DIRECTORY_CONF "/tmp/tor_ipc_conf"
+#define TMP_DIRECTORY_RUN "/tmp/tor_ipc_run"
+#define TMP_FILE_NUMBER_FMT "%s/tor_pipe_%d"
+#define NAME_BUF_SIZE (256)
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <error.h>
+
+#define RB_MODE_RD 0
+#define RB_MODE_WR 1
+
+#ifndef IPC_MODE
+#define IPC_MODE
+#endif
+
+static int pipe_init(int flag_dir)
+{
+	int ret;
+
+	if (flag_dir == 0)
+		ret = mkdir(TMP_DIRECTORY_CONF, 0770);
+	else if (flag_dir == 1)
+		ret = mkdir(TMP_DIRECTORY_RUN, 0770);
+
+	if (ret == -1) {
+		if(errno != EEXIST) {
+			perror("mkdir");
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+static int pipe_open(int unique_id, int is_write, int flag_dir)
+{
+	char name_buf[NAME_BUF_SIZE];
+
+	if (flag_dir == 0)
+		snprintf(name_buf, sizeof(name_buf), TMP_FILE_NUMBER_FMT, 
+						TMP_DIRECTORY_CONF, unique_id);
+	else if (flag_dir == 1)
+		snprintf(name_buf, sizeof(name_buf), TMP_FILE_NUMBER_FMT, 
+						TMP_DIRECTORY_RUN, unique_id);
+
+	int ret = mknod(name_buf, S_IFIFO | 0770, 0);
+	if (ret == -1) {
+		if (errno != EEXIST) {
+			perror("mknod");
+			exit(1);
+		}
+	}
+
+	int flag = O_ASYNC;
+	if (is_write)
+		flag |= O_WRONLY;
+	else
+		flag |= O_RDONLY;
+
+	int fd = open(name_buf, flag);
+	if (fd == -1) {
+		perror("open");
+		return -1;
+	}
+
+	return fd;
+}
+
+#endif /* TOR_PROTOCOL_H_ */