Author: markt
Date: Tue Feb 7 10:09:44 2012
New Revision: 1241407
URL: http://svn.apache.org/viewvc?rev=1241407&view=rev
Log:
Remove whitespace from the ends of the lines
Modified:
tomcat/trunk/java/org/apache/tomcat/jni/Poll.java
tomcat/trunk/java/org/apache/tomcat/jni/SSL.java
tomcat/trunk/java/org/apache/tomcat/jni/SSLExt.java
Modified: tomcat/trunk/java/org/apache/tomcat/jni/Poll.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Poll.java?rev=1241407&r1=1241406&r2=1241407&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/Poll.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Poll.java Tue Feb 7 10:09:44 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.tomcat.jni;
/** Poll
@@ -22,7 +21,6 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
* @version $Id$
*/
-
public class Poll {
/**
@@ -155,16 +153,16 @@ public class Poll {
public static native int pollset(long pollset, long [] descriptors);
/**
- * Make poll() return.
- *
+ * Make poll() return.
+ *
* @param pollset
* @return
*/
public static native int interrupt(long pollset);
-
+
/**
* Check if interrupt() is allowed.
- *
+ *
* @param pollset
* @return
*/
Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSL.java?rev=1241407&r1=1241406&r2=1241407&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/SSL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/SSL.java Tue Feb 7 10:09:44 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.tomcat.jni;
/** SSL
@@ -22,7 +21,6 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
* @version $Id$
*/
-
public final class SSL {
/*
@@ -137,7 +135,7 @@ public final class SSL {
public static final int SSL_OP_NO_SSLv3 =
0x02000000;
public static final int SSL_OP_NO_TLSv1 =
0x04000000;
public static final int SSL_OP_NO_TICKET =
0x00004000;
-
+
/* The next flag deliberately changes the ciphertest, this is a check
* for the PKCS#1 attack */
public static final int SSL_OP_PKCS1_CHECK_1 =
0x08000000;
Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSLExt.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSLExt.java?rev=1241407&r1=1241406&r2=1241407&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/SSLExt.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/SSLExt.java Tue Feb 7 10:09:44 2012
@@ -14,43 +14,42 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.tomcat.jni;
-/**
- * Support TLS extensions and extra methods.
- *
- * The methods are separated to make it easier for java code to
- * support existing native library - it can check if this class can
+/**
+ * Support TLS extensions and extra methods.
+ *
+ * The methods are separated to make it easier for java code to
+ * support existing native library - it can check if this class can
* be loaded in order to use the exensions.
*
* @author Costin Manolache
*/
public final class SSLExt {
-
+
/**
- * Set advertised NPN protocol.
+ * Set advertised NPN protocol.
* This is only available for recent or patched openssl.
- *
+ *
* Example: "\x06spdy/2"
- *
+ *
* Works with TLS1, doesn't with SSL2/SSL3
- *
- * Servers sends list in ServerHelo, client selects it and
+ *
+ * Servers sends list in ServerHelo, client selects it and
* sends it back after ChangeChipher
- *
+ *
* Not supported in 1.0.0, seems to be in 1.0.1 and after
*/
public static native int setNPN(long tcctx, byte[] proto, int len);
-
+
/**
- * Get other side's advertised protocols.
+ * Get other side's advertised protocols.
* Only works after handshake.
*/
public static native int getNPN(long tcsock, byte[] proto);
- /**
+ /**
* Enabling dump/debugging on the socket. Both raw and decrypted
* packets will be logged.
*/
@@ -61,15 +60,15 @@ public final class SSLExt {
* Must be saved, keyed by session ID.
*/
public static native byte[] getSessionData(long tcsock);
-
+
/**
* Server: Set the session data for a socket.
*/
public static native int setSessionData(long tcsock, byte[] data, int len);
-
-
+
+
// /**
-// * Client: get the ticket received from server, if tickets are
supported.
+// * Client: get the ticket received from server, if tickets are supported.
// */
// public static native int getTicket(long tcsock, byte[] resBuf);
//
@@ -78,12 +77,12 @@ public final class SSLExt {
// */
// public static native int setTicket(long tcsock, byte[] data, int len);
//
-// /**
+// /**
// * Set the key used by server to generate tickets.
// * Key must be 48 bytes.
// */
// public static native int setTicketKeys(long ctx, byte[] data, int len);
-//
+//
/**
* For client side calls. Data should be a \0 terminated string
*/
@@ -92,7 +91,7 @@ public final class SSLExt {
/* Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success
* when just a single record has been written): */
static final int SSL_MODE_ENABLE_PARTIAL_WRITE = 0x1;
-
+
/* Make it possible to retry SSL_write() with changed buffer location
* (buffer contents must stay the same!); this is not the default to avoid
* the misconception that non-blocking SSL_write() behaves like
@@ -104,9 +103,9 @@ public final class SSLExt {
/* Save RAM by releasing read and write buffers when they're empty. (SSL3
and
* TLS only.) "Released" buffers are put onto a free-list in the context
- * or just freed (depending on the context's setting for
freelist_max_len). */
+ * or just freed (depending on the context's setting for
freelist_max_len). */
static final int SSL_MODE_SMALL_BUFFERS = 0x10;
-
+
// 1.1
//static final int SSL_MODE_HANDSHAKE_CUTTHROUGH = ..;
@@ -121,11 +120,11 @@ public final class SSLExt {
} catch (Throwable t) {
t.printStackTrace();
return -1;
- }
+ }
}
-
+
/**
- * Higher level method, checking if the specified protocol has been
+ * Higher level method, checking if the specified protocol has been
* negotiated.
*/
public static boolean checkNPN(long tcsocket, byte[] expected) {
@@ -144,10 +143,10 @@ public final class SSLExt {
if (expected[i] != npn[i]) {
return false;
}
- }
+ }
return true;
}
-
-
-
+
+
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
