X-Git-Url: https://harishankar.org/repos/?p=wordblah.git;a=blobdiff_plain;f=wordblox.h;h=b6579861deb0ae4a99b7b4ac866ad352974e53b0;hp=8886fabaa9b388f0543834698dabfb1d4d3270bb;hb=f5202f7c1ec8a765f4d0325e56f6d89ca22bef28;hpb=d27505add68f9df169f2135a416bdf52ce9af8c3

diff --git a/wordblox.h b/wordblox.h
index 8886fab..b657986 100644
--- a/wordblox.h
+++ b/wordblox.h
@@ -9,6 +9,9 @@
 #include <gdfontmb.h>
 #include <gdfontg.h>
 #include <zlib.h>
+#include <openssl/conf.h>
+#include <openssl/evp.h>
+#include <openssl/err.h>
 #include "constantstrings.h"
 
 #define MAX_PUZZLE_SIZE 25
@@ -58,6 +61,46 @@ typedef struct {
 	char salt[256];
 } Puzzle;
 
+/* The player data struct type - for the player app */
+typedef struct {
+	Puzzle puzzle;
+	char filename[65535];
+	bool is_loaded;
+	char char_ans[MAX_PUZZLE_SIZE][MAX_PUZZLE_SIZE];
+	int cur_row;
+	int cur_col;
+} MainPlayerData;
+
+/* compute the hash of a password */
+void digest_message(const unsigned char *message, 
+	size_t message_len, unsigned char **digest, unsigned int *digest_len)
+{
+	EVP_MD_CTX *mdctx;
+
+	if((mdctx = EVP_MD_CTX_new()) == NULL)
+		goto err;
+
+	if(1 != EVP_DigestInit_ex(mdctx, EVP_sha256(), NULL))
+		goto err;
+
+	if(1 != EVP_DigestUpdate(mdctx, message, message_len))
+		goto err;
+
+	if((*digest = (unsigned char *)
+		OPENSSL_malloc(EVP_MD_size(EVP_sha256()))) == NULL)
+		goto err;
+
+	if(1 != EVP_DigestFinal_ex(mdctx, *digest, digest_len))
+		goto err;
+
+	EVP_MD_CTX_free(mdctx);
+	return;
+err:
+	EVP_MD_CTX_free(mdctx);
+	ERR_print_errors_fp(stderr);	
+	exit (2);
+}
+
 /* get a number from the user */
 int get_num ()
 {
@@ -75,11 +118,17 @@ bool verify_password (Puzzle *p, const char* password)
 		return true;
 		
 	/* hash the user input password and compare it with the stored password */
-	char* hashed_password = crypt (password, (const char *)p->salt);
+	unsigned char* hashed_password;
+	unsigned int len;
+	digest_message ((const unsigned char *)password, strlen(password),
+						&hashed_password, &len);
 	
-	if (strcmp (p->hashed_password, hashed_password) == 0)
+	if (strcmp (p->hashed_password, (const char*) hashed_password) == 0)
+	{
+		OPENSSL_free (hashed_password);
 		return true;
-		
+	}
+	OPENSSL_free (hashed_password);	
 	return false;
 }
 
@@ -94,12 +143,14 @@ void set_puzzle_password (Puzzle *p, const char *password)
 	}
 	else 
 	{
-		srand (time(NULL));
-		char salt[256];
-		sprintf (salt, "puzzle%d", rand()%1000);
-		char* hashedpwd = crypt (password, (const char*)salt);
-		strcpy (p->hashed_password, hashedpwd);
-		strcpy (p->salt, salt);
+
+		unsigned char* hashedpwd;
+		unsigned int len;
+		digest_message ((const unsigned char *)password, strlen(password),
+						&hashedpwd, &len);
+		strcpy (p->hashed_password, (const char *)hashedpwd);
+		strcpy (p->salt, "\0");
+		OPENSSL_free (hashedpwd);
 	}
 }
 
@@ -267,7 +318,7 @@ void unfreeze_puzzle (Puzzle *p)
 /* freeze the grid - make editing impossible because it finalizes the
    across and down words in the grid */
 void freeze_puzzle (Puzzle *p)
-{
+{		
 	int word_num = 1;
 	bool across_word_start, down_word_start;
 	for (int i = 0; i < p->grid_size; i ++)
@@ -277,7 +328,7 @@ void freeze_puzzle (Puzzle *p)
 			across_word_start = false; 
 			down_word_start = false;
 			/* if it is a blank cell - cover it with a block */
-			if (p->chars[i][j] == ' ')
+			if (p->chars[i][j] == ' ' || p->chars[i][j] == '#')
 				p->chars[i][j] = '#';
 			/* it is not a blank cell - check all possibilities */
 			else 
@@ -692,6 +743,7 @@ void print_menu (enum COLOR fg, enum COLOR bg, const char* title,
 			printf ("\u2550");
 		printf ("\u2557"); 
 		reset_color (); printf ("\n");
+		set_color (fg, bg, NORMAL);
 		printf ("\u2551");
 		set_color (fg, bg, BOLD);
 		printf ("%-*s", padding, title);
@@ -719,4 +771,86 @@ void print_menu (enum COLOR fg, enum COLOR bg, const char* title,
 		reset_color (); printf ("\n");
 }
 
+/* reset the player data, from the new file */
+void reset_player_data (MainPlayerData *app_data, const char *filename)
+{
+	app_data->puzzle = load_puzzle (filename);
+
+	app_data->is_loaded = app_data->puzzle.grid_frozen;
+	app_data->cur_col = -1;
+	app_data->cur_row = -1;
+	strcpy (app_data->filename, filename);
+	/* reset the answer keys */
+	for (int i = 0; i < app_data->puzzle.grid_size; i ++)
+		for (int j = 0; j < app_data->puzzle.grid_size; j ++)
+			app_data->char_ans[i][j] = ' ';
+	
+}
+
+/* in the player app, move the current selection index left or right */
+void move_current_col (MainPlayerData *app_data, enum DIRECTION dir)
+{
+	int r = app_data->cur_row;
+	int c = app_data->cur_col;
+	if (dir == DIR_FORWARD)
+	{
+		c ++;
+		while (c < app_data->puzzle.grid_size)
+		{
+			if (app_data->puzzle.chars[r][c] == '#')
+				c ++;
+			else
+				break;
+		}
+		if (c < app_data->puzzle.grid_size)
+			app_data->cur_col = c;
+	}
+	else 
+	{
+		c --;
+		while (c >= 0)
+		{
+			if (app_data->puzzle.chars[r][c] == '#')
+				c --;
+			else
+				break;
+		}
+		if (c >= 0)
+			app_data->cur_col = c;
+	}
+}
+
+/* in the player app move the current selection index up or down */
+void move_current_row (MainPlayerData *app_data, enum DIRECTION dir)
+{
+	int r = app_data->cur_row;
+	int c = app_data->cur_col;
+	if (dir == DIR_FORWARD)
+	{
+		r ++;
+		while (r < app_data->puzzle.grid_size)
+		{
+			if (app_data->puzzle.chars[r][c] == '#')
+				r ++;
+			else
+				break;
+		}
+		if (r < app_data->puzzle.grid_size)
+			app_data->cur_row = r;
+	}
+	else 
+	{
+		r --;
+		while (r >= 0)
+		{
+			if (app_data->puzzle.chars[r][c] == '#')
+				r --;
+			else
+				break;
+		}
+		if (r >= 0)
+			app_data->cur_row = r;
+	}
+}
+
 #endif