From 38f5f428c43df6e90b82e278e260bd8109443d30 Mon Sep 17 00:00:00 2001
From: Lefteris Chatzimparmpas <lefcha@fastmail.net>
Date: Sat, 8 Jun 2013 11:06:28 +0200
Subject: [PATCH] Rename some of the values of the ssl variable.

---
 doc/imapfilter_config.5 | 10 +++++-----
 samples/config.lua      |  2 +-
 src/socket.c            |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/imapfilter_config.5 b/doc/imapfilter_config.5
index dc0488f..54ce450 100644
--- a/doc/imapfilter_config.5
+++ b/doc/imapfilter_config.5
@@ -201,7 +201,7 @@ myaccount = IMAP {
     server = 'imap.mail.server',
     username = 'me',
     password = 'secret',
-    ssl = 'ssl3'
+    ssl = 'ssl23'
 }
 .Ed
 .Pp
@@ -237,15 +237,15 @@ for imap and
 .Dq 993
 for imaps.
 .It Va ssl
-Forces an imaps connection and specifies the SSL/TLS protocol to be used.  It
-takes a
+Forces an imaps connection and specifies the SSL/TLS protocol/version to be
+used.  It takes a
 .Vt string
 as a value, specifically one of:
 .Dq ssl3 ,
 .Dq ssl23 ,
 .Dq tls1 ,
-.Dq tls11 ,
-.Dq tls12 .
+.Dq tls1.1 ,
+.Dq tls1.2 .
 .El
 .Pp
 .Ss LISTING
diff --git a/samples/config.lua b/samples/config.lua
index a4461c1..b388a00 100644
--- a/samples/config.lua
+++ b/samples/config.lua
@@ -24,7 +24,7 @@ account2 = IMAP {
     server = 'imap2.mail.server',
     username = 'user2',
     password = 'secret2',
-    ssl = 'ssl3',
+    ssl = 'ssl23',
 }
 
 -- Get a list of the available mailboxes and folders
diff --git a/src/socket.c b/src/socket.c
index 2f169c4..a22c12b 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -95,9 +95,9 @@ open_secure_connection(session *ssn)
 		ctx = ssl3ctx;
 	} else if (!strcasecmp(ssn->sslproto, "tls1")) {
 		ctx = tls1ctx;
-	} else if (!strcasecmp(ssn->sslproto, "tls11")) {
+	} else if (!strcasecmp(ssn->sslproto, "tls1.1")) {
 		ctx = tls11ctx;
-	} else if (!strcasecmp(ssn->sslproto, "tls12")) {
+	} else if (!strcasecmp(ssn->sslproto, "tls1.2")) {
 		ctx = tls12ctx;
 	} else {
 		ctx = ssl23ctx;