From 9be70843fdef7d16f6c828ae1bbe09fe8b93d725 Mon Sep 17 00:00:00 2001 From: Rajani Karuturi Date: Fri, 17 Apr 2015 09:54:03 +0530 Subject: [PATCH] removed unused static main in ConsoleProxyPasswordBasedEncryptor This closes #11 This closes #10 This closes #176 --- .../ConsoleProxyPasswordBasedEncryptor.java | 30 ------------------- .../ConsoleProxyPasswordBasedEncryptor.java | 30 ------------------- 2 files changed, 60 deletions(-) diff --git a/server/src/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java b/server/src/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java index b64bb019405..9d874e0844a 100644 --- a/server/src/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java +++ b/server/src/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java @@ -19,7 +19,6 @@ package com.cloud.servlet; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; -import java.security.SecureRandom; import javax.crypto.BadPaddingException; import javax.crypto.Cipher; @@ -159,33 +158,4 @@ public class ConsoleProxyPasswordBasedEncryptor { } } - public static void main(String[] args) { - SecureRandom random; - try { - random = SecureRandom.getInstance("SHA1PRNG"); - byte[] keyBytes = new byte[16]; - random.nextBytes(keyBytes); - - byte[] ivBytes = new byte[16]; - random.nextBytes(ivBytes); - - KeyIVPair keyIvPair = new KeyIVPair("8x/xUBgX0Up+3UEo39dSeG277JhVj31+ElHkN5+EC0Q=", "Y2SUiIN6JXTdKNK/ZMDyVtLB7gAM9MCCiyrP1xd3bSQ="); - //keyIvPair.setKeyBytes(keyBytes); - //keyIvPair.setIvBytes(ivBytes); - - Gson gson = new GsonBuilder().create(); - ConsoleProxyPasswordBasedEncryptor encryptor = new ConsoleProxyPasswordBasedEncryptor(gson.toJson(keyIvPair)); - - String encrypted = encryptor.encryptText("Hello, world"); - - System.out.println("Encrypted result: " + encrypted); - - String decrypted = encryptor.decryptText(encrypted); - - System.out.println("Decrypted result: " + decrypted); - - } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); - } - } } diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyPasswordBasedEncryptor.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyPasswordBasedEncryptor.java index 4ec2a726b5c..c623aff1aa2 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyPasswordBasedEncryptor.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyPasswordBasedEncryptor.java @@ -19,7 +19,6 @@ package com.cloud.consoleproxy; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; -import java.security.SecureRandom; import javax.crypto.BadPaddingException; import javax.crypto.Cipher; @@ -165,33 +164,4 @@ public class ConsoleProxyPasswordBasedEncryptor { } } - public static void main(String[] args) { - SecureRandom random; - try { - random = SecureRandom.getInstance("SHA1PRNG"); - byte[] keyBytes = new byte[16]; - random.nextBytes(keyBytes); - - byte[] ivBytes = new byte[16]; - random.nextBytes(ivBytes); - - KeyIVPair keyIvPair = new KeyIVPair("8x/xUBgX0Up+3UEo39dSeG277JhVj31+ElHkN5+EC0Q=", "Y2SUiIN6JXTdKNK/ZMDyVtLB7gAM9MCCiyrP1xd3bSQ="); - //keyIvPair.setKeyBytes(keyBytes); - //keyIvPair.setIvBytes(ivBytes); - - Gson gson = new GsonBuilder().create(); - ConsoleProxyPasswordBasedEncryptor encryptor = new ConsoleProxyPasswordBasedEncryptor(gson.toJson(keyIvPair)); - - String encrypted = encryptor.encryptText("Hello, world"); - - System.out.println("Encrypted result: " + encrypted); - - String decrypted = encryptor.decryptText(encrypted); - - System.out.println("Decrypted result: " + decrypted); - - } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); - } - } }