From: Jean-Marc Pigeon (Delson) Date: Sat, 3 May 2025 18:36:33 +0000 (-0400) Subject: client TLS seems to be working fine X-Git-Tag: tag-0.7~9 X-Git-Url: https://jmp-git.ovh.safe.ca/?a=commitdiff_plain;h=3ad5162de086106817071c43d3c0b7366915e291;p=jmp%2Fmailleur client TLS seems to be working fine --- diff --git a/data-tst/feed00.tst b/data-tst/feed00.tst index 3a0d4ca..56be703 100644 --- a/data-tst/feed00.tst +++ b/data-tst/feed00.tst @@ -21,7 +21,7 @@ R:250-ENHANCEDSTATUSCODES R:250-AUTH PLAIN LOGIN R:250 HELP C:GOTLS -R:250 HELP +R:250 Link now encryp... #send a empty ehlo S:EHLO R:501 5.5.4 syntax error (domain part missing), closing connection. diff --git a/lib/devsoc.c b/lib/devsoc.c index 8ed19e4..4c6ebf0 100644 --- a/lib/devsoc.c +++ b/lib/devsoc.c @@ -905,9 +905,9 @@ register int status; sigset_t origmask; SOCTYP *soc; -status=-1; +status=-2; soc=(SOCTYP *)socptr; -if (soc!=(SOCTYP *)0) { +if ((soc!=(SOCTYP *)0)&&(isconnected(soc)==true)) { struct pollfd polling[1]; polling[0].events=POLLIN|POLLPRI|POLLHUP; @@ -933,10 +933,6 @@ if (soc!=(SOCTYP *)0) { break; case 1 : //polling early return (data or event) (void) rou_alert(0,"%s JMPDBG Polling return",OPEP); - status=-2; //wlets say it is disconnected - if (isconnected(soc)==true) - status=soc_receive(socptr); - (void) rou_alert(0,"%s JMPDBG Polling return new status='%d'",OPEP,status); break; default : break; @@ -1398,7 +1394,8 @@ if ((soc!=(SOCTYP *)0)&&(soc->modtls==false)) { soc->tls=tls_opentls(soc->handle,true); break; case false : - (void) rou_alert(0,"%s JMPDBG starting cleint mode",OPEP); + soc->tls=tls_opentls(soc->handle,false); + (void) rou_alert(0,"%s JMPDBG starting client mode",OPEP); break; } if (soc->tls!=(TLSTYP *)0) { diff --git a/lib/unitls.c b/lib/unitls.c index 26bfbfa..b7e16e8 100644 --- a/lib/unitls.c +++ b/lib/unitls.c @@ -433,6 +433,7 @@ while (proceed==true) { switch (server) { case false : //mode client (void) rou_alert(0,"%s JMPDBG should be in client mode",OPEP); + (void) SSL_set_connect_state(tls->ssl); break; case true : //mode server (void) SSL_set_accept_state(tls->ssl);