diff --git a/src/java/com/wolfssl/WolfSSL.java b/src/java/com/wolfssl/WolfSSL.java index 993f6d6..52e0fe9 100644 --- a/src/java/com/wolfssl/WolfSSL.java +++ b/src/java/com/wolfssl/WolfSSL.java @@ -187,9 +187,13 @@ public class WolfSSL { public final static int WOLFSSL_OCSP_NO_NONCE = 2; /* ALPN definitions from ssl.h */ + /** ALPN: no match found */ public final static int WOLFSSL_ALPN_NO_MATCH = 0; + /** ALPN: found match */ public final static int WOLFSSL_ALPN_MATCH = 1; + /** ALPN: continue on protocol mismatch */ public final static int WOLFSSL_ALPN_CONTINUE_ON_MISMATCH = 2; + /** ALPN: failed on protocol mismatch */ public final static int WOLFSSL_ALPN_FAILED_ON_MISMATCH = 4; /* I/O callback default errors, pulled from wolfssl/ssl.h IOerrors */ diff --git a/src/java/com/wolfssl/provider/jsse/WolfSSLEngineHelper.java b/src/java/com/wolfssl/provider/jsse/WolfSSLEngineHelper.java index cc9e4df..3f10bbd 100644 --- a/src/java/com/wolfssl/provider/jsse/WolfSSLEngineHelper.java +++ b/src/java/com/wolfssl/provider/jsse/WolfSSLEngineHelper.java @@ -370,6 +370,12 @@ public class WolfSSLEngineHelper { return null; } + /** + * Get selected ALPN protocol string + * + * @return String representation of selected ALPN protocol or null + * if handshake has not finished + */ protected String getAlpnSelectedProtocolString() { if (ssl.handshakeDone()) { String proto = ssl.getAlpnSelectedString(); diff --git a/src/java/com/wolfssl/provider/jsse/adapter/WolfSSLJDK8Helper.java b/src/java/com/wolfssl/provider/jsse/adapter/WolfSSLJDK8Helper.java index 4a37f2d..24379c0 100644 --- a/src/java/com/wolfssl/provider/jsse/adapter/WolfSSLJDK8Helper.java +++ b/src/java/com/wolfssl/provider/jsse/adapter/WolfSSLJDK8Helper.java @@ -110,8 +110,14 @@ public class WolfSSLJDK8Helper } } - /* Call SSLParameters.setApplicationProtocols() to set ALPN protocols from - * WolfSSLParameters into SSLParameters */ + /** + * Call SSLParameters.setApplicationProtocols() to set ALPN protocols from + * WolfSSLParameters into SSLParameters. + * + * @param out output SSLParameters to store ALPN protocols into + * @param m method to invoke to set protocols + * @param in input WolfSSLParameters to read ALPN protocols from + */ protected static void setApplicationProtocols(final SSLParameters out, final Method m, WolfSSLParameters in) { @@ -137,8 +143,13 @@ public class WolfSSLJDK8Helper } } - /* Call SSLParameters.getApplicationProtocols() to get ALPN protocols from - * SSLParameters into WolfSSLParameters */ + /** + * Call SSLParameters.getApplicationProtocols() to get ALPN protocols from + * SSLParameters into WolfSSLParameters. + * + * @param in input SSLParameters to read ALPN protocols from + * @param out output WolfSSLParameters to store ALPN protocols into + */ protected static void getApplicationProtocols(final SSLParameters in, WolfSSLParameters out) {