mirror of
				https://github.com/drwetter/testssl.sh.git
				synced 2025-11-02 23:05:26 +01:00 
			
		
		
		
	- FIX #218 for exim and friends
This commit is contained in:
		
							
								
								
									
										26
									
								
								testssl.sh
									
									
									
									
									
								
							
							
						
						
									
										26
									
								
								testssl.sh
									
									
									
									
									
								
							@@ -2438,12 +2438,24 @@ starttls_line() {
 | 
				
			|||||||
          if egrep -q "$2" $TMPFILE; then
 | 
					          if egrep -q "$2" $TMPFILE; then
 | 
				
			||||||
               debugme echo "---> reply matched \"$2\""
 | 
					               debugme echo "---> reply matched \"$2\""
 | 
				
			||||||
          else
 | 
					          else
 | 
				
			||||||
               debugme echo "---> reply didn't match \"$2\", see $TMPFILE"
 | 
					               # slow down for exim and friends who need a proper handshake:, see 
 | 
				
			||||||
               pr_magenta "STARTTLS handshake problem. "
 | 
					               # https://github.com/drwetter/testssl.sh/issues/218
 | 
				
			||||||
               outln "Either switch to native openssl (--ssl-native), "
 | 
					               FAST_STARTTLS=false
 | 
				
			||||||
               outln "   give the server more time to reply (STARTTLS_SLEEP=<seconds> ./testssh.sh ..) -- "
 | 
					               debugme echo -e "\n=== sending with automated FAST_STARTTLS=false \"$1\" ..."
 | 
				
			||||||
               outln "   or debug what happened (add --debug=2)"
 | 
					               echo -e "$1" >&5
 | 
				
			||||||
               exit -3
 | 
					               cat <&5 >$TMPFILE &
 | 
				
			||||||
 | 
					               debugme echo "... received result: "
 | 
				
			||||||
 | 
					               debugme cat $TMPFILE
 | 
				
			||||||
 | 
					               if [[ -n "$2" ]]; then
 | 
				
			||||||
 | 
					                    debugme echo "---> reply with automated FAST_STARTTLS=false matched \"$2\""
 | 
				
			||||||
 | 
					               else
 | 
				
			||||||
 | 
					                    debugme echo "---> reply didn't match \"$2\", see $TMPFILE"
 | 
				
			||||||
 | 
					                    pr_magenta "STARTTLS handshake problem. "
 | 
				
			||||||
 | 
					                    outln "Either switch to native openssl (--ssl-native), "
 | 
				
			||||||
 | 
					                    outln "   give the server more time to reply (STARTTLS_SLEEP=<seconds> ./testssh.sh ..) -- "
 | 
				
			||||||
 | 
					                    outln "   or debug what happened (add --debug=2)"
 | 
				
			||||||
 | 
					                    return 3
 | 
				
			||||||
 | 
					               fi
 | 
				
			||||||
          fi
 | 
					          fi
 | 
				
			||||||
     fi
 | 
					     fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -5239,4 +5251,4 @@ fi
 | 
				
			|||||||
exit $?
 | 
					exit $?
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#  $Id: testssl.sh,v 1.410 2015/10/15 12:15:06 dirkw Exp $
 | 
					#  $Id: testssl.sh,v 1.411 2015/10/15 13:14:36 dirkw Exp $
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user