Fix delete

Password_manager/include/func.h

@@ -1,8 +1,6 @@
 #pragma once
 #include <fstream>
 
-constexpr auto MAX_STRING_SIZE = 15;
-
 class Buffer;
 
 struct Pass
@@ -38,7 +36,7 @@ void add_password_to_buffer(Buffer& in, const char* label, const char* password)
 
 const char* get_password_from_buffer(Buffer& decrypted_buffer, int label);
 
-void generate_password(std::string& password);
+void generate_password(std::string& password, int len);
 
 bool save_buffer_to_file(Buffer& buffer);
 

Password_manager/source/arg_func.cpp

@@ -30,9 +30,9 @@ const char* arg_generate(Buffer& decrypted_buffer, Buffer& encrypted_buffer, con
 
 	int pass = find_password_in_buffer(decrypted_buffer, label);
 
-	std::string password(MAX_STRING_SIZE, 0);
+	std::string password;
 
-	generate_password(password);
+	generate_password(password, 15);
 
 
 	if (pass < 0)
@@ -89,9 +89,9 @@ const char* arg_input(Buffer& decrypted_buffer, Buffer& encrypted_buffer, const
 		crypto.encrypt(&decrypted_buffer, &encrypted_buffer);
 		save_buffer_to_file(encrypted_buffer);
 
-		Index* index = (Index*)encrypted_buffer.buffer;
+		Index* index = (Index*)decrypted_buffer.buffer;
 
-		return get_password_from_buffer(encrypted_buffer, index->count - 1);
+		return get_password_from_buffer(decrypted_buffer, index->count - 1);
 
 
 	}
@@ -99,12 +99,13 @@ const char* arg_input(Buffer& decrypted_buffer, Buffer& encrypted_buffer, const
 	{
 		delete_password_from_buffer(decrypted_buffer, encrypted_buffer, pass);
 		add_password_to_buffer(encrypted_buffer, label, new_string.c_str());
+
 		crypto.encrypt(&encrypted_buffer, &decrypted_buffer);
 		save_buffer_to_file(decrypted_buffer);
 
-		Index* index = (Index*)decrypted_buffer.buffer;
+		Index* index = (Index*)encrypted_buffer.buffer;
 
-		return get_password_from_buffer(decrypted_buffer, index->count - 1);
+		return get_password_from_buffer(encrypted_buffer, index->count - 1);
 
 	}
 
@@ -132,11 +133,7 @@ void arg_delete(Buffer& in_buffer, Buffer& out_buffer, const char* label_to_del,
 		return;
 	}
 
-	arg_list(in_buffer);
-
 	delete_password_from_buffer(in_buffer, out_buffer, pass);
-	
-	arg_list(out_buffer);
 
 	crypto.encrypt(&out_buffer, &in_buffer);
 	save_buffer_to_file(in_buffer);

Password_manager/source/func.cpp

@@ -18,31 +18,32 @@ int find_password_in_buffer(Buffer& decrypted_buffer, const char* label)
 
 void delete_password_from_buffer(Buffer& in, Buffer& out, int index_of_pass) 
 {
-	Index* index = (Index*)in.buffer;
-	Pass* pass = (Pass*)(in.buffer + sizeof(Index));
-
-	int size = sizeof(Index) + sizeof(Pass) * (index->count - 1);
+	Index* in_index = (Index*)in.buffer;
+	Pass* in_pass = (Pass*)(in.buffer + sizeof(Index));
 
+	int size = sizeof(Index) + sizeof(Pass) * (in_index->count - 1);
 	out.resize(size);
 	out.taken = size;
 
-	((Index*)out.buffer)[0].count = index->count - 1;
-	((Index*)out.buffer)[0].offset = size;
+	Index* out_index = (Index*)out.buffer;
+	out_index->count = in_index->count - 1;
+	out_index->offset = size;
+
+
 	int count = 0;
-	for (size_t i = 0; i < index->count; i++)
+	for (size_t i = 0; i < in_index->count; i++)
 	{
 		if (i == index_of_pass) continue;
 
-		uint8_t* label = in.buffer + pass[i].label + index->offset;
-		size_t label_start = out.add_end(label, strlen((const char*)label) + 1);
+		uint8_t* label = in.buffer + in_pass[i].label + in_index->offset;
+		uint8_t* password = in.buffer + in_pass[i].password + in_index->offset;
 
-		uint8_t* password = in.buffer + pass[i].password + index->offset;
-		size_t password_start = out.add_end(password, strlen((const char*)password) + 1);
+		size_t label_start = out.add_end(label, strlen((char*)label) + 1);
+		size_t password_start = out.add_end(password, strlen((char*)password) + 1);
 
-
-		pass = (Pass*)(out.buffer + sizeof(Index));
-		pass[count].label = label_start - size;
-		pass[count].password = password_start - size;
+		Pass* out_pass = (Pass*)(out.buffer + sizeof(Index));
+		out_pass[count].label = label_start - size;
+		out_pass[count].password = password_start - size;
 		count++;
 	}
 }
@@ -71,15 +72,14 @@ const char* get_password_from_buffer(Buffer& decrypted_buffer, int label)
 	return (const char*)decrypted_buffer.buffer + pass[label].password + index->offset;
 }
 
-void generate_password(std::string& password)
+void generate_password(std::string& password, int len)
 {
 	srand(time(NULL));
 	char characters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789~!@#$%^&*()_-+={[}]|:;<,>.?";
-	for (int i = 0; i < MAX_STRING_SIZE; i++)
+	for (int i = 0; i < len; i++)
 	{
-		password[i] = characters[rand() % (sizeof(characters) - 1)];
+		password[i] += characters[rand() % (sizeof(characters) - 1)];
 	}
-	password[MAX_STRING_SIZE - 1] = '\0';
 }
 
 bool save_buffer_to_file(Buffer& buffer)

Password_manager/source/main.cpp

@@ -12,8 +12,8 @@
 
 int main()
 {
-	const char* label = "pet";
-	Arg args = Arg::List;
+	const char* label = "facebook";
+	Arg args = Arg::Print_all_p;
 	if (args == Arg::Error) return 1;
 
 	Buffer encrypted_buffer;
@@ -25,10 +25,7 @@ int main()
 
 	
 	std::string user_pass = "123";
-
-
 	Cryptography crypto(user_pass.c_str(), user_pass.size());
-
 	Buffer decrypted_buffer;
 	if (encrypted_buffer.size > 0)
 		if (!crypto.decrypt(&encrypted_buffer, &decrypted_buffer)) return 1;
@@ -70,7 +67,7 @@ int main()
 		break;
 	}
 
-	if (!pass) return 1;
+	if (!pass) return 0;
 
 	printf_s("Password copied to clipboard\n");
 	put_data_on_clipboard(pass);
@@ -86,7 +83,7 @@ int main(int argc, char** argv)
 	if (args == Arg::Error) return 1;
 
 	Buffer encrypted_buffer;
-	if (!load_buffer_from_file(&encrypted_buffer))
+	if (!load_buffer_from_file(encrypted_buffer))
 		if (!(args == Arg::Generate || args == Arg::Input)) {
 			printf_s("No passwords, try generating password\n");
 			return 1;

Password_manager/source/win.cpp

@@ -6,7 +6,7 @@
 
 bool put_data_on_clipboard(const char* text) {
 	size_t len = strlen(text);
-	if (strnlen_s(text, MAX_STRING_SIZE) == 0) {
+	if (len == 0) {
 		printf_s("Text is empty\n");
 		return false;
 	}