From 22094368c2865dcfb6daf8366425212b721a4657 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 05 Feb 2009 17:42:14 +0000
Subject: [PATCH] Merge ASN1 branch to trunk
---
opends/src/server/org/opends/server/extensions/TLSCapableConnection.java | 21 ++-------------------
1 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/TLSCapableConnection.java b/opends/src/server/org/opends/server/extensions/TLSCapableConnection.java
index 9d72e00..c53ade0 100644
--- a/opends/src/server/org/opends/server/extensions/TLSCapableConnection.java
+++ b/opends/src/server/org/opends/server/extensions/TLSCapableConnection.java
@@ -55,7 +55,7 @@
* @return <CODE>true</CODE> if TLS is available on the underlying client
* connection, or <CODE>false</CODE> if it is not.
*/
- public boolean tlsProtectionAvailable(MessageBuilder unavailableReason);
+ public boolean isTLSAvailable(MessageBuilder unavailableReason);
@@ -69,27 +69,10 @@
* not be enabled and the underlying connection
* has been closed.
*/
- public void enableTLSConnectionSecurityProvider()
+ public void enableTLS()
throws DirectoryException;
-
- /**
- * Disables the TLS connection security provider on this client connection.
- * This must also eliminate any authentication that had been performed on the
- * client connection so that it is in an anonymous state. If a problem occurs
- * while attempting to revert the connection to a non-TLS-protected state,
- * then an exception must be thrown and the client connection must be
- * terminated.
- *
- * @throws DirectoryException If TLS protection cannot be reverted and the
- * underlying client connection has been closed.
- */
- public void disableTLSConnectionSecurityProvider()
- throws DirectoryException;
-
-
-
/**
* Sends a response to the client in the clear rather than through the
* encrypted channel. This should only be used when processing the StartTLS
--
Gitblit v1.10.0