Fixed issue #41 and some other minor stuff

Author: skelly

client/src/cipher.c

@@ -127,16 +127,27 @@ EVP_PKEY *generate_rsa_private_key(void) {
 
 char *write_rsa_public_key(EVP_PKEY *pkey) {
   BIO *bio = BIO_new(BIO_s_mem());
+  if (bio == NULL) {
+    handle_openssl_error();
+    return NULL;
+  }
+
   if (PEM_write_bio_PUBKEY(bio, pkey) <= 0) {
     handle_openssl_error();
-    EVP_PKEY_free(pkey);
     BIO_free(bio);
     return NULL;
   }
 
   char *pem_key = NULL;
   long pem_len = BIO_get_mem_data(bio, &pem_key);
+
   char *copy = malloc(pem_len + 1);
+  if (copy == NULL) {
+    fprintf(stderr, "Memory allocation failed\n");
+    BIO_free(bio);
+    return NULL;
+  }
+
   memcpy(copy, pem_key, pem_len);
   copy[pem_len] = '\0';
 

client/src/http.c

@@ -11,7 +11,7 @@ const char *POST_REQ_TEMPLATE =
     "Host: localhost\r\n" // Add the host
     "Content-Type: %s\r\n"
     "Content-Length: %d\r\n"
-    "Connection: close\r\n" // Optionally, close connection after request
+    "Connection: Keep-Alive\r\n" // Optionally, close connection after request
     "\r\n%s";               // Ensure the body follows after \r\n\r\n
 
 // forward declare helper functions and leave them at the end
@@ -59,10 +59,12 @@ static long parse_http_status_code(const char *buf) {
   char *endptr;
   long status_code;
 
-  status_code_start = strstr(buf, " ") + 1;
+  status_code_start = strstr(buf, " ");
   if (status_code_start == NULL) {
     return HTTP_INVALID_RESPONSE;
   }
+  status_code_start +=1;
+
   status_code = strtol(status_code_start, &endptr, 10);
   if (endptr == status_code_start) {
     return HTTP_INVALID_RESPONSE;

client/src/main.c

@@ -43,6 +43,8 @@ int main(void) {
   EVP_PKEY *pkey = NULL;
   char *private_key = NULL;
   char *public_key = NULL;
+
+  unsigned char *b64_decoded_aes_key;
   unsigned char *aes_key = NULL;
   size_t key_len = 0;
 
@@ -52,7 +54,7 @@ int main(void) {
     exit(1);
   }
 
-  log_set_level(LOG_DEBUG);
+  log_set_level(LOG_INFO);
   setup_hints(&hints);
 
   if (h_getaddrinfo(SERVER_IP, SERVER_PORT, &hints, &ainfo) != 0) {
@@ -85,17 +87,17 @@ int main(void) {
   }
 
   log_info("Base64 encoded key: %s", http_post_res.data);
-  base64_decode(http_post_res.data, &aes_key, &key_len);
+  base64_decode(http_post_res.data, &b64_decoded_aes_key, &key_len);
   log_info("Key size (decoded): %zu", key_len);
 
-  print_hex(aes_key, key_len);
 
-  aes_key = decrypt_rsa_oaep_evp(pkey, (unsigned char *)http_post_res.data, key_len, &key_len);
+  aes_key = decrypt_rsa_oaep_evp(pkey, b64_decoded_aes_key, key_len, &key_len);
   if (aes_key == NULL) {
     log_error("Failed to decrypt data from server");
     goto cleanup;
   }
 
+  print_hex(aes_key, key_len);
 
   if (http_get(sfd, "/", &http_fraction_res) != HTTP_SUCCESS) {
     log_error("Failed to retrieve fraction links");

client/src/utils.c

@@ -25,6 +25,10 @@ int split_fraction_links(char *data, char *data_arr[], int maxlines) {
 }
 
 void print_hex(const unsigned char *data, size_t size) {
+  if (data == NULL) {
+    log_error("Null data pointer\n"); // had to learn the hard f way
+    return;
+  }
   for (size_t i = 0; i < size; i++) {
     if (i%20==0) puts("");
     printf("%02X ", data[i]);

server/server.py

@@ -107,7 +107,7 @@ def list_directory(self, path):
         self.send_header("Content-type", f"text/plain; charset={enc}")
         self.send_header("Content-Length", str(len(encoded)))
         self.end_headers()
-
+        
         return f