summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2016-01-29 05:18:15 +0000
committerDamien Miller <djm@mindrot.org>2016-02-04 16:13:37 +1100
commit537f88ec7bcf40bd444ac5584c707c5588c55c43 (patch)
tree16bf92f41a27c5980a75531ae51f368706918be0
parent4c6cb8330460f94e6c7ae28a364236d4188156a3 (diff)
upstream commit
Add regression test for RekeyLimit parsing of >32bit values (4G and 8G). Upstream-Regress-ID: 548390350c62747b6234f522a99c319eee401328
-rw-r--r--regress/rekey.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/regress/rekey.sh b/regress/rekey.sh
index 0d4444d03..ae145bc8b 100644
--- a/regress/rekey.sh
+++ b/regress/rekey.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: rekey.sh,v 1.16 2015/02/14 12:43:16 markus Exp $ 1# $OpenBSD: rekey.sh,v 1.17 2016/01/29 05:18:15 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="rekey" 4tid="rekey"
@@ -137,13 +137,15 @@ for s in 5 10; do
137done 137done
138 138
139verbose "rekeylimit parsing" 139verbose "rekeylimit parsing"
140for size in 16 1k 1K 1m 1M 1g 1G; do 140for size in 16 1k 1K 1m 1M 1g 1G 4G 8G; do
141 for time in 1 1m 1M 1h 1H 1d 1D 1w 1W; do 141 for time in 1 1m 1M 1h 1H 1d 1D 1w 1W; do
142 case $size in 142 case $size in
143 16) bytes=16 ;; 143 16) bytes=16 ;;
144 1k|1K) bytes=1024 ;; 144 1k|1K) bytes=1024 ;;
145 1m|1M) bytes=1048576 ;; 145 1m|1M) bytes=1048576 ;;
146 1g|1G) bytes=1073741824 ;; 146 1g|1G) bytes=1073741824 ;;
147 4g|4G) bytes=4294967296 ;;
148 8g|8G) bytes=8589934592 ;;
147 esac 149 esac
148 case $time in 150 case $time in
149 1) seconds=1 ;; 151 1) seconds=1 ;;