Index: tests/info.csv ================================================================== --- tests/info.csv +++ tests/info.csv @@ -28,10 +28,12 @@ command,"proc exec_get_ciphers {} { set list [list] set data [exec openssl list -cipher-algorithms] foreach line [split $data ""\n""] { set line [string trim $line] + if {$line eq ""Legacy:""} continue + if {$line eq ""Provided:""} break foreach {cipher ptr alias} [split [string trim $line]] { lappend list [string tolower $cipher] } } return [lsort -unique $list] @@ -52,11 +54,12 @@ command,"proc exec_get_pkeys {} { set list [list] set data [exec openssl list -public-key-methods] foreach line [split $data ""\n""] { set line [string trim $line] - if {[string match ""Type:*"" $line]} continue + if {$line eq ""Legacy:"" || [string match ""Type:*"" $line]} continue + if {$line eq ""Provided:""} break lappend list [string trim $line] } return $list } ",,,,,,,,, @@ -69,11 +72,11 @@ return $result } ",,,,,,,,, ,,,,,,,,,, command,# Test list ciphers,,,,,,,,, -Ciphers List,All,,,lcompare [lsort [exec_get_ciphers]] [list_tolower [lsort [::tls::ciphers]]],,,missing {rc5 rc5-cbc rc5-cfb rc5-ecb rc5-ofb} unexpected {aes-128-ccm aes-128-gcm aes-192-ccm aes-192-gcm aes-256-ccm aes-256-gcm},,, +Ciphers List,All,,,lcompare [lsort [exec_get_ciphers]] [list_tolower [lsort [::tls::ciphers]]],,,missing {} unexpected {aes-128-ccm aes-128-gcm aes-192-ccm aes-192-gcm aes-256-ccm aes-256-gcm},,, ,,,,,,,,,, command,# Test list ciphers for protocols,,,,,,,,, Ciphers By Protocol,SSL2,ssl2,,"lcompare [exec_get "":"" ciphers -ssl2] [::tls::ciphers ssl2]",,,missing {} unexpected {},,, Ciphers By Protocol,SSL3,ssl3,,"lcompare [exec_get "":"" ciphers -ssl3] [::tls::ciphers ssl3]",,,missing {} unexpected {},,, Ciphers By Protocol,TLS1.0,tls1,,"lcompare [exec_get "":"" ciphers -tls1] [::tls::ciphers tls1]",,,missing {} unexpected {},,, Index: tests/info.test ================================================================== --- tests/info.test +++ tests/info.test @@ -37,10 +37,12 @@ proc exec_get_ciphers {} { set list [list] set data [exec openssl list -cipher-algorithms] foreach line [split $data "\n"] { set line [string trim $line] + if {$line eq "Legacy:"} continue + if {$line eq "Provided:"} break foreach {cipher ptr alias} [split [string trim $line]] { lappend list [string tolower $cipher] } } return [lsort -unique $list] @@ -61,11 +63,12 @@ proc exec_get_pkeys {} { set list [list] set data [exec openssl list -public-key-methods] foreach line [split $data "\n"] { set line [string trim $line] - if {[string match "Type:*" $line]} continue + if {$line eq "Legacy:" || [string match "Type:*" $line]} continue + if {$line eq "Provided:"} break lappend list [string trim $line] } return $list } @@ -82,11 +85,11 @@ # Test list ciphers test Ciphers_List-1.1 {All} -body { lcompare [lsort [exec_get_ciphers]] [list_tolower [lsort [::tls::ciphers]]] - } -result {missing {rc5 rc5-cbc rc5-cfb rc5-ecb rc5-ofb} unexpected {aes-128-ccm aes-128-gcm aes-192-ccm aes-192-gcm aes-256-ccm aes-256-gcm}} + } -result {missing {} unexpected {aes-128-ccm aes-128-gcm aes-192-ccm aes-192-gcm aes-256-ccm aes-256-gcm}} # Test list ciphers for protocols test Ciphers_By_Protocol-2.1 {SSL2} -constraints {ssl2} -body {