X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=basic%2Fruntime%2Forg.argeo.basic.nodeps%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Futil%2Fcrypto%2FPasswordBasedEncryptionTest.java;fp=basic%2Fruntime%2Forg.argeo.basic.nodeps%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Futil%2Fcrypto%2FPasswordBasedEncryptionTest.java;h=0000000000000000000000000000000000000000;hb=2fcbd437ed0a3987b461da585f685bf1f1a0d6db;hp=c5600884ffd7c2431677d2465e7f9a7e02c09151;hpb=e39d1cffbca5b2a6d5d7b6e20e7d75417a71c9b8;p=lgpl%2Fargeo-commons.git

diff --git a/basic/runtime/org.argeo.basic.nodeps/src/test/java/org/argeo/util/crypto/PasswordBasedEncryptionTest.java b/basic/runtime/org.argeo.basic.nodeps/src/test/java/org/argeo/util/crypto/PasswordBasedEncryptionTest.java
deleted file mode 100644
index c5600884f..000000000
--- a/basic/runtime/org.argeo.basic.nodeps/src/test/java/org/argeo/util/crypto/PasswordBasedEncryptionTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Mathieu Baudier
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.util.crypto;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.security.AlgorithmParameters;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.PBEParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import junit.framework.TestCase;
-
-import org.argeo.StreamUtils;
-import org.argeo.util.crypto.PasswordBasedEncryption;
-
-public class PasswordBasedEncryptionTest{// extends TestCase {
-//	public void testEncryptDecrypt() {
-//		final String password = "test long password since they are more powerful";
-//		PasswordBasedEncryption pbeEnc = new PasswordBasedEncryption(
-//				password.toCharArray());
-//		String message = "Hello World!";
-//		byte[] encrypted = pbeEnc.encryptString(message);
-//		// System.out.println("Encrypted: '" + new String(encrypted) + "'");
-//		PasswordBasedEncryption pbeDec = new PasswordBasedEncryption(
-//				password.toCharArray());
-//		InputStream in = null;
-//		in = new ByteArrayInputStream(encrypted);
-//		String decrypted = pbeDec.decryptAsString(in);
-//		// System.out.println("Decrypted: '" + decrypted + "'");
-//		StreamUtils.closeQuietly(in);
-//		assertEquals(message, decrypted);
-//	}
-//
-//	public void testPBEWithMD5AndDES() throws Exception {
-//		String password = "test";
-//		String message = "Hello World!";
-//
-//		byte[] salt = { (byte) 0xc7, (byte) 0x73, (byte) 0x21, (byte) 0x8c,
-//				(byte) 0x7e, (byte) 0xc8, (byte) 0xee, (byte) 0x99 };
-//
-//		int count = 1024;
-//
-//		String cipherAlgorithm = "PBEWithMD5AndDES";
-//		String secretKeyAlgorithm = "PBEWithMD5AndDES";
-//		SecretKeyFactory keyFac = SecretKeyFactory
-//				.getInstance(secretKeyAlgorithm);
-//		PBEKeySpec pbeKeySpec = new PBEKeySpec(password.toCharArray());
-//		PBEParameterSpec pbeParamSpec = new PBEParameterSpec(salt, count);
-//		SecretKey pbeKey = keyFac.generateSecret(pbeKeySpec);
-//		Cipher ecipher = Cipher.getInstance(cipherAlgorithm);
-//		ecipher.init(Cipher.ENCRYPT_MODE, pbeKey, pbeParamSpec);
-//		Cipher dcipher = Cipher.getInstance(cipherAlgorithm);
-//		dcipher.init(Cipher.DECRYPT_MODE, pbeKey, pbeParamSpec);
-//
-//		byte[] encrypted = ecipher.doFinal(message.getBytes());
-//		byte[] decrypted = dcipher.doFinal(encrypted);
-//		assertEquals(message, new String(decrypted));
-//
-//	}
-//
-//	public void testPBEWithSHA1AndAES() throws Exception {
-//		String password = "test";
-//		String message = "Hello World!";
-//
-//		byte[] salt = { (byte) 0xc7, (byte) 0x73, (byte) 0x21, (byte) 0x8c,
-//				(byte) 0x7e, (byte) 0xc8, (byte) 0xee, (byte) 0x99 };
-//		byte[] iv = { (byte) 0xc7, (byte) 0x73, (byte) 0x21, (byte) 0x8c,
-//				(byte) 0x7e, (byte) 0xc8, (byte) 0xee, (byte) 0x99,
-//				(byte) 0xc7, (byte) 0x73, (byte) 0x21, (byte) 0x8c,
-//				(byte) 0x7e, (byte) 0xc8, (byte) 0xee, (byte) 0x99 };
-//
-//		int count = 1024;
-//		// int keyLength = 256;
-//		int keyLength = 128;
-//
-//		String cipherAlgorithm = "AES/CBC/PKCS5Padding";
-//		String secretKeyAlgorithm = "PBKDF2WithHmacSHA1";
-//		SecretKeyFactory keyFac = SecretKeyFactory
-//				.getInstance(secretKeyAlgorithm);
-//		PBEKeySpec pbeKeySpec = new PBEKeySpec(password.toCharArray(), salt,
-//				count, keyLength);
-//		SecretKey tmp = keyFac.generateSecret(pbeKeySpec);
-//		SecretKey secret = new SecretKeySpec(tmp.getEncoded(), "AES");
-//		Cipher ecipher = Cipher.getInstance(cipherAlgorithm);
-//		ecipher.init(Cipher.ENCRYPT_MODE, secret, new IvParameterSpec(iv));
-//
-//		// decrypt
-//		keyFac = SecretKeyFactory.getInstance(secretKeyAlgorithm);
-//		pbeKeySpec = new PBEKeySpec(password.toCharArray(), salt, count,
-//				keyLength);
-//		tmp = keyFac.generateSecret(pbeKeySpec);
-//		secret = new SecretKeySpec(tmp.getEncoded(), "AES");
-//		// AlgorithmParameters params = ecipher.getParameters();
-//		// byte[] iv = params.getParameterSpec(IvParameterSpec.class).getIV();
-//		Cipher dcipher = Cipher.getInstance(cipherAlgorithm);
-//		dcipher.init(Cipher.DECRYPT_MODE, secret, new IvParameterSpec(iv));
-//
-//		byte[] encrypted = ecipher.doFinal(message.getBytes());
-//		byte[] decrypted = dcipher.doFinal(encrypted);
-//		assertEquals(message, new String(decrypted));
-//
-//		ByteArrayOutputStream out = new ByteArrayOutputStream();
-//		CipherOutputStream cipherOut = new CipherOutputStream(out, ecipher);
-//		cipherOut.write(message.getBytes());
-//		StreamUtils.closeQuietly(cipherOut);
-//		byte[] enc = out.toByteArray();
-//
-//		ByteArrayInputStream in = new ByteArrayInputStream(enc);
-//		CipherInputStream cipherIn = new CipherInputStream(in, dcipher);
-//		ByteArrayOutputStream dec = new ByteArrayOutputStream();
-//		StreamUtils.copy(cipherIn, dec);
-//		assertEquals(message, new String(dec.toByteArray()));
-//	}
-}