From 19e137e5baec73146d8f96252591b81e57f0db33 Mon Sep 17 00:00:00 2001
From: Guillermo <groche97@gmail.com>
Date: Tue, 11 Feb 2020 14:08:18 +0100
Subject: [PATCH] Aniadido cifrado

---
 .classpath    |   1 +
 cifrado.jar   | Bin 0 -> 3077 bytes
 src/Main.java |  27 ++++++++++++++-------------
 3 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 cifrado.jar

diff --git a/.classpath b/.classpath
index aa96ce4..25d6c4a 100644
--- a/.classpath
+++ b/.classpath
@@ -5,5 +5,6 @@
 	<classpathentry kind="lib" path="gson-2.8.6-javadoc.jar"/>
 	<classpathentry kind="lib" path="gson-2.8.6-sources.jar"/>
 	<classpathentry kind="lib" path="gson-2.8.6.jar"/>
+	<classpathentry kind="lib" path="cifrado.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cifrado.jar b/cifrado.jar
new file mode 100644
index 0000000000000000000000000000000000000000..f672826d41d8c5ce4157edffeb02ebc67d8eadcc
GIT binary patch
literal 3077
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
V<YgNnXit&d(jGtLv~~Zz_+JDrI~4!`

literal 0
HcmV?d00001

diff --git a/src/Main.java b/src/Main.java
index 8057a60..33ab749 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -9,7 +9,7 @@ import java.util.Scanner;
 import com.google.gson.Gson;
 
 public class Main {
-
+	static String pass="soy segura";
 	public static void main(String[] args) {
 		System.out.println("Entra cliente");
 		Socket socket;
@@ -24,13 +24,13 @@ public class Main {
 			Scanner es = new Scanner(System.in);
 			BufferedReader bufferEntrada = new BufferedReader(new InputStreamReader(socket.getInputStream()));
 			PrintWriter bufferSalida = new PrintWriter(new OutputStreamWriter(socket.getOutputStream()),true);
-			String entrada = gson.fromJson(bufferEntrada.readLine(), String.class);
+			String entrada = gson.fromJson(Cifrado.desencriptar(bufferEntrada.readLine(), pass), String.class);
 			System.out.println(entrada);
 			
 			System.out.println("Introduce el numero de partida en el que quieres entrar");
-			bufferSalida.println(es.nextLine());
-			System.out.println(gson.fromJson(bufferEntrada.readLine(), String.class));
-			String tipoJuego = gson.fromJson(bufferEntrada.readLine(), String.class);
+			bufferSalida.println(Cifrado.cifrar(gson.toJson(es.nextLine()), pass));
+			System.out.println(gson.fromJson(Cifrado.desencriptar(bufferEntrada.readLine(), pass), String.class));
+			String tipoJuego = gson.fromJson(Cifrado.desencriptar(bufferEntrada.readLine(), pass), String.class);
 			switch(tipoJuego) {
 			case "3":
 				partida3(bufferEntrada, bufferSalida, es);
@@ -47,29 +47,30 @@ public class Main {
 	
 	static void partida3(BufferedReader bufferEntrada, PrintWriter bufferSalida, Scanner es) throws IOException {
 		Gson gson = new Gson();
-		System.out.println(gson.fromJson(bufferEntrada.readLine(), String.class));
-		System.out.println(gson.fromJson(bufferEntrada.readLine(), String.class));
+		System.out.println(gson.fromJson(Cifrado.desencriptar(bufferEntrada.readLine(), pass), String.class));
+		System.out.println(gson.fromJson(Cifrado.desencriptar(bufferEntrada.readLine(), pass), String.class));
 		while(dibujarTablero(bufferEntrada)) {
 			System.out.println("introduce la x de la nueva marca");
-			bufferSalida.println(es.nextLine());
+			bufferSalida.println(Cifrado.cifrar(gson.toJson(es.nextLine()), pass));
 			System.out.println("introduce la y de la nueva marca");
-			bufferSalida.println(es.nextLine());
+			bufferSalida.println(Cifrado.cifrar(gson.toJson(es.nextLine()), pass));
 		}
 	}
 	
 	static void partida4(BufferedReader bufferEntrada, PrintWriter bufferSalida, Scanner es) throws IOException {
 		Gson gson = new Gson();
-		System.out.println(gson.fromJson(bufferEntrada.readLine(), String.class));
-		System.out.println(gson.fromJson(bufferEntrada.readLine(), String.class));
+		System.out.println(gson.fromJson(Cifrado.desencriptar(bufferEntrada.readLine(), pass), String.class));
+		System.out.println(gson.fromJson(Cifrado.desencriptar(bufferEntrada.readLine(), pass), String.class));
 		while(dibujarTablero(bufferEntrada)) {
 			System.out.println("introduce la columna de la nueva ficha");
-			bufferSalida.println(gson.fromJson(es.nextLine(), String.class));
+			bufferSalida.println(Cifrado.cifrar(gson.toJson(es.nextLine()), pass));
 		}
 	}
 	
 	static boolean dibujarTablero(BufferedReader entrada) throws IOException {
 		Gson gson = new Gson();
-		String linea = gson.fromJson(entrada.readLine(), String.class);
+		String salida = Cifrado.desencriptar(entrada.readLine(), pass);
+		String linea = gson.fromJson(salida, String.class);
 		if(linea.contains("v")) {
 			System.out.println("Has ganado!");
 		}else if (linea.contains("f")){