Author: painter
Date: Mon Nov 26 22:10:24 2018
New Revision: 1847499
URL: http://svn.apache.org/viewvc?rev=1847499&view=rev
Log:
Clean up: Fix NOTICE.TXT file and additional javadoc warnings per tv remarks
Modified:
turbine/fulcrum/trunk/yaafi-crypto/NOTICE.txt
turbine/fulcrum/trunk/yaafi-crypto/src/test/org/apache/fulcrum/jce/crypto/CryptoUtilTest.java
Modified: turbine/fulcrum/trunk/yaafi-crypto/NOTICE.txt
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi-crypto/NOTICE.txt?rev=1847499&r1=1847498&r2=1847499&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi-crypto/NOTICE.txt (original)
+++ turbine/fulcrum/trunk/yaafi-crypto/NOTICE.txt Mon Nov 26 22:10:24 2018
@@ -1,4 +1,4 @@
-Turbine Fulcrum ServiceManager
+Turbine Fulcrum YAAFI-Cypto Component
Copyright 2002-2007 The Apache Software Foundation.
This product includes software developed at
Modified:
turbine/fulcrum/trunk/yaafi-crypto/src/test/org/apache/fulcrum/jce/crypto/CryptoUtilTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi-crypto/src/test/org/apache/fulcrum/jce/crypto/CryptoUtilTest.java?rev=1847499&r1=1847498&r2=1847499&view=diff
==============================================================================
---
turbine/fulcrum/trunk/yaafi-crypto/src/test/org/apache/fulcrum/jce/crypto/CryptoUtilTest.java
(original)
+++
turbine/fulcrum/trunk/yaafi-crypto/src/test/org/apache/fulcrum/jce/crypto/CryptoUtilTest.java
Mon Nov 26 22:10:24 2018
@@ -19,7 +19,6 @@ package org.apache.fulcrum.jce.crypto;
* under the License.
*/
-
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -31,272 +30,297 @@ import junit.framework.TestCase;
* @author <a href="mailto:[email protected]";>Siegfried Goeschl</a>
*/
-public class CryptoUtilTest extends TestCase
-{
- /** the password to be used */
- private String password;
-
- /** the test data directory */
- private File testDataDirectory;
-
- /** the temp data director */
- private File tempDataDirectory;
-
- /**
- * Constructor
- * @param name the name of the test case
- */
- public CryptoUtilTest( String name )
- {
- super(name);
-
- this.password = "mysecret";
- this.testDataDirectory = new File( "./src/test/data" );
- this.tempDataDirectory = new File( "./target/temp" );
- this.tempDataDirectory.mkdirs();
- }
-
- /**
- * @see junit.framework.TestCase#setUp()
- * byte[] salt,
- int count,
- String algorithm,
- String providerName )
-
- */
- protected void setUp() throws Exception
- {
- CryptoStreamFactoryImpl factory = new CryptoStreamFactoryImpl(
- CryptoParameters.SALT,
- CryptoParameters.COUNT
- );
-
- CryptoStreamFactoryImpl.setInstance( factory );
- }
-
- /**
- * @return Returns the password.
- */
- protected char[] getPassword()
- {
- return password.toCharArray();
- }
-
- /**
- * @return Returns the tempDataDirectory.
- */
- protected File getTempDataDirectory()
- {
- return tempDataDirectory;
- }
-
- /**
- * @return Returns the testDataDirectory.
- */
- protected File getTestDataDirectory()
- {
- return testDataDirectory;
- }
-
- /** Encrypt a text file */
- public void testTextEncryption() throws Exception
- {
- File sourceFile = new File( this.getTestDataDirectory(), "plain.txt" );
- File targetFile = new File( this.getTempDataDirectory(),
"plain.enc.txt" );
- CryptoUtil.encrypt( sourceFile, targetFile, this.getPassword() );
- }
-
- /** Decrypt a text file */
- public void testTextDecryption() throws Exception
- {
- testTextEncryption();
- File sourceFile = new File( this.getTempDataDirectory(),
"plain.enc.txt" );
- File targetFile = new File( this.getTempDataDirectory(),
"plain.dec.txt" );
- CryptoUtil.decrypt( sourceFile, targetFile.getAbsolutePath(),
this.getPassword() );
- }
-
- /** Encrypt an empty text file */
- public void testEmptyTextEncryption() throws Exception
- {
- File sourceFile = new File( this.getTestDataDirectory(), "empty.txt" );
- File targetFile = new File( this.getTempDataDirectory(),
"empty.enc.txt" );
- CryptoUtil.encrypt( sourceFile, targetFile, this.getPassword() );
- }
-
- /** Decrypt a text file */
- public void testEmptyTextDecryption() throws Exception
- {
- testEmptyTextEncryption();
- File sourceFile = new File( this.getTempDataDirectory(),
"empty.enc.txt" );
- File targetFile = new File( this.getTempDataDirectory(),
"empty.dec.txt" );
- CryptoUtil.decrypt( sourceFile, targetFile, this.getPassword() );
- }
-
- /** Encrypt a PDF file */
- public void testPdfEncryption() throws Exception
- {
- File sourceFile = new File( this.getTestDataDirectory(), "plain.pdf" );
- File targetFile = new File( this.getTempDataDirectory(),
"plain.enc.pdf" );
- CryptoUtil.encrypt( sourceFile, targetFile, this.getPassword() );
- }
-
- /** Decrypt a PDF file */
- public void testPdfDecryption() throws Exception
- {
- testPdfEncryption();
- File sourceFile = new File( this.getTempDataDirectory(),
"plain.enc.pdf" );
- File targetFile = new File( this.getTempDataDirectory(),
"plain.dec.pdf" );
- CryptoUtil.decrypt( sourceFile, targetFile, this.getPassword() );
- }
-
- /** Encrypt a ZIP file */
- public void testZipEncryption() throws Exception
- {
- File sourceFile = new File( this.getTestDataDirectory(), "plain.zip" );
- File targetFile = new File( this.getTempDataDirectory(),
"plain.enc.zip" );
- CryptoUtil.encrypt( sourceFile, targetFile, this.getPassword() );
- }
-
- /** Decrypt a ZIP file */
- public void testZipDecryption() throws Exception
- {
- testZipEncryption();
- File sourceFile = new File( this.getTempDataDirectory(),
"plain.enc.zip" );
- File targetFile = new File( this.getTempDataDirectory(),
"plain.dec.zip" );
- CryptoUtil.decrypt( sourceFile, targetFile, this.getPassword() );
- }
-
- /** Encrypt a UTF-16 XML file */
- public void testXmlUTF16Encryption() throws Exception
- {
- File sourceFile = new File( this.getTestDataDirectory(),
"plain-utf16.xml" );
- File targetFile = new File( this.getTempDataDirectory(),
"plain-utf16.enc.xml" );
- CryptoUtil.encrypt( sourceFile, targetFile, this.getPassword() );
- }
-
- /** Decrypt a UTF-16 XML file */
- public void testXMLUTF16Decryption() throws Exception
- {
- testXmlUTF16Encryption();
- File sourceFile = new File( this.getTempDataDirectory(),
"plain-utf16.enc.xml" );
- File targetFile = new File( this.getTempDataDirectory(),
"plain-utf16.dec.xml" );
- CryptoUtil.decrypt( sourceFile, targetFile, this.getPassword() );
- }
-
- /** Encrypt a UTF-8 XML file */
- public void testXmlUTF8Encryption() throws Exception
- {
- File sourceFile = new File( this.getTestDataDirectory(),
"plain-utf8.xml" );
- File targetFile = new File( this.getTempDataDirectory(),
"plain-utf8.enc.xml" );
- CryptoUtil.encrypt( sourceFile, targetFile, this.getPassword() );
- }
-
- /** Decrypt a UTF-8 XML file */
- public void testXMLUTF8Decryption() throws Exception
- {
- testXmlUTF8Encryption();
- File sourceFile = new File( this.getTempDataDirectory(),
"plain-utf8.enc.xml" );
- File targetFile = new File( this.getTempDataDirectory(),
"plain-utf8.dec.xml" );
- CryptoUtil.decrypt( sourceFile, targetFile, this.getPassword() );
- }
-
- /** Encrypt a ISO-8859-1 XML file */
- public void testXmlISO88591Encryption() throws Exception
- {
- File sourceFile = new File( this.getTestDataDirectory(),
"plain-iso-8859-1.xml" );
- File targetFile = new File( this.getTempDataDirectory(),
"plain-iso-8859-1.enc.xml" );
- CryptoUtil.encrypt( sourceFile, targetFile, this.getPassword() );
- }
-
- /** Decrypt a UTF-8 XML file */
- public void testXmlISO88591Decryption() throws Exception
- {
- testXmlISO88591Encryption();
- File sourceFile = new File( this.getTempDataDirectory(),
"plain-iso-8859-1.enc.xml" );
- File targetFile = new File( this.getTempDataDirectory(),
"plain-iso-8859-1.dec.xml" );
- CryptoUtil.decrypt( sourceFile, targetFile, this.getPassword() );
- }
- /** Test encryption and decryption of Strings */
- public void testStringEncryption() throws Exception
- {
- char[] testVector = new char[513];
-
- for( int i=0; i<testVector.length; i++ )
- {
- testVector[i] = (char) i;
- }
-
- String source = new String( testVector );
- String cipherText = CryptoUtil.encryptString( source,
this.getPassword() );
- String plainText = CryptoUtil.decryptString( cipherText,
this.getPassword() );
- assertEquals( source, plainText );
- }
-
- /** Test encryption and decryption of Strings */
- public void testStringHandling() throws Exception
- {
- String source = "Nobody knows the toubles I have seen ...";
- String cipherText = CryptoUtil.encryptString( source,
this.getPassword() );
- String plainText = CryptoUtil.decryptString( cipherText,
this.getPassword() );
- assertEquals( source, plainText );
- }
-
- /** Test encryption and decryption of binary data */
- public void testBinaryHandling() throws Exception
- {
- byte[] source = new byte[256];
- byte[] result = null;
-
- for( int i=0; i<source.length; i++ )
- {
- source[i] = (byte) i;
- }
-
- ByteArrayOutputStream cipherText = new ByteArrayOutputStream();
- ByteArrayOutputStream plainText = new ByteArrayOutputStream();
-
- CryptoUtil.encrypt( source, cipherText, this.getPassword() );
- CryptoUtil.decrypt( cipherText, plainText, this.getPassword() );
-
- result = plainText.toByteArray();
-
- for( int i=0; i<source.length; i++ )
- {
- if( source[i] != result[i] )
- {
- fail( "Binary data are different at position " + i );
- }
- }
- }
-
- /** Test creating a password */
- public void testPasswordFactory() throws Exception
- {
- char[] result = null;
- result = PasswordFactory.create();
- System.out.println( new String(result) );
- result = PasswordFactory.create( this.getPassword() );
- System.out.println( new String(result) );
- assertNotNull(result);
- return;
- }
-
- public void testHexConverter() throws Exception
- {
- String source = "DceuATAABWSaVTSIK";
- String hexString = HexConverter.toString( source.getBytes() );
- String result = new String( HexConverter.toBytes( hexString ) );
- assertEquals( source, result );
- }
-
- /** Test encryption and decryption of Strings */
- public void testPasswordEncryption() throws Exception
- {
- char[] password = "57cb-4a23-d838-45222".toCharArray();
- String source = "e02c-3b76-ff1e-5d9a1";
- String cipherText = CryptoUtil.encryptString( source, password );
- String plainText = CryptoUtil.decryptString( cipherText, password );
- assertEquals( source, plainText );
- }
+public class CryptoUtilTest extends TestCase {
+ /** the password to be used */
+ private String password;
+
+ /** the test data directory */
+ private File testDataDirectory;
+
+ /** the temp data director */
+ private File tempDataDirectory;
+
+ /**
+ * Constructor
+ *
+ * @param name the name of the test case
+ */
+ public CryptoUtilTest(String name) {
+ super(name);
+
+ this.password = "mysecret";
+ this.testDataDirectory = new File("./src/test/data");
+ this.tempDataDirectory = new File("./target/temp");
+ this.tempDataDirectory.mkdirs();
+ }
+
+ /**
+ * @see junit.framework.TestCase#setUp() byte[] salt, int count, String
+ * algorithm, String providerName )
+ *
+ * @throws Exception Generic exception
+ */
+ protected void setUp() throws Exception {
+ CryptoStreamFactoryImpl factory = new
CryptoStreamFactoryImpl(CryptoParameters.SALT, CryptoParameters.COUNT);
+
+ CryptoStreamFactoryImpl.setInstance(factory);
+ }
+
+ /**
+ * @return Returns the password.
+ */
+ protected char[] getPassword() {
+ return password.toCharArray();
+ }
+
+ /**
+ * @return Returns the tempDataDirectory.
+ */
+ protected File getTempDataDirectory() {
+ return tempDataDirectory;
+ }
+
+ /**
+ * @return Returns the testDataDirectory.
+ */
+ protected File getTestDataDirectory() {
+ return testDataDirectory;
+ }
+
+ /** Encrypt a text file
+ * @throws Exception Generic exception
+ */
+ public void testTextEncryption() throws Exception {
+ File sourceFile = new File(this.getTestDataDirectory(),
"plain.txt");
+ File targetFile = new File(this.getTempDataDirectory(),
"plain.enc.txt");
+ CryptoUtil.encrypt(sourceFile, targetFile, this.getPassword());
+ }
+
+ /** Decrypt a text file
+ * @throws Exception Generic exception
+ */
+ public void testTextDecryption() throws Exception {
+ testTextEncryption();
+ File sourceFile = new File(this.getTempDataDirectory(),
"plain.enc.txt");
+ File targetFile = new File(this.getTempDataDirectory(),
"plain.dec.txt");
+ CryptoUtil.decrypt(sourceFile, targetFile.getAbsolutePath(),
this.getPassword());
+ }
+
+ /** Encrypt an empty text file
+ *
+ * @throws Exception Generic exception
+ */
+ public void testEmptyTextEncryption() throws Exception {
+ File sourceFile = new File(this.getTestDataDirectory(),
"empty.txt");
+ File targetFile = new File(this.getTempDataDirectory(),
"empty.enc.txt");
+ CryptoUtil.encrypt(sourceFile, targetFile, this.getPassword());
+ }
+
+ /** Decrypt a text file
+ * @throws Exception Generic exception
+ */
+ public void testEmptyTextDecryption() throws Exception {
+ testEmptyTextEncryption();
+ File sourceFile = new File(this.getTempDataDirectory(),
"empty.enc.txt");
+ File targetFile = new File(this.getTempDataDirectory(),
"empty.dec.txt");
+ CryptoUtil.decrypt(sourceFile, targetFile, this.getPassword());
+ }
+
+ /** Encrypt a PDF file
+ *
+ * @throws Exception Generic exception
+ */
+ public void testPdfEncryption() throws Exception {
+ File sourceFile = new File(this.getTestDataDirectory(),
"plain.pdf");
+ File targetFile = new File(this.getTempDataDirectory(),
"plain.enc.pdf");
+ CryptoUtil.encrypt(sourceFile, targetFile, this.getPassword());
+ }
+
+ /** Decrypt a PDF file
+ *
+ * @throws Exception Generic exception
+ */
+ public void testPdfDecryption() throws Exception {
+ testPdfEncryption();
+ File sourceFile = new File(this.getTempDataDirectory(),
"plain.enc.pdf");
+ File targetFile = new File(this.getTempDataDirectory(),
"plain.dec.pdf");
+ CryptoUtil.decrypt(sourceFile, targetFile, this.getPassword());
+ }
+
+ /** Encrypt a ZIP file
+ *
+ * @throws Exception Generic exception
+ */
+ public void testZipEncryption() throws Exception {
+ File sourceFile = new File(this.getTestDataDirectory(),
"plain.zip");
+ File targetFile = new File(this.getTempDataDirectory(),
"plain.enc.zip");
+ CryptoUtil.encrypt(sourceFile, targetFile, this.getPassword());
+ }
+
+ /** Decrypt a ZIP file
+ *
+ * @throws Exception Generic exception
+ */
+ public void testZipDecryption() throws Exception {
+ testZipEncryption();
+ File sourceFile = new File(this.getTempDataDirectory(),
"plain.enc.zip");
+ File targetFile = new File(this.getTempDataDirectory(),
"plain.dec.zip");
+ CryptoUtil.decrypt(sourceFile, targetFile, this.getPassword());
+ }
+
+ /** Encrypt a UTF-16 XML file
+ *
+ * @throws Exception Generic exception
+ */
+ public void testXmlUTF16Encryption() throws Exception {
+ File sourceFile = new File(this.getTestDataDirectory(),
"plain-utf16.xml");
+ File targetFile = new File(this.getTempDataDirectory(),
"plain-utf16.enc.xml");
+ CryptoUtil.encrypt(sourceFile, targetFile, this.getPassword());
+ }
+
+ /**
+ * Decrypt a UTF-16 XML file
+ *
+ * @throws Exception Generic exception
+ */
+ public void testXMLUTF16Decryption() throws Exception {
+ testXmlUTF16Encryption();
+ File sourceFile = new File(this.getTempDataDirectory(),
"plain-utf16.enc.xml");
+ File targetFile = new File(this.getTempDataDirectory(),
"plain-utf16.dec.xml");
+ CryptoUtil.decrypt(sourceFile, targetFile, this.getPassword());
+ }
+
+ /**
+ * Encrypt a UTF-8 XML file
+ *
+ * @throws Exception Generic exception
+ */
+ public void testXmlUTF8Encryption() throws Exception {
+ File sourceFile = new File(this.getTestDataDirectory(),
"plain-utf8.xml");
+ File targetFile = new File(this.getTempDataDirectory(),
"plain-utf8.enc.xml");
+ CryptoUtil.encrypt(sourceFile, targetFile, this.getPassword());
+ }
+
+ /**
+ * Decrypt a UTF-8 XML file
+ *
+ * @throws Exception Generic exception
+ */
+ public void testXMLUTF8Decryption() throws Exception {
+ testXmlUTF8Encryption();
+ File sourceFile = new File(this.getTempDataDirectory(),
"plain-utf8.enc.xml");
+ File targetFile = new File(this.getTempDataDirectory(),
"plain-utf8.dec.xml");
+ CryptoUtil.decrypt(sourceFile, targetFile, this.getPassword());
+ }
+
+ /**
+ * Encrypt a ISO-8859-1 XML file
+ *
+ * @throws Exception Generic exception
+ */
+ public void testXmlISO88591Encryption() throws Exception {
+ File sourceFile = new File(this.getTestDataDirectory(),
"plain-iso-8859-1.xml");
+ File targetFile = new File(this.getTempDataDirectory(),
"plain-iso-8859-1.enc.xml");
+ CryptoUtil.encrypt(sourceFile, targetFile, this.getPassword());
+ }
+
+ /**
+ * Decrypt a ISO-8859-1 XML file
+ *
+ * @throws Exception Generic exception
+ */
+ public void testXmlISO88591Decryption() throws Exception {
+ testXmlISO88591Encryption();
+ File sourceFile = new File(this.getTempDataDirectory(),
"plain-iso-8859-1.enc.xml");
+ File targetFile = new File(this.getTempDataDirectory(),
"plain-iso-8859-1.dec.xml");
+ CryptoUtil.decrypt(sourceFile, targetFile, this.getPassword());
+ }
+
+ /** Test encryption and decryption of Strings
+ *
+ * @throws Exception Generic exception
+ */
+ public void testStringEncryption() throws Exception {
+ char[] testVector = new char[513];
+
+ for (int i = 0; i < testVector.length; i++) {
+ testVector[i] = (char) i;
+ }
+
+ String source = new String(testVector);
+ String cipherText = CryptoUtil.encryptString(source,
this.getPassword());
+ String plainText = CryptoUtil.decryptString(cipherText,
this.getPassword());
+ assertEquals(source, plainText);
+ }
+
+ /** Test encryption and decryption of Strings
+ * @throws Exception Generic exception
+ */
+ public void testStringHandling() throws Exception {
+ String source = "Nobody knows the toubles I have seen ...";
+ String cipherText = CryptoUtil.encryptString(source,
this.getPassword());
+ String plainText = CryptoUtil.decryptString(cipherText,
this.getPassword());
+ assertEquals(source, plainText);
+ }
+
+ /** Test encryption and decryption of binary data
+ * @throws Exception Generic exception
+ */
+ public void testBinaryHandling() throws Exception {
+ byte[] source = new byte[256];
+ byte[] result = null;
+
+ for (int i = 0; i < source.length; i++) {
+ source[i] = (byte) i;
+ }
+
+ ByteArrayOutputStream cipherText = new ByteArrayOutputStream();
+ ByteArrayOutputStream plainText = new ByteArrayOutputStream();
+
+ CryptoUtil.encrypt(source, cipherText, this.getPassword());
+ CryptoUtil.decrypt(cipherText, plainText, this.getPassword());
+
+ result = plainText.toByteArray();
+
+ for (int i = 0; i < source.length; i++) {
+ if (source[i] != result[i]) {
+ fail("Binary data are different at position " +
i);
+ }
+ }
+ }
+
+ /** Test creating a password
+ * @throws Exception Generic exception
+ */
+ public void testPasswordFactory() throws Exception {
+ char[] result = null;
+ result = PasswordFactory.create();
+ System.out.println(new String(result));
+ result = PasswordFactory.create(this.getPassword());
+ System.out.println(new String(result));
+ assertNotNull(result);
+ return;
+ }
+
+ /** Test the hex converter
+ * @throws Exception Generic exception
+ */
+ public void testHexConverter() throws Exception {
+ String source = "DceuATAABWSaVTSIK";
+ String hexString = HexConverter.toString(source.getBytes());
+ String result = new String(HexConverter.toBytes(hexString));
+ assertEquals(source, result);
+ }
+
+ /** Test encryption and decryption of Strings
+ * @throws Exception Generic exception
+ */
+ public void testPasswordEncryption() throws Exception {
+ char[] password = "57cb-4a23-d838-45222".toCharArray();
+ String source = "e02c-3b76-ff1e-5d9a1";
+ String cipherText = CryptoUtil.encryptString(source, password);
+ String plainText = CryptoUtil.decryptString(cipherText,
password);
+ assertEquals(source, plainText);
+ }
}
