m4_define([AWAIT_KXDONE], [
## Ignore some reports caused by races.
- for d in $1 $3; do
+ for i in $1!$4 $3!$2; do
+ d=${i%!*} o=${i#*!}
TRIPECTL -d$d WARN test PUSH
- TRIPECTL -d$d WARN test IGNORE WARN KX $2 incorrect cookie
- TRIPECTL -d$d WARN test IGNORE WARN KX $2 unexpected pre-challenge
- TRIPECTL -d$d WARN test IGNORE WARN KX $2 unexpected challenge
+ TRIPECTL -d$d WARN test IGNORE WARN KX $o incorrect cookie
+ TRIPECTL -d$d WARN test IGNORE WARN KX $o unexpected pre-challenge
+ TRIPECTL -d$d WARN test IGNORE WARN KX $o unexpected challenge
done
## Watch for the key-exchange completion announcement in the background.
case "$[]1:$[]2:$[]3" in
OK::) ;;
NOTE:KXDONE:$4) break ;;
- NOTE:*) ;;
+ NOTE:* | TRACE:* | WARN:*) ;;
*) exit 63 ;;
esac
done
ESTABLISH([alice], [not-alice], [-key alice],
[bob], [bob], [])
])
+ for p in alice bob; do rm -rf $p.$k; mv $p $p.$k; done
done
AT_CLEANUP
for p in $princs; do TRIPECTL -d$p RELOAD; done
AT_DATA([algs-alpha], [dnl
-kx-group=ec kx-group-order-bits=256 kx-group-elt-bits=512
-hash=rmd160 mgf=rmd160-mgf hash-sz=20
-bulk-transform=v0 bulk-overhead=22
-cipher=blowfish-cbc cipher-keysz=20 cipher-blksz=8
-cipher-data-limit=67108864
-mac=rmd160-hmac mac-keysz=20 mac-tagsz=10
+kx-group=curve25519 kx-group-order-bits=252 kx-group-elt-bits=255
+hash=sha256 mgf=sha256-mgf hash-sz=32
+bulk-transform=naclbox bulk-overhead=20
+cipher=chacha20 cipher-keysz=32
+mac=poly1305 mac-tagsz=16
+cipher-data-limit=2147483648
])
AT_DATA([algs-beta-old], [dnl
hash=rmd160 mgf=rmd160-mgf hash-sz=20
bulk-transform=v0 bulk-overhead=22
cipher=blowfish-cbc cipher-keysz=20 cipher-blksz=8
-cipher-data-limit=67108864
mac=rmd160-hmac mac-keysz=20 mac-tagsz=10
+cipher-data-limit=67108864
])
AT_DATA([algs-beta-new], [dnl
hash=rmd160 mgf=rmd160-mgf hash-sz=20
bulk-transform=iiv bulk-overhead=14
cipher=blowfish-cbc cipher-keysz=20 cipher-blksz=8
-cipher-data-limit=67108864
mac=rmd160-hmac mac-keysz=20 mac-tagsz=10
blkc=blowfish blkc-keysz=20 blkc-blksz=8
+cipher-data-limit=67108864
])
cp algs-alpha expout; AT_CHECK([TRIPECTL -dalice ALGS],, [expout])