aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorLibravatarLibravatar william <william@25thandclement.com> 2015-03-04 18:55:15 -0800
committerLibravatarLibravatar william <william@25thandclement.com> 2015-03-04 18:55:15 -0800
commitc20f5535ccd9554390a2d0d71d4eb1fb4c104e7b (patch)
treed127a00fbd82a74b8f4bf3e30970a1e8042e56f7 /doc
parent040bfbcb57ef45f039c8ecff6a47277d33c295f3 (diff)
downloadluaossl-c20f5535ccd9554390a2d0d71d4eb1fb4c104e7b.tar.gz
luaossl-c20f5535ccd9554390a2d0d71d4eb1fb4c104e7b.tar.bz2
luaossl-c20f5535ccd9554390a2d0d71d4eb1fb4c104e7b.zip
update documentation
Diffstat (limited to 'doc')
-rw-r--r--doc/luaossl.pdfbin282537 -> 283945 bytes
-rw-r--r--doc/luaossl.tex16
2 files changed, 14 insertions, 2 deletions
diff --git a/doc/luaossl.pdf b/doc/luaossl.pdf
index 4237910..3ec6d7e 100644
--- a/doc/luaossl.pdf
+++ b/doc/luaossl.pdf
Binary files differ
diff --git a/doc/luaossl.tex b/doc/luaossl.tex
index 2302e3a..f993961 100644
--- a/doc/luaossl.tex
+++ b/doc/luaossl.tex
@@ -747,8 +747,8 @@ name & \href{https://www.openssl.org/docs/ssl/SSL_CTX_set_options.html}{descript
\small{\texttt{OP\_NO\_SSLv2}} & Do not use the SSLv2 protocol. \\
\small{\texttt{OP\_NO\_SSLv3}} & Do not use the SSLv3 protocol. \\
\small{\texttt{OP\_NO\_TLSv1}} & Do not use the TLSv1.0 protocol. \\
-\small{\texttt{OP\_NO\_TLSv1\_2}} & Do not use the TLSv1.1 protocol. \\
-\small{\texttt{OP\_NO\_TLSv1\_1}} & Do not use the TLSv1.2 protocol. \\
+\small{\texttt{OP\_NO\_TLSv1\_2}} & Do not use the TLSv1.2 protocol. \\
+\small{\texttt{OP\_NO\_TLSv1\_1}} & Do not use the TLSv1.1 protocol. \\
\small{\texttt{OP\_NETSCAPE\_CA\_DN\_BUG}} & $\ldots$ \\
\small{\texttt{OP\_NETSCAPE\_DEMO\_CIPHER\_CHANGE\_BUG}} & $\ldots$ \\
\small{\texttt{OP\_CRYPTOPRO\_TLSEXT\_BUG}} & $\ldots$ \\
@@ -801,6 +801,12 @@ Sets \module{openssl.pkey} object $key$ as the ephemeral key during key exchange
\emph{In addition, to attain Perfect Forward Secrecy the options \texttt{OP\_SINGLE\_DH\_USE} and \texttt{OP\_SINGLE\_ECDH\_USE} must be set so that OpenSSL discards and regenerates the secret keying parameters for each key exchange.}
+\subsubsection[\fn{context:setAlpnProtos}]{\fn{context:setAlpnProtos($table$)}}
+
+Sets the advertised ALPN protocols. $table$ is an array of protocol string identifiers.
+
+\emph{Only supported since OpenSSL 1.0.2.}
+
\end{Module}
@@ -876,6 +882,12 @@ TLS1\_2\_VERSION & 16-bit TLSv1.2 identifier (0x0303). \\
Returns the SSL/TLS version supported by the client, which should be greater than or equal to the negotiated version. See \fn{ssl:getVersion}.
+\subsubsection[\fn{ssl:getAlpnSelected}]{\fn{ssl:getAlpnSelected()}}
+
+Returns the negotiated ALPN protocol as a string.
+
+\emph{Only supported since OpenSSL 1.0.2.}
+
\end{Module}