feed00.tst seems to be working fine

diff --git a/data-tst/feed00.tst b/data-tst/feed00.tst
index 56be703301aec158ffe6117cb94b936e1948b79c..c68c2c5dda9a08c6b4b21be639a76212045b7445 100644 (file)
--- a/data-tst/feed00.tst
+++ b/data-tst/feed00.tst
@@ -14,14 +14,22 @@ R:220 mailleur.example.com ESMTP (cleartext) emlrcvr...
 S:EHLO example.com
 R:250-mailleur.example.com, link (cleartext) ready, your IP/FQDN=[127.0.0.1/localhost.localdomain]
 R:250-SIZE 52428800
-R:250-ORGN
 R:250-STARTTLS
 R:250-8BITMIME
 R:250-ENHANCEDSTATUSCODES
 R:250-AUTH PLAIN LOGIN
+R:250-ORGN
 R:250 HELP
 C:GOTLS
 R:250 Link now encryp...
+S:EHLO example.com
+R:250-mailleur.example.com, link (crypted) ready, your IP/FQDN=[127.0.0.1/localhost.localdomain]
+R:250-SIZE 52428800
+R:250-8BITMIME
+R:250-ENHANCEDSTATUSCODES
+R:250-AUTH PLAIN LOGIN
+R:250-ORGN
+R:250 HELP
 #send a empty ehlo
 S:EHLO
 R:501 5.5.4 syntax error (domain part missing), closing connection.

diff --git a/lib/lvleml.c b/lib/lvleml.c
index d7a2e07760ebe1ff1504094edb005a06aaa63d73..95c6f5e9f0a3b5b2d9a305a1749561deaef682bf 100644 (file)
--- a/lib/lvleml.c
+++ b/lib/lvleml.c
@@ -206,13 +206,13 @@ static _Bool doehlo(CONTYP *contact,char *parameter)
 
 {
 static char *ehlostr[]= {
-#ifdef  MODEDEBUG
-        "-ORGN",        //specific command to change ORIGIN IP
-#endif
         "-STARTTLS",
         "-8BITMIME",
         "-ENHANCEDSTATUSCODES",
         "-AUTH PLAIN LOGIN",
+#ifdef  MODEDEBUG
+        "-ORGN",        //specific command to change ORIGIN IP
+#endif
         " HELP",
         (char *)0
         };

diff --git a/lib/unitls.c b/lib/unitls.c
index ffe6bfabefbcad54c546945a1d2c06bd253ccf9d..99415d0022cb882a9e0f3eb60a7cbd78a5cff11c 100644 (file)
--- a/lib/unitls.c
+++ b/lib/unitls.c
@@ -201,9 +201,11 @@ while (proceed==true) {
         }
       break;
     case 3      :       //verify management
-      (void) SSL_CTX_set_purpose(tls->ctx,X509_PURPOSE_ANY);
+      if (((mode&SSL_VERIFY_PEER)!=0)||(tls->server==false))
+        tls->checkpeer=true;
       (void) SSL_CTX_set_verify(tls->ctx,mode,(int(*)())0);
-      (void) SSL_CTX_set_verify_depth(tls->ctx,5);
+      (void) SSL_CTX_set_purpose(tls->ctx,X509_PURPOSE_ANY);
+      (void) SSL_CTX_set_verify_depth(tls->ctx,7);
       (void) SSL_CTX_set_options(tls->ctx,SSL_OP_ALL);
       if (SSL_CTX_set_cipher_list(tls->ctx,SSL_CIPHER_LIST)==0) {
         (void) showtlserror(tls,0,"No cipher list");
@@ -372,8 +374,6 @@ while (proceed==true) {
         }
       }
       break;
-    case 5      :       //display cipher used
-      break;
     default     :       //SAFE Guard
       proceed=false;
       break;