OpenSSL 0.9.4 merge

1 files changed, 2 insertions, 10 deletions

diff --git a/src/lib/libssl/test/testenc b/src/lib/libssl/test/testenc
index 42db56c2be..0656c7f525 100644
--- a/src/lib/libssl/test/testenc
+++ b/src/lib/libssl/test/testenc
@@ -2,7 +2,7 @@
 
 testsrc=Makefile.ssl
 test=./p
-cmd=../apps/ssleay
+cmd=../apps/openssl
 
 cat $testsrc >$test;
 
@@ -27,15 +27,7 @@ else
         /bin/rm $test.cipher $test.clear
 fi
 
-for i in rc4 \
-        des-cfb des-ede-cfb des-ede3-cfb \
-        des-ofb des-ede-ofb des-ede3-ofb \
-        des-ecb des-ede des-ede3 desx \
-        des-cbc des-ede-cbc des-ede3-cbc \
-        idea-ecb idea-cfb idea-ofb idea-cbc \
-        rc2-ecb rc2-cfb rc2-ofb rc2-cbc \
-        bf-ecb bf-cfb bf-ofb bf-cbc rc4 \
-        cast5-ecb cast5-cfb cast5-ofb cast5-cbc
+for i in `$cmd list-cipher-commands`
 do
         echo $i
         $cmd $i -bufsize 113 -e -k test < $test > $test.$i.cipher