Skip to content

Commit

Permalink
Formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
peterdettman committed Sep 16, 2013
1 parent 79a84d1 commit 4cf9d80
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
public class DefaultTlsCipherFactory
extends AbstractTlsCipherFactory
{

public TlsCipher createCipher(TlsContext context, int encryptionAlgorithm, int macAlgorithm)
throws IOException
{
Expand Down Expand Up @@ -89,8 +88,7 @@ protected TlsAEADCipher createCipher_AES_GCM(TlsContext context, int cipherKeySi
createAEADBlockCipher_AES_GCM(), cipherKeySize, macSize);
}

protected TlsBlockCipher createCamelliaCipher(TlsContext context, int cipherKeySize,
int macAlgorithm)
protected TlsBlockCipher createCamelliaCipher(TlsContext context, int cipherKeySize, int macAlgorithm)
throws IOException
{
return new TlsBlockCipher(context, createCamelliaBlockCipher(),
Expand All @@ -105,8 +103,7 @@ protected TlsNullCipher createNullCipher(TlsContext context, int macAlgorithm)
createHMACDigest(macAlgorithm));
}

protected TlsStreamCipher createRC4Cipher(TlsContext context, int cipherKeySize,
int macAlgorithm)
protected TlsStreamCipher createRC4Cipher(TlsContext context, int cipherKeySize, int macAlgorithm)
throws IOException
{
return new TlsStreamCipher(context, createRC4StreamCipher(), createRC4StreamCipher(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,9 @@
public class TlsProtocolTest
extends TestCase
{

public void testClientServer()
throws Exception
{

SecureRandom secureRandom = new SecureRandom();

PipedInputStream clientRead = new PipedInputStream();
Expand Down Expand Up @@ -87,7 +85,6 @@ public void run()
static class MyTlsClient
extends DefaultTlsClient
{

public void notifyAlertRaised(short alertLevel, short alertDescription, String message, Exception cause)
{
PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
Expand Down Expand Up @@ -154,7 +151,6 @@ public TlsCredentials getClientCredentials(CertificateRequest certificateRequest
static class MyTlsServer
extends DefaultTlsServer
{

public void notifyAlertRaised(short alertLevel, short alertDescription, String message, Exception cause)
{
PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
Expand Down

0 comments on commit 4cf9d80

Please sign in to comment.