aboutsummaryrefslogtreecommitdiff
path: root/openssl/doc/ssl/SSL_get_version.pod
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-09-02 18:48:52 +0200
committermarha <marha@users.sourceforge.net>2014-09-02 18:48:52 +0200
commitdea8f13d8104872dec9243abe06f3d9e4c807ccd (patch)
treeb01e5b901eaca45f1e3aa2b6fddfd45ca271ee75 /openssl/doc/ssl/SSL_get_version.pod
parent3293021e6f582c7348667e7638941620134525e1 (diff)
parent04168ae281bfbd714ddf6b90d98eac892508dde8 (diff)
downloadvcxsrv-dea8f13d8104872dec9243abe06f3d9e4c807ccd.tar.gz
vcxsrv-dea8f13d8104872dec9243abe06f3d9e4c807ccd.tar.bz2
vcxsrv-dea8f13d8104872dec9243abe06f3d9e4c807ccd.zip
Merge remote-tracking branch 'origin/released'
Conflicts: openssl/Makefile openssl/crypto/opensslconf.h
Diffstat (limited to 'openssl/doc/ssl/SSL_get_version.pod')
-rw-r--r--openssl/doc/ssl/SSL_get_version.pod14
1 files changed, 11 insertions, 3 deletions
diff --git a/openssl/doc/ssl/SSL_get_version.pod b/openssl/doc/ssl/SSL_get_version.pod
index cc271db2c..9ae6f2550 100644
--- a/openssl/doc/ssl/SSL_get_version.pod
+++ b/openssl/doc/ssl/SSL_get_version.pod
@@ -12,12 +12,12 @@ SSL_get_version - get the protocol version of a connection.
=head1 DESCRIPTION
-SSL_get_cipher_version() returns the name of the protocol used for the
+SSL_get_version() returns the name of the protocol used for the
connection B<ssl>.
=head1 RETURN VALUES
-The following strings can occur:
+The following strings can be returned:
=over 4
@@ -31,7 +31,15 @@ The connection uses the SSLv3 protocol.
=item TLSv1
-The connection uses the TLSv1 protocol.
+The connection uses the TLSv1.0 protocol.
+
+=item TLSv1.1
+
+The connection uses the TLSv1.1 protocol.
+
+=item TLSv1.2
+
+The connection uses the TLSv1.2 protocol.
=item unknown