Index: tests/ciphers.test
==================================================================
--- tests/ciphers.test
+++ tests/ciphers.test
@@ -19,12 +19,12 @@
 package require tls
 
 # One of these should == 1, depending on what type of ssl library
 # tls was compiled against. (RSA BSAFE SSL-C or OpenSSL).
 #
-set ::tcltest::testConstraints(rsabsafe) 1
-set ::tcltest::testConstraints(openssl) 0
+set ::tcltest::testConstraints(rsabsafe) 0
+set ::tcltest::testConstraints(openssl) 1
 
 test ciphers-1.1 {Tls::ciphers for ssl3} {rsabsafe} {
     # This will fail if you compiled against OpenSSL.
     # Change the constraint setting above.
     set result [join [eval tls::ciphers ssl3] \n ]
@@ -69,48 +69,66 @@
 EXP-DES-CBC-SHA
 EXP-RC2-CBC-MD5
 EXP-RC4-MD5}
 
 test ciphers-1.3 {Tls::ciphers for ssl3} {openssl} {
-    # This will fail if you compiled against RSA bsafe.
+    # This will fail if you compiled against RSA bsafe or with a
+    # different set of defines than the default.
     # Change the constraint setting above.
-    set result [join [eval tls::ciphers ssl3] \n ]
-} {EDH-RSA-DES-CBC3-SHA
+    set result [join [lsort -dict [eval tls::ciphers ssl3]] \n ]
+} [join [lsort -dict {EDH-RSA-DES-CBC3-SHA
 EDH-DSS-DES-CBC3-SHA
 DES-CBC3-SHA
+DHE-DSS-RC4-SHA
+IDEA-CBC-SHA
 RC4-SHA
 RC4-MD5
+EXP1024-DHE-DSS-RC4-SHA
+EXP1024-RC4-SHA
+EXP1024-DHE-DSS-DES-CBC-SHA
+EXP1024-DES-CBC-SHA
+EXP1024-RC2-CBC-MD5
+EXP1024-RC4-MD5
 EDH-RSA-DES-CBC-SHA
 EDH-DSS-DES-CBC-SHA
 DES-CBC-SHA
 EXP-EDH-RSA-DES-CBC-SHA
 EXP-EDH-DSS-DES-CBC-SHA
 EXP-DES-CBC-SHA
 EXP-RC2-CBC-MD5
-EXP-RC4-MD5}
+EXP-RC4-MD5}] \n]
 
 # This version of the test is correct for OpenSSL only.
 # An equivalent test for the RSA BSAFE SSL-C is earlier in this file.
 
 test ciphers-1.4 {Tls::ciphers for tls1} {openssl} {
-    # This will fail if you compiled against RSA bsafe.
+    # This will fail if you compiled against RSA bsafe or with a
+    # different set of defines than the default.
     # Change the constraint setting in all.tcl
-    set result [join [eval tls::ciphers tls1] \n ]
-} {EDH-RSA-DES-CBC3-SHA
+    set result [join [lsort -dict [eval tls::ciphers tls1]] \n ]
+} [join [lsort -dict {EDH-RSA-DES-CBC3-SHA
 EDH-DSS-DES-CBC3-SHA
 DES-CBC3-SHA
+DHE-DSS-RC4-SHA
+IDEA-CBC-SHA
 RC4-SHA
 RC4-MD5
+EXP1024-DHE-DSS-RC4-SHA
+EXP1024-RC4-SHA
+EXP1024-DHE-DSS-DES-CBC-SHA
+EXP1024-DES-CBC-SHA
+EXP1024-RC2-CBC-MD5
+EXP1024-RC4-MD5
 EDH-RSA-DES-CBC-SHA
 EDH-DSS-DES-CBC-SHA
 DES-CBC-SHA
 EXP-EDH-RSA-DES-CBC-SHA
 EXP-EDH-DSS-DES-CBC-SHA
 EXP-DES-CBC-SHA
 EXP-RC2-CBC-MD5
-EXP-RC4-MD5}
+EXP-RC4-MD5}] \n]
 
 
 
 # cleanup
 ::tcltest::cleanupTests
 return