diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2013-03-20 15:49:14 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-09-18 13:46:02 +0100 |
| commit | acec5a6244b6e54b805a5f7512efc72e18cc693a (patch) | |
| tree | 458d6b2bb9b943545fd35762f063da7ce62eac45 /ssl/ssl_txt.c | |
| parent | 68039af3e7fbbdef1f8a801c9fe5399015c0e58d (diff) | |
Provisional DTLS 1.2 support.
Add correct flags for DTLS 1.2, update s_server and s_client to handle
DTLS 1.2 methods.
Currently no support for version negotiation: i.e. if client/server selects
DTLS 1.2 it is that or nothing.
(cherry picked from commit c3b344e36a088283731b4f65a70e85b100f55686)
Conflicts:
apps/s_server.c
Diffstat (limited to 'ssl/ssl_txt.c')
| -rw-r--r-- | ssl/ssl_txt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ssl/ssl_txt.c b/ssl/ssl_txt.c index 6479d52c0c..093d84076f 100644 --- a/ssl/ssl_txt.c +++ b/ssl/ssl_txt.c @@ -123,6 +123,8 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x) s="TLSv1"; else if (x->ssl_version == DTLS1_VERSION) s="DTLSv1"; + else if (x->ssl_version == DTLS1_2_VERSION) + s="DTLSv1.2"; else if (x->ssl_version == DTLS1_BAD_VER) s="DTLSv1-bad"; else |