Index: tests/ciphers.test
==================================================================
--- tests/ciphers.test
+++ tests/ciphers.test
@@ -2,11 +2,11 @@
 #
 # This file contains a collection of tests for one or more of the Tcl
 # built-in commands.  Sourcing this file into Tcl runs the tests and
 # generates output for errors.  No output means no errors were found.
 #
-# Copyright (c) 2000 by Ajuba Solutions.
+
 # All rights reserved.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
@@ -16,11 +16,62 @@
     namespace import ::tcltest::*
 }
 
 package require tls
 
-test ciphers-1.1 {Tls::ciphers for ssl3.} {
+# 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.1 {Tls::ciphers for ssl3.} {} {
+    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
+RC4-SHA
+RC4-MD5
+EDH-RSA-DES-CBC-SHA
+EDH-DSS-DES-CBC-SHA
+DES-CBC-SHA
+EXP-EDH-DSS-DES-56-SHA
+EXP-EDH-DSS-RC4-56-SHA
+EXP-DES-56-SHA
+EXP-RC4-56-SHA
+EXP-EDH-RSA-DES-CBC-SHA
+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.} {
+    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
+RC4-SHA
+RC4-MD5
+EDH-RSA-DES-CBC-SHA
+EDH-DSS-DES-CBC-SHA
+DES-CBC-SHA
+EXP-EDH-DSS-DES-56-SHA
+EXP-EDH-DSS-RC4-56-SHA
+EXP-DES-56-SHA
+EXP-RC4-56-SHA
+EXP-EDH-RSA-DES-CBC-SHA
+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} {
     set result [join [eval tls::ciphers ssl3] \n ]
 } {EDH-RSA-DES-CBC3-SHA
 EDH-DSS-DES-CBC3-SHA
 DES-CBC3-SHA
 RC4-SHA
@@ -32,11 +83,14 @@
 EXP-EDH-DSS-DES-CBC-SHA
 EXP-DES-CBC-SHA
 EXP-RC2-CBC-MD5
 EXP-RC4-MD5}
 
-test ciphers-1.2 {Tls::ciphers for tls1.} {
+# 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} {
     set result [join [eval tls::ciphers tls1] \n ]
 } {EDH-RSA-DES-CBC3-SHA
 EDH-DSS-DES-CBC3-SHA
 DES-CBC3-SHA
 RC4-SHA
@@ -47,10 +101,11 @@
 EXP-EDH-RSA-DES-CBC-SHA
 EXP-EDH-DSS-DES-CBC-SHA
 EXP-DES-CBC-SHA
 EXP-RC2-CBC-MD5
 EXP-RC4-MD5}
+
 
 
 # cleanup
 ::tcltest::cleanupTests
 return