Rename JSSE extension classes

tls/src/main/java/org/bouncycastle/jsse/BcSSLConnection.java → tls/src/main/java/org/bouncycastle/jsse/BCSSLConnection.java

@@ -5,7 +5,7 @@
 /**
  * A BCJSSE-specific interface providing access to extended connection-specific functionality.
  */
-public interface BcSSLConnection
+public interface BCSSLConnection
 {
     /**
      * Request TLS Channel Bindings for this connection. See <a href="">RFC 5929</a> for details.

tls/src/main/java/org/bouncycastle/jsse/BcSSLEngine.java → tls/src/main/java/org/bouncycastle/jsse/BCSSLEngine.java

@@ -4,14 +4,14 @@
  * A BCJSSE-specific interface to expose extended functionality on {@link SSLEngine}
  * implementations.
  */
-public interface BcSSLEngine
+public interface BCSSLEngine
 {
     /**
      * Returns an accessor for extended SSL connection data. Unlike BcSSLSocket.getSession() this
      * method does not block until handshaking is complete. Until the initial handshake has
      * completed, this method returns <c>null</c>.
      * 
-     * @return A {@link BcSSLConnection} instance.
+     * @return A {@link BCSSLConnection} instance.
      */
-    BcSSLConnection getConnection();
+    BCSSLConnection getConnection();
 }

tls/src/main/java/org/bouncycastle/jsse/BcSSLSocket.java → tls/src/main/java/org/bouncycastle/jsse/BCSSLSocket.java

@@ -4,14 +4,14 @@
  * A BCJSSE-specific interface to expose extended functionality on {@link SSLSocket}
  * implementations.
  */
-public interface BcSSLSocket
+public interface BCSSLSocket
 {
     /**
      * Returns an accessor for extended SSL connection data. This method will initiate the initial
      * handshake if necessary and then block until the handshake has been established. If an error
      * occurs during the initial handshake, this method returns <c>null</c>.
      * 
-     * @return A {@link BcSSLConnection} instance.
+     * @return A {@link BCSSLConnection} instance.
      */
-    BcSSLConnection getConnection();
+    BCSSLConnection getConnection();
 }

tls/src/main/java/org/bouncycastle/jsse/provider/ProvSSLConnection.java

@@ -2,12 +2,12 @@
 
 import javax.net.ssl.SSLSession;
 
-import org.bouncycastle.jsse.BcSSLConnection;
+import org.bouncycastle.jsse.BCSSLConnection;
 import org.bouncycastle.tls.ChannelBinding;
 import org.bouncycastle.tls.TlsContext;
 
 class ProvSSLConnection
-    implements BcSSLConnection
+    implements BCSSLConnection
 {
     protected final TlsContext tlsContext;
     protected final SSLSession session; 

tls/src/main/java/org/bouncycastle/jsse/provider/ProvSSLEngine.java

@@ -14,8 +14,8 @@
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.X509TrustManager;
 
-import org.bouncycastle.jsse.BcSSLConnection;
-import org.bouncycastle.jsse.BcSSLEngine;
+import org.bouncycastle.jsse.BCSSLConnection;
+import org.bouncycastle.jsse.BCSSLEngine;
 import org.bouncycastle.tls.TlsClientProtocol;
 import org.bouncycastle.tls.TlsProtocol;
 import org.bouncycastle.tls.TlsServerProtocol;
@@ -26,7 +26,7 @@
  */
 class ProvSSLEngine
     extends SSLEngine
-    implements BcSSLEngine, ProvTlsManager
+    implements BCSSLEngine, ProvTlsManager
 {
     protected final ProvSSLContextSpi context;
     protected final ContextData contextData;
@@ -39,7 +39,7 @@ class ProvSSLEngine
     protected HandshakeStatus handshakeStatus = HandshakeStatus.NOT_HANDSHAKING; 
     protected TlsProtocol protocol = null;
     protected ProvTlsPeer protocolPeer = null;
-    protected BcSSLConnection connection = null;
+    protected BCSSLConnection connection = null;
     protected SSLSession handshakeSession = null;
 
     protected ProvSSLEngine(ProvSSLContextSpi context, ContextData contextData)
@@ -128,7 +128,7 @@ public synchronized void closeOutbound()
         throw new UnsupportedOperationException();
     }
 
-    public synchronized BcSSLConnection getConnection()
+    public synchronized BCSSLConnection getConnection()
     {
         return connection;
     }

tls/src/main/java/org/bouncycastle/jsse/provider/ProvSSLSocket.java

@@ -10,7 +10,7 @@
 import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSession;
 
-import org.bouncycastle.jsse.BcSSLConnection;
+import org.bouncycastle.jsse.BCSSLConnection;
 
 class ProvSSLSocket
     extends ProvSSLSocketBase
@@ -67,7 +67,7 @@ public synchronized void close() throws IOException
         super.close();
     }
 
-    public BcSSLConnection getConnection()
+    public BCSSLConnection getConnection()
     {
         return engine.getConnection();
     }

tls/src/main/java/org/bouncycastle/jsse/provider/ProvSSLSocketBase.java

@@ -12,11 +12,11 @@
 import javax.net.ssl.HandshakeCompletedListener;
 import javax.net.ssl.SSLSocket;
 
-import org.bouncycastle.jsse.BcSSLSocket;
+import org.bouncycastle.jsse.BCSSLSocket;
 
 abstract class ProvSSLSocketBase
     extends SSLSocket
-    implements BcSSLSocket
+    implements BCSSLSocket
 {
     protected final Set<HandshakeCompletedListenerAdapter> listeners = Collections.synchronizedSet(
         new HashSet<HandshakeCompletedListenerAdapter>());

tls/src/main/java/org/bouncycastle/jsse/provider/ProvSSLSocketDirect.java

@@ -12,7 +12,7 @@
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.X509TrustManager;
 
-import org.bouncycastle.jsse.BcSSLConnection;
+import org.bouncycastle.jsse.BCSSLConnection;
 import org.bouncycastle.tls.TlsClientProtocol;
 import org.bouncycastle.tls.TlsProtocol;
 import org.bouncycastle.tls.TlsServerProtocol;
@@ -34,7 +34,7 @@ class ProvSSLSocketDirect
     protected boolean initialHandshakeBegun = false;
     protected TlsProtocol protocol = null;
     protected ProvTlsPeer protocolPeer = null;
-    protected BcSSLConnection connection = null;
+    protected BCSSLConnection connection = null;
     protected SSLSession handshakeSession = null;
 
     protected ProvSSLSocketDirect(ProvSSLContextSpi context, ContextData contextData)
@@ -104,7 +104,7 @@ public synchronized void close() throws IOException
         super.close();
     }
 
-    public synchronized BcSSLConnection getConnection()
+    public synchronized BCSSLConnection getConnection()
     {
         try
         {
@@ -163,7 +163,7 @@ public OutputStream getOutputStream() throws IOException
     @Override
     public synchronized SSLSession getSession()
     {
-        BcSSLConnection connection = getConnection();
+        BCSSLConnection connection = getConnection();
 
         return connection == null ? ProvSSLSession.NULL_SESSION : connection.getSession();
     }

tls/src/test/java/org/bouncycastle/jsse/provider/test/TestUtils.java

@@ -57,8 +57,8 @@
 import org.bouncycastle.asn1.x509.V3TBSCertificateGenerator;
 import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jsse.BcSSLConnection;
-import org.bouncycastle.jsse.BcSSLSocket;
+import org.bouncycastle.jsse.BCSSLConnection;
+import org.bouncycastle.jsse.BCSSLSocket;
 
 /**
  * Test Utils
@@ -323,9 +323,9 @@ public static X509Certificate generateEndEntityCert(PublicKey entityKey, X500Nam
 
     public static byte[] getChannelBinding(SSLSocket s, String channelBinding)
     {
-        if (s instanceof BcSSLSocket)
+        if (s instanceof BCSSLSocket)
         {
-            BcSSLConnection connection = ((BcSSLSocket)s).getConnection();
+            BCSSLConnection connection = ((BCSSLSocket)s).getConnection();
             if (connection != null)
             {
                 return connection.getChannelBinding(channelBinding);