[xmlsec] fix tests

[Aleksey Sanin <aleksey src gnome org>]

commit ca3661d7ccabaea781a2651316a7761da4caded3
Author: Aleksey Sanin <aleksey aleksey com>
Date:   Fri Apr 30 00:24:32 2010 -0700

    fix tests

 tests/testDSig.sh |   20 ++++++++++++--------
 tests/testEnc.sh  |    7 +------
 2 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/tests/testDSig.sh b/tests/testDSig.sh
index ac72050..46804b2 100755
--- a/tests/testDSig.sh
+++ b/tests/testDSig.sh
@@ -386,26 +386,26 @@ execDSigTest "" "merlin-xmldsig-twenty-three/signature-enveloped-dsa" \
     "enveloped-signature sha1 dsa-sha1" \
     " " \
     "$priv_key_option $topfolder/keys/dsakey.$priv_key_format --pwd secret" \
-    " " 
-    
+    " "
+
 execDSigTest "" "merlin-xmldsig-twenty-three/signature-enveloping-dsa" \
     "sha1 dsa-sha1" \
     " " \
     "$priv_key_option $topfolder/keys/dsakey.$priv_key_format --pwd secret" \
-    " " 
-    
+    " "
+
 execDSigTest "" "merlin-xmldsig-twenty-three/signature-enveloping-b64-dsa" \
     "base64 sha1 dsa-sha1" \
     " " \
     "$priv_key_option $topfolder/keys/dsakey.$priv_key_format --pwd secret" \
-    " " 
-    
+    " "
+
 execDSigTest "" "merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1-40" \
     "sha1 hmac-sha1" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" 
-    
+
 execDSigTest "" "merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1" \
     "sha1 hmac-sha1" \
     "--hmackey $topfolder/keys/hmackey.bin" \
@@ -482,6 +482,11 @@ execDSigTest "" "merlin-xmldsig-twenty-three/signature" \
 # key transport/wrapper algorightms
 #
 ##########################################################################
+execDSigTest "" "merlin-xmlenc-five/encsig-ripemd160-hmac-ripemd160-kw-tripledes" \
+    "ripemd160 hmac-ripemd160 kw-tripledes" \
+    "--keys-file $topfolder/merlin-xmlenc-five/keys.xml" \
+    "--session-key hmac-192 --keys-file $topfolder/merlin-xmlenc-five/keys.xml" \
+    "--keys-file $topfolder/merlin-xmlenc-five/keys.xml" 
 
 execDSigTest "" "merlin-xmlenc-five/encsig-sha256-hmac-sha256-kw-aes128" \
     "sha256 hmac-sha256 kw-aes128" \
@@ -503,7 +508,6 @@ execDSigTest "" "merlin-xmlenc-five/encsig-hmac-sha256-rsa-oaep-mgf1p" \
     "sha1 hmac-sha256 rsa-oaep-mgf1p" \
     "$priv_key_option $topfolder/merlin-xmlenc-five/rsapriv.$priv_key_format --pwd secret" 
 
-#merlin-xmlenc-five/encsig-hmac-sha256-rsa-oaep-mgf1p.xml
 
 
 ##########################################################################
diff --git a/tests/testEnc.sh b/tests/testEnc.sh
index 96b168f..7fad5a6 100755
--- a/tests/testEnc.sh
+++ b/tests/testEnc.sh
@@ -254,16 +254,11 @@ execEncTest "merlin-xmlenc-five/encrypt-element-tripledes-cbc-kw-aes128" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml  --session-key des-192 --node-name urn:example:po:PaymentInfo --xml-data $topfolder/merlin-xmlenc-five/encrypt-element-tripledes-cbc-kw-aes128.data" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml"
-        
+
 execEncTest "merlin-xmlenc-five/encrypt-element-aes256-cbc-retrieved-kw-aes256" \
     "aes256-cbc kw-aes256" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml" 
 
-execEncTest "merlin-xmlenc-five/encsig-ripemd160-hmac-ripemd160-kw-tripledes" \
-    "ripemd160 hmac-ripemd160 kw-tripledes" \
-    "--keys-file $topfolder/merlin-xmlenc-five/keys.xml" \
-    "--session-key hmac-192 --keys-file $topfolder/merlin-xmlenc-five/keys.xml" \
-    "--keys-file $topfolder/merlin-xmlenc-five/keys.xml" 
 
 #merlin-xmlenc-five/encrypt-data-tripledes-cbc-rsa-oaep-mgf1p-sha256.xml