diff options
| author | Tim Taubert <ttaubert@mozilla.com> | 2016-04-18 14:36:33 +0200 |
|---|---|---|
| committer | Tim Taubert <ttaubert@mozilla.com> | 2016-04-18 14:36:33 +0200 |
| commit | 08125395aa312123d222ab1cf77efb52d1daa0ff (patch) | |
| tree | 66f27a33c9f8c828d79e23034564fc3e36499e5b /tests | |
| parent | 7be20a6f3ad0f8d5f410ae75d1f69831421c5b6d (diff) | |
| download | nss-hg-08125395aa312123d222ab1cf77efb52d1daa0ff.tar.gz | |
Bug 1258968 - Fix memleak tests after removing SSL 2 code r=kaie
Diffstat (limited to 'tests')
| -rwxr-xr-x[-rw-r--r--] | tests/memleak/memleak.sh | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/tests/memleak/memleak.sh b/tests/memleak/memleak.sh index 54d2530ca..af0bc5b38 100644..100755 --- a/tests/memleak/memleak.sh +++ b/tests/memleak/memleak.sh @@ -140,7 +140,7 @@ memleak_init() NSS_DISABLE_UNLOAD="1" export NSS_DISABLE_UNLOAD - SELFSERV_ATTR="-D -p ${PORT} -d ${SERVER_DB} -n ${HOSTADDR} -e ${HOSTADDR}-ec -w nss -c ABCDEF:C001:C002:C003:C004:C005:C006:C007:C008:C009:C00A:C00B:C00C:C00D:C00E:C00F:C010:C011:C012:C013:C014cdefgijklmnvyz -t 5" + SELFSERV_ATTR="-D -p ${PORT} -d ${SERVER_DB} -n ${HOSTADDR} -e ${HOSTADDR}-ec -w nss -c :C001:C002:C003:C004:C005:C006:C007:C008:C009:C00A:C00B:C00C:C00D:C00E:C00F:C010:C011:C012:C013:C014cdefgijklmnvyz -t 5" TSTCLNT_ATTR="-p ${PORT} -h ${HOSTADDR} -c j -f -d ${CLIENT_DB} -w nss -o" STRSCLNT_ATTR="-q -p ${PORT} -d ${CLIENT_DB} -w nss -c 1000 -n TestUser ${HOSTADDR}" @@ -207,7 +207,7 @@ set_test_mode() echo "${SCRIPTNAME}: FIPS is OFF" # ciphers l and m removed, see bug 1136095 - cipher_list="A B C D E F :C001 :C002 :C003 :C004 :C005 :C006 :C007 :C008 :C009 :C00A :C010 :C011 :C012 :C013 :C014 c d e f g i j k n v y z" + cipher_list=":C001 :C002 :C003 :C004 :C005 :C006 :C007 :C008 :C009 :C00A :C010 :C011 :C012 :C013 :C014 c d e f g i j k n v y z" fi } @@ -370,10 +370,6 @@ run_strsclnt() VMIN="ssl3" VMAX= case "${cipher}" in - A|B|C|D|E|F) - # Enable SSL 2 only for SSL 2 cipher suites. - VMIN="ssl2" - ;; f|g) # TLS 1.1 disallows export cipher suites. VMAX="tls1.0" @@ -415,10 +411,6 @@ run_strsclnt_dbg() VMIN="ssl3" VMAX= case "${cipher}" in - A|B|C|D|E|F) - # Enable SSL 2 only for SSL 2 cipher suites. - VMIN="ssl2" - ;; f|g) # TLS 1.1 disallows export cipher suites. VMAX="tls1.0" |