diff options
| author | nelson%bolyard.com <devnull@localhost> | 2009-03-21 04:00:46 +0000 |
|---|---|---|
| committer | nelson%bolyard.com <devnull@localhost> | 2009-03-21 04:00:46 +0000 |
| commit | 234776ba80b44b70b9a591920ab4dbe5f3fa56a0 (patch) | |
| tree | f4314a86c0a5df7436c877955947339616514a93 | |
| parent | 22908431d23d3c31b8c80e37941d0d796f53b42f (diff) | |
| download | nss-hg-234776ba80b44b70b9a591920ab4dbe5f3fa56a0.tar.gz | |
Bug 483113: Fix broken test script. R=Julien.pierre
| -rw-r--r-- | security/nss/tests/tools/tools.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/security/nss/tests/tools/tools.sh b/security/nss/tests/tools/tools.sh index 17ce0ea0e..c4972aceb 100644 --- a/security/nss/tests/tools/tools.sh +++ b/security/nss/tests/tools/tools.sh @@ -62,7 +62,7 @@ "PKCS #12 V2 PBE With Sha1 and 40 Bit RC4" export pkcs12v2pbeWithSha1AndTripleDESCBC=\ -"PKCS #12 V2 PBE With Sha1 and Triple DES CBC" +"PKCS #12 V2 PBE With Sha1 and Triple DES-CBC" export pkcs12v2pbeWithSha1And128BitRc2Cbc=\ "PKCS #12 V2 PBE With Sha1 and 128 Bit RC2 CBC" @@ -71,22 +71,22 @@ "PKCS #12 V2 PBE With Sha1 and 40 Bit RC2 CBC" export pkcs12v2pbeWithMd2AndDESCBC=\ -"PKCS #5 Password Based Encryption with MD2 and DES CBC" +"PKCS #5 Password Based Encryption with MD2 and DES-CBC" export pkcs12v2pbeWithMd5AndDESCBC=\ -"PKCS #5 Password Based Encryption with MD5 and DES CBC" +"PKCS #5 Password Based Encryption with MD5 and DES-CBC" export pkcs12v2pbeWithSha1AndDESCBC=\ -"PKCS #5 Password Based Encryption with SHA1 and DES CBC" +"PKCS #5 Password Based Encryption with SHA1 and DES-CBC" export pkcs5pbeWithMD2AndDEScbc=\ -"PKCS #5 Password Based Encryption with MD2 and DES CBC" +"PKCS #5 Password Based Encryption with MD2 and DES-CBC" export pkcs5pbeWithMD5AndDEScbc=\ -"PKCS #5 Password Based Encryption with MD5 and DES CBC" +"PKCS #5 Password Based Encryption with MD5 and DES-CBC" export pkcs5pbeWithSha1AndDEScbc=\ -"PKCS #5 Password Based Encryption with SHA1 and DES CBC" +"PKCS #5 Password Based Encryption with SHA1 and DES-CBC" ############################## tools_init ############################## # local shell function to initialize this script @@ -247,11 +247,11 @@ export_list_import() # $1 key encryption cipher # $2 certificate encryption cipher - if [[ "${1}" != "" && "${2}" != "" ]]; then + if [ "${1}" != "" && "${2}" != "" ]; then export_with_both_key_and_cert_cipher "${1}" "${2}" - elif [[ "${1}" != "" && "${2}" = "" ]]; then + elif [ "${1}" != "" && "${2}" = "" ]; then export_with_key_cipher "${1}" - elif [[ "${1}" = "" && "${2}" != "" ]]; then + elif [ "${1}" = "" && "${2}" != "" ]; then export_with_cert_cipher "${2}" else export_with_default_ciphers |