Index: ChangeLog
==================================================================
--- ChangeLog
+++ ChangeLog
@@ -1,7 +1,10 @@
 2000-08-16  Jeff Hobbs  <hobbs@scriptics.com>
 
+	* tests/ciphers.test: improved ability to change constraint
+	setting for whether user compiled against RSA or OpenSSL libs.
+
 	* tls.c (Tls_Init): corrected interpretation of version number
 	(patchlevel and release/serial were swapped).
 
 2000-08-15  Jeff Hobbs  <hobbs@scriptics.com>
 

Index: tests/ciphers.test
==================================================================
--- tests/ciphers.test
+++ tests/ciphers.test
@@ -16,14 +16,19 @@
     namespace import ::tcltest::*
 }
 
 package require tls
 
-# This version of the test is correct for RSA BSAFE SSL-C only.
-# An equivalent test for the OpenSSL version is later in this file.
+# 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
 
-test ciphers-1.1 {Tls::ciphers for ssl3.} {} {
+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 ]
 } {EDH-DSS-RC4-SHA
 EDH-RSA-DES-CBC3-SHA
 EDH-DSS-DES-CBC3-SHA
 DES-CBC3-SHA
@@ -40,14 +45,13 @@
 EXP-EDH-DSS-DES-CBC-SHA
 EXP-DES-CBC-SHA
 EXP-RC2-CBC-MD5
 EXP-RC4-MD5}
 
-# This version of the test is correct for RSA BSAFE SSL-C only.
-# An equivalent test for the OpenSSL version is later in this file.
-
-test ciphers-1.2 {Tls::ciphers for tls1.} {
+test ciphers-1.2 {Tls::ciphers for tls1} {rsabsafe} {
+    # This will fail if you compiled against OpenSSL.
+    # Change the constraint setting above.
     set result [join [eval tls::ciphers tls1] \n ]
 } {EDH-DSS-RC4-SHA
 EDH-RSA-DES-CBC3-SHA
 EDH-DSS-DES-CBC3-SHA
 DES-CBC3-SHA
@@ -64,14 +68,13 @@
 EXP-EDH-DSS-DES-CBC-SHA
 EXP-DES-CBC-SHA
 EXP-RC2-CBC-MD5
 EXP-RC4-MD5}
 
-# 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.3 {Tls::ciphers for ssl3.} {OpenSSL} {
+test ciphers-1.3 {Tls::ciphers for ssl3} {openssl} {
+    # This will fail if you compiled against RSA bsafe.
+    # Change the constraint setting above.
     set result [join [eval tls::ciphers ssl3] \n ]
 } {EDH-RSA-DES-CBC3-SHA
 EDH-DSS-DES-CBC3-SHA
 DES-CBC3-SHA
 RC4-SHA
@@ -86,11 +89,13 @@
 EXP-RC4-MD5}
 
 # 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} {
+test ciphers-1.4 {Tls::ciphers for tls1} {openssl} {
+    # This will fail if you compiled against RSA bsafe.
+    # Change the constraint setting in all.tcl
     set result [join [eval tls::ciphers tls1] \n ]
 } {EDH-RSA-DES-CBC3-SHA
 EDH-DSS-DES-CBC3-SHA
 DES-CBC3-SHA
 RC4-SHA