TLS connexion seems to be working (even smtps link)

diff --git a/Makefile b/Makefile
index 0b5df99f9faa98cfdf814ee07a196cc4f758dccc..0fc6095453d17848ea1315670a23ba0a0df19ecc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,7 @@ TESTDIR       =       $(CURDIR)/test_area
 TESTSRV        =       mailleur.example.com
 TESTIP =       127.127.10.25
 TESTPORT=      1025
+#TESTPROT=     smtps
 EXTIP  =       safemail3.safe.ca
 EXTPORT =      25
 TESTITER=      3
@@ -86,11 +87,11 @@ xxx :
                @ clear
                @ openssl s_client                      \
                        -crlf                           \
+                       --showcerts                     \
                        -key certs/localhost_key.pem    \
                        -cert certs/localhost_cert.pem  \
                        -CAfile certs/safe_CA.pem       \
-                       -starttls smtp                  \
-                       -connect $(TESTSRV):$(TESTPORT) 
+                       -connect $(TESTSRV):1025
 
 #                      -showcerts                      
 #                      -connect mailprod1.safe.ca:25
@@ -116,7 +117,7 @@ tlsref:
 EMLPAR =                                               \
           -r $(TESTDIR)                                \
           -d 3                                         \
-          :$(TESTIP):$(TESTPORT):
+          $(TESTPROT):$(TESTIP):$(TESTPORT):
 
 onercvr        :  debug
           @ echo "starting $@"

diff --git a/lib/devsoc.c b/lib/devsoc.c
index 2766eaab0c70ae73aef2e0b8e320b08b5e638f04..1d4eb39246e3205ea0af992cc8a4d53b2f9e21a5 100644 (file)
--- a/lib/devsoc.c
+++ b/lib/devsoc.c
@@ -1392,7 +1392,7 @@ if ((soc!=(SOCTYP *)0)&&(soc->modtls==false)) {
   if ((soc->tls=tls_opentls(soc->handle,true))!=(TLSTYP *)0) {
     soc->proto=pro_smtps;
     soc->modtls=true;
-    //(void) socpurge(soc,peerip);
+    (void) socpurge(soc,peerip);
     ok=true;
     }
   peerip=rou_freestr(peerip);

diff --git a/lib/subrou.c b/lib/subrou.c
index 7c7567887a2a05f703ea87aae1acc9adee4cfad2..3ef608ce3936396e93fd4707507eb16349b197e6 100644 (file)
--- a/lib/subrou.c
+++ b/lib/subrou.c
@@ -21,7 +21,7 @@
 
 //version definition 
 #define VERSION "0.6"
-#define RELEASE "49"
+#define RELEASE "50"
 #define BRANCH "dvl"
 
 //Public variables