From 1ac15f777875778b1c096fc6fa948a7062a7cff0 Mon Sep 17 00:00:00 2001 From: "Jean-Marc Pigeon (Delson)" Date: Thu, 19 Jun 2025 11:04:50 -0400 Subject: [PATCH] Checking about the "purge" TLS timing --- Makefile | 8 +++++--- conf/mailleur.conf.dvl | 2 +- lib/devsoc.c | 2 ++ lib/lvleml.c | 3 +-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index d24bc79..0c2a341 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,8 @@ tlsrcvr : -cert certs/localhost-cert.pem \ -key certs/localhost-key.pem \ -starttls smtp \ - -connect mailpostg.example.com:25 + -connect $(TESTSRV):$(TESTPORT) +# -connect mailpostg.example.com:25 go465 : @ clear @@ -112,7 +113,6 @@ go465 : # -showcerts # -tls1_2 # -connect mailpostg.example.com:25 -# -connect mailprod1.safe.ca:25 # -connect $(TESTSRV):$(TESTPORT) # -connect smtp.google.com:25 # -connect courriel.colba.net:25 @@ -121,11 +121,13 @@ go465 : tlsref: @ clear @ openssl s_client \ - -msg \ + -status \ -CAfile certs/root-safe_CA.pem \ -cert certs/localhost-cert.pem \ -key certs/localhost-key.pem \ + -starttls smtp \ -connect smtp.google.com:25 + #-------------------------------------------------------------------- #starting email receiver diff --git a/conf/mailleur.conf.dvl b/conf/mailleur.conf.dvl index 2af37e6..c3b73cb 100644 --- a/conf/mailleur.conf.dvl +++ b/conf/mailleur.conf.dvl @@ -21,7 +21,7 @@ DFLTDOMAIN = "example.com" CA_ROOT_SRV = "./certs/root-safe_CA.pem" CA_CERT_SRV = "./certs/mailleur_server-chain-cert_x509.pem" CA_KEY_SRV = "./certs/mailleur_server-key.pem" -CA_VERIFY_SRV = 1 #to check PEER/client remote certificate +CA_VERIFY_SRV = 0 #to check PEER/client remote certificate #------------------------------------------------ #Defining CLIENT mode Certificate data CA_ROOT_CLT = "./certs/root-safe_CA.pem" diff --git a/lib/devsoc.c b/lib/devsoc.c index d2073bf..b54a842 100644 --- a/lib/devsoc.c +++ b/lib/devsoc.c @@ -66,6 +66,7 @@ int count; max=1000; //purging for 1 seconde max; count=0; +/* for (;countcarin=0; soc->carpile[0]='\000'; @@ -74,6 +75,7 @@ for (;countcarin==0) //got no character break; } +*/ if (count>=max) //one second max! (void) rou_alert(0,"%s purge is too long with peer [%s]",OPEP,peerip); #undef OPEP diff --git a/lib/lvleml.c b/lib/lvleml.c index 6ddae4a..56ef932 100644 --- a/lib/lvleml.c +++ b/lib/lvleml.c @@ -592,8 +592,7 @@ static char *ehlostr[]= { "-STARTTLS", "-8BITMIME", "-ENHANCEDSTATUSCODES", - "-AUTH PLAIN LOGIN", - " HELP", + " AUTH PLAIN LOGIN", (char *)0 }; -- 2.47.3