diff --git a/src/main/java/RSACryptors.java b/src/main/java/RSACryptors.java
index 884be6b..fe8aaba 100644
--- a/src/main/java/RSACryptors.java
+++ b/src/main/java/RSACryptors.java
@@ -1,6 +1,9 @@
 import javax.crypto.Cipher;
+import javax.crypto.spec.OAEPParameterSpec;
+import javax.crypto.spec.PSource;
 import java.security.*;
 import java.security.spec.InvalidKeySpecException;
+import java.security.spec.MGF1ParameterSpec;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
 
@@ -11,9 +14,10 @@ import java.security.spec.X509EncodedKeySpec;
 public class RSACryptors {
 
     //key length
-    public static final int KEY_LENGTH = 4096;
+    public static final int KEY_LENGTH = 2048;
     //main family of rsa
     public static final String RSA = "RSA";
+    public static final String RSA_OAEP = "RSA/ECB/OAEPPadding";
 
     /**
      * generate a 2048 bit RSA key
@@ -45,8 +49,9 @@ public class RSACryptors {
     public static byte[] encryptRSA(byte[] plain, PublicKey publicKey) {
         byte[] enc = null;
         try {
-            Cipher cipher = Cipher.getInstance(RSA);
-            cipher.init(Cipher.ENCRYPT_MODE, publicKey);
+            Cipher cipher = Cipher.getInstance(RSA_OAEP);
+            OAEPParameterSpec oaepParams = new OAEPParameterSpec("SHA-256", "MGF1", MGF1ParameterSpec.SHA256, PSource.PSpecified.DEFAULT);
+            cipher.init(Cipher.ENCRYPT_MODE, publicKey, oaepParams);
             enc = cipher.doFinal(plain);
         }
         //no need to catch 4 different exceptions
@@ -68,8 +73,9 @@ public class RSACryptors {
     public static byte[] decryptRSA(byte[] enc, PrivateKey privateKey) {
         byte[] plain = null;
         try {
-            Cipher cipher = Cipher.getInstance(RSA);
-            cipher.init(Cipher.DECRYPT_MODE, privateKey);
+            Cipher cipher = Cipher.getInstance(RSA_OAEP);
+            OAEPParameterSpec oaepParams = new OAEPParameterSpec("SHA-256", "MGF1", MGF1ParameterSpec.SHA256, PSource.PSpecified.DEFAULT);
+            cipher.init(Cipher.DECRYPT_MODE, privateKey, oaepParams);
             plain = cipher.doFinal(enc);
         }
         //no need to catch 4 different exceptions
@@ -83,15 +89,40 @@ public class RSACryptors {
     public static void main(String[] args) throws NoSuchAlgorithmException, InvalidKeySpecException {
         final StringBuffer log = new StringBuffer();
 
-//        KeyPair pair = RSACryptors.generateRSAKey();
-//        System.out.println(new String(Base64.encode(pair.getPrivate().getEncoded())));
-//        System.out.println("\n\n");
-//        System.out.println(new String(Base64.encode(pair.getPublic().getEncoded())));
-        final String priKey = "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";
-        final String pubKey = "MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtHXqkz9U/MjgLxrvFF8cdhEQ3qHxekR7qpCdXZG2glOfZv3R9S+frTRCljcqmSG3xf6Of1E40QP6z9qENowPSBbWwU0FTH9VQxN5pwmTM1NwE1+7FlNHo9lrh6YAVeQ3a6MlFlWRpqXLxdT5wi1iB9qyxQNEhKALKbYfL6la7GO8P5zzrFJsAddFvikSoSWtVIRgVD47WqtmN715w5MKmk99uiuQ6YxReMBFqGLIZpJALQXrVNLTwpG6pDSxgY+6mYh3XK98Ajq6GtvJKWEYJg+p3s1XZFnFXUTWa/xx8XbQBzbcR/uggH1N+pFXexnWFuQ1J6B17eKtoWdzNM5fVD+GWZOTApcLuFvQC2+oy8WOWAXCpC7gF7PeJREhC4RCZ2q3Ez6DH4ba+mL1biQTmoxx8pVdifvCUNfDSPhCEycYfyXlqz7UBh/3WEvb9DKoFxTLuu1ADjqLeu/vHtQ9iKuWzF/0osdbsFQjFvwkaTznzOaovx/PRpI0huIdge/RPultGPmzp0zaEkoI0H9wIaRrnYSprInUf+odhdUYYEzDFOItymZlOuon93SYtxrLZkHZL3trxPmE3Pqhq/dURwbzdOVqzQ6M+nOVDznsM3JBmYjLee351rQp2XP3fFh88epxRvVn9QstUiWt6e0hvBE299Gh4hN9vKcWrbpJ1X0CAwEAAQ==";
-        final X509EncodedKeySpec pubSpec = new X509EncodedKeySpec(Base64.decode(pubKey));
-        final PKCS8EncodedKeySpec priSpec = new PKCS8EncodedKeySpec(Base64.decode(priKey));
+        KeyPair pair = RSACryptors.generateRSAKey();
+        System.out.println(new String(Base64.encode(pair.getPrivate().getEncoded())));
+        System.out.println("\n\n");
+        System.out.println(new String(Base64.encode(pair.getPublic().getEncoded())));
+//        final String priKey = "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDIo9xEC9owvyosWzFLfa41cuMAux3u81m4dWal08TWrzvfU9qvmPoiNAEZwMQq1dWWwME52XGAS2Vu0vXtvcNZQx/s88O6ldckWREgkHWDQW+TcWfz1/tmg6+pBHPK95Tm8R/ijxAr/AYy6cJ3ZGln0Aqjct9D5MkO5+2uPT04XCwlr2L9CpG4OnNalu4Juh1JSkET0GPBdfZc0bTmmRpEKqu2wPyHcy6Mbtfi2+xA5WNk/ZDgbkq5/fIHCsrcBuY97BbwCYwYCEZEbP30a5+0LTOfdDLSoWD8IODK+eYQGSddXiz5/sJJqbCz7VUV2GE8YcP7VVbOU6v3xYD7CTG7AgMBAAECggEAOpjAh47+liX+Zx3q86Us76cx7NC5GUQw+9ItvFhwsFJVJhATWh1PUBXoDGFj6S6yRmjdBcwffdyHLyqlcF1vY+5asJUwoJmKT69DdUM7Tq4Zq/H+7hQx8+qZrr8CIlDUR+475arqii38kXn7tWq57fuwX7P4yJdUsOnDXJO+AWtFTcJ8TeOWdeii9JD2VrkuPrACrpC4Z1ApgcvYXj2l48AUKdwX+RD1KJ8kKFaMFCSbfMQ1M/SFKrf/PC+8mWqnn8JI/LmepIP3lL0grzQWS2z7eE+s5vmuh7kiqcNDM7j0ZiAejhrNhXIm5+aWlG62rs3BftXgKXH7x1rd6S+FAQKBgQDwWZcR1XkU0bSj7KYtd9g7vn1L0BLECsMm1rbNuXp7+T+G9PU7iy5K5EAiPiPzcgY4EOLEo2v8n5cjXhDH9akGmvRfrGhi104AWq2aX9HU1K375z11Gian9Tjp4qrjhP2yXUi2J3B4NscezTguvgiT7H7wpUJfnK1uGGFaQY0hIQKBgQDVtFf0fJUDpfWrFiWty52nqAkFVXUXSXFeWBOZF1FjehRkxW413lmQcUlzCtChTHtXm8ypI8mGqdIoHEizON/draRn1EKUp0DTW+iDCMsnRmNb0KzM7s0lnT8+069nrEaF+OhoWPwGH/GLnTs+Do1dvkByi75XV+1T1+tUhTILWwKBgCA5suKmP6TF9TVhXmqMPgbMpJoMnOeCFeZYNYxhyQVkRts+br78C0npTpwIvuM+L41G3lDFJI5ri2UnkJJu4qnLDubhA+H0wjWT8uDW5hhmJ6m1uGzCA9rTKz1YsdbtluJaVYxuv0qu9YWwuE60FgxXUjHLxplxNWOkizEBxv1hAoGAZ6vac2ewnpl3KW1QEBTUQY45+hVv/UEKt1sA/uaZ/CkwFYbVpVpdlr3uhNm9RlKlD2Ysje0niaV+pyi5eABiUdc4B4qoVhchUqemj1LHwyDZeKQuACjk6pdzJBZrZF7lw35xuJVahdofQryfDcbfe5edCjSSvSqRnngD2PfYxDsCgYA5hP/JzaCRGGi8H0h+JmmShgNykRPm+wunR/ytuhLUhs7TgFguUC159vALzXFotvzraCyVqfxOf7HThdlvjTcdv0ivu9rdy+jClKrVUiZtcwN8IF+JHnPIysWqsZOVG00yjZCJCYrB0iHOaE1G3VQ7hAIVlVmaOUC9RzN0axwIeQ==";
+//        final String pubKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyKPcRAvaML8qLFsxS32uNXLjALsd7vNZuHVmpdPE1q8731Par5j6IjQBGcDEKtXVlsDBOdlxgEtlbtL17b3DWUMf7PPDupXXJFkRIJB1g0Fvk3Fn89f7ZoOvqQRzyveU5vEf4o8QK/wGMunCd2RpZ9AKo3LfQ+TJDuftrj09OFwsJa9i/QqRuDpzWpbuCbodSUpBE9BjwXX2XNG05pkaRCqrtsD8h3MujG7X4tvsQOVjZP2Q4G5Kuf3yBwrK3AbmPewW8AmMGAhGRGz99GuftC0zn3Qy0qFg/CDgyvnmEBknXV4s+f7CSamws+1VFdhhPGHD+1VWzlOr98WA+wkxuwIDAQAB";
+        final String priKey="MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDVHZb6zFmwbXISBR4gIyUaIsPsLbUHNKykWBS46Csw2kQKoy1cNlqktdhhGH/UKqitRqyI9g2CoFj0aC3HX4rBVDRDFDuPsuj19PiEGmaGLA0E6GWvwZ6lht9EApE6f5fcp3Ky9d7PA/qKRGociesC44i5DAwea67xBiFIhzYuSytoMNMGhFS6iW2VNOxZfhW6xszf4zygBulw1SXjd0O4GPiw1orI+uEQyNgDxasCy+LaOYw9jDSaNKRZWIOA1mVVelexLFq/y8nX36A6MWbVcIlt+rkGb25obvYKjTW/Oz1hRauMwQVUnUTfsJ+I+c8LJ16849qlNjUyWwWp9aW7AgMBAAECggEAM8nrBKtgKEWQcNyZg4nG3GESZ3R8B3I/efiFoKGazVZdLpCU11HGGTyvhnjjp3VuZB1GlEnm4pWAyHQAm/CV0YFa6eoixzrc7dhIBCI+Q+C0kTrAa0OMAAGUg/xzulmDV/XBI8goCvqWib8yYhkJ6TvN39oTn9jfPGcW838YJYthQVv8EdWNkzGcntgOGoRKG2nwEaHiisKzj3FE9TSxg/hbL9lCzI/YQ13Ipgia55JP4dy5M1X0aqYqXT/RFlRSre4fqhMFDMn6+ATzxZYXt64BUutcveKnWr60gYIT0UONRiFXUdBrergmZ1pxiys7/2KB/V8omiUYCAS22FDR0QKBgQDwTn7d1PXaUV1fCfVuYeuVvm029CP72xHSU/TAOewo6HgpQkIg5UVcwXo3wJQqdJ4ckpHH3320oQ+FTrzl7T8o/4KkUVH8JRL1+BEjl2DWuXd0u4s0KUTr2eddRMXEUmDbNGyT28rr30dTf9GYFn6DSJ3y68CBTMn5DNJ7amAaJQKBgQDjCIIASayULpw6AGtLpSs6c/E9Qv/WQBlZTfyFUjN0sCgbAp4EA116/9W27iPS6uBF19UcnVa98jlDHyXhsn7BGxcmC60/MryPjuv4ds4puCffilXONQnDP+SdbkLO9NHrdIeavi26YFk8cx1Z2bsPaCihqv3EghemH3o4USSKXwKBgHVuRnztBr+LJ0+8NB2e6Fsi1YgXQkZfRZQ8xsvxAkDzaVTwNhSRNZYgTjNUfpNIrcNUtLyxsGJGmqkQUyshBs5oHlViD+hhzaQ5d1anMQF9XKzEwT/aMv32XCOt6d8ISqCUO8L9k2o0kExzl970jxpksBr3rfkBp2l3JJx+3TupAoGBAN8h7nsP7cDZqovK+6kmFT1m1FNMdRuCdidyYVw69P2bYF9jjCAPmqGXrdkTZjwWwgOC5B4yeR1IYoUYqOeQwclSscaftU8ms3I4mqzhPzB7oRyv3jNDp2uxcSRVSO4UafiK1/f7MAA8T5f833z+ZD35Ne3mm3C2Fz4bM8kD3vDrAoGAENfY13eVvdPGt/SfnXVHU+zIDdo5Stsiv5tbmzsUgWRd0N57787pLZqStGYTztHvZ2Y1Exv19YnNj2uf+dGi2nig+Wynxh2rFK3fGTdUA3SgjsqgM2+8ckgpBeodtV37N8kIMD0eqPoaf+ErWw/90L9o0e9k5LRp8PVLXMewO38=";
+        final String pubKey="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1R2W+sxZsG1yEgUeICMlGiLD7C21BzSspFgUuOgrMNpECqMtXDZapLXYYRh/1CqorUasiPYNgqBY9Ggtx1+KwVQ0QxQ7j7Lo9fT4hBpmhiwNBOhlr8GepYbfRAKROn+X3KdysvXezwP6ikRqHInrAuOIuQwMHmuu8QYhSIc2LksraDDTBoRUuoltlTTsWX4VusbM3+M8oAbpcNUl43dDuBj4sNaKyPrhEMjYA8WrAsvi2jmMPYw0mjSkWViDgNZlVXpXsSxav8vJ19+gOjFm1XCJbfq5Bm9uaG72Co01vzs9YUWrjMEFVJ1E37CfiPnPCydevOPapTY1MlsFqfWluwIDAQAB";
+
+        final byte[] pubkeydata = Base64.decode(pubKey);
+        final byte[] prikeydata = Base64.decode(priKey);
+        log.append(" pub {");
+        for (int j = 0; j < pubkeydata.length; j++) {
+            if (j != 0 && j % 16 == 0) {
+                log.append("\n");
+            }
+            log.append(String.valueOf(pubkeydata[j]) + ",");
+        }
+        log.append(" }\n");
+
+
+        log.append(" prikey {");
+        for (int j = 0; j < prikeydata.length; j++) {
+            if (j != 0 && j % 16 == 0) {
+                log.append("\n");
+            }
+            log.append(String.valueOf(prikeydata[j]) + ",");
+        }
+        log.append(" }\n");
+
+        final X509EncodedKeySpec pubSpec = new X509EncodedKeySpec(pubkeydata);
+        final PKCS8EncodedKeySpec priSpec = new PKCS8EncodedKeySpec(prikeydata);
         final KeyFactory kf = KeyFactory.getInstance("RSA");
+
         final PublicKey pubKeyObj=kf.generatePublic(pubSpec);
         final PrivateKey priKeyObj=kf.generatePrivate(priSpec);
         final String source="encryptRSA";
@@ -101,12 +132,16 @@ public class RSACryptors {
 
         final byte[] encrypted=RSACryptors.encryptRSA(source.getBytes(),pubKeyObj);
 
-
+        log.append('\n');
+        log.append(new String(Base64.encode(encrypted)));
+        log.append('\n');
+//
         log.append(" {");
         for (int j = 0; j < encrypted.length; j++) {
             log.append(String.valueOf(encrypted[j]) + ",");
         }
         log.append(" }\n");
+//        final byte[] encrypted=Base64.decode("MEogpqN82NLup5AtwaGb2bB810yQ0W3LlT5mXhoysVnk9unLeIEQ1Ocmx3dP0HQcLwisVhy8EBm4XSpCx9IS6Xp1sRsyHV0mMIsDKtDRqkUs5rJtMm8ZkWst+AowGKCI+HYuzIUYqriPjtBibdIY703EUnoVNILxK1/YChpJF6ksvMsBQPQPgcwtM3KLkHXNPmxWp8foHzdeUFqbUbgO8e+2FuSQ0v2j4x75elLLcrh4SEtGLl36ra0h5/4g6Q5NiCsk8bokUP6L2eZFISbqzoKS2NJ9veDBjUzLeb+8d2PDgCAnlc8CzX9IBJottGGdM4YicdWrJBNbaj0gSC2czg==");
         final byte[] decrypted=RSACryptors.decryptRSA(encrypted,priKeyObj);
         log.append(" trans : ");
         log.append(new String(decrypted));