From: Jean-Marc Pigeon (Delson) Date: Mon, 7 Apr 2025 00:01:58 +0000 (-0400) Subject: TLS connexion seems to be working (even smtps link) X-Git-Tag: tag-0.7~25 X-Git-Url: https://jmp-git.ovh.safe.ca/?a=commitdiff_plain;h=ee7418d3653ec934206f2baaa234eb3624549a55;p=jmp%2Fmailleur TLS connexion seems to be working (even smtps link) --- diff --git a/Makefile b/Makefile index 0b5df99..0fc6095 100644 --- 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 2766eaa..1d4eb39 100644 --- 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 7c75678..3ef608c 100644 --- 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