Index: ChangeLog
==================================================================
 ChangeLog
+++ ChangeLog
@@ 1,7 +1,10 @@
20000816 Jeff Hobbs
+ * 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).
20000815 Jeff Hobbs
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 SSLC 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 SSLC or OpenSSL).
+#
+set ::tcltest::testConstraints(rsabsafe) 1
+set ::tcltest::testConstraints(openssl) 0
test ciphers1.1 {Tls::ciphers for ssl3.} {} {
+test ciphers1.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 ]
} {EDHDSSRC4SHA
EDHRSADESCBC3SHA
EDHDSSDESCBC3SHA
DESCBC3SHA
@@ 40,14 +45,13 @@
EXPEDHDSSDESCBCSHA
EXPDESCBCSHA
EXPRC2CBCMD5
EXPRC4MD5}
# This version of the test is correct for RSA BSAFE SSLC only.
# An equivalent test for the OpenSSL version is later in this file.

test ciphers1.2 {Tls::ciphers for tls1.} {
+test ciphers1.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 ]
} {EDHDSSRC4SHA
EDHRSADESCBC3SHA
EDHDSSDESCBC3SHA
DESCBC3SHA
@@ 64,14 +68,13 @@
EXPEDHDSSDESCBCSHA
EXPDESCBCSHA
EXPRC2CBCMD5
EXPRC4MD5}
# This version of the test is correct for OpenSSL only.
# An equivalent test for the RSA BSAFE SSLC is earlier in this file.

test ciphers1.3 {Tls::ciphers for ssl3.} {OpenSSL} {
+test ciphers1.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 ]
} {EDHRSADESCBC3SHA
EDHDSSDESCBC3SHA
DESCBC3SHA
RC4SHA
@@ 86,11 +89,13 @@
EXPRC4MD5}
# This version of the test is correct for OpenSSL only.
# An equivalent test for the RSA BSAFE SSLC is earlier in this file.
test ciphers1.4 {Tls::ciphers for tls1.} {OpenSSL} {
+test ciphers1.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 ]
} {EDHRSADESCBC3SHA
EDHDSSDESCBC3SHA
DESCBC3SHA
RC4SHA