Author: toad Date: 2007-08-07 17:57:33 +0000 (Tue, 07 Aug 2007) New Revision: 14519
Modified: trunk/freenet/src/freenet/crypt/ciphers/Rijndael_Algorithm.java trunk/freenet/src/freenet/crypt/ciphers/Rijndael_Properties.java Log: Reduce crypto confusion a bit: 1) We NEVER EVER use Rijndael_Algorithm or Rijndael_Properties directly. We ALWAYS use them through Rijndael. So make them package-only. 2) We never use RA.makeKey because it assumes a 128-bit key. Modified: trunk/freenet/src/freenet/crypt/ciphers/Rijndael_Algorithm.java =================================================================== --- trunk/freenet/src/freenet/crypt/ciphers/Rijndael_Algorithm.java 2007-08-07 17:30:30 UTC (rev 14518) +++ trunk/freenet/src/freenet/crypt/ciphers/Rijndael_Algorithm.java 2007-08-07 17:57:33 UTC (rev 14519) @@ -25,7 +25,7 @@ * * License is apparently available from http://www.cryptix.org/docs/license.html */ -public final class Rijndael_Algorithm // implicit no-argument constructor +final class Rijndael_Algorithm // implicit no-argument constructor { // Debugging methods and variables // ........................................................................... @@ -293,17 +293,6 @@ // ........................................................................... /** - * Convenience method to expand a user-supplied key material into a - * session key, assuming Rijndael's default block size (128-bit). - * - * @param k The 128/192/256-bit user-key to use. - * @exception InvalidKeyException If the key is invalid. - */ - private static final Object makeKey (byte[] k) throws InvalidKeyException { - return makeKey(k, BLOCK_SIZE); - } - - /** * Convenience method to encrypt exactly one block of plaintext, assuming * Rijndael's default block size (128-bit). * Modified: trunk/freenet/src/freenet/crypt/ciphers/Rijndael_Properties.java =================================================================== --- trunk/freenet/src/freenet/crypt/ciphers/Rijndael_Properties.java 2007-08-07 17:30:30 UTC (rev 14518) +++ trunk/freenet/src/freenet/crypt/ciphers/Rijndael_Properties.java 2007-08-07 17:57:33 UTC (rev 14519) @@ -26,7 +26,7 @@ * @author Jill Baker * @author Raif S. Naffah */ -public class Rijndael_Properties // implicit no-argument constructor +class Rijndael_Properties // implicit no-argument constructor { // Constants and variables with relevant static code // ...........................................................................
