diff options
| author |   dtucker <dtucker@openbsd.org> | 2016-09-12 02:25:46 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2016-09-12 02:25:46 +0000 |
| commit | 2ee97d96b6fd0a484b5e89f1b8b195b08e727ac9 (patch) | |
| tree | a97c16d52fb94b60670990b509d51a60c89648c0 | |
| parent | Add MAXIMUM(), MINIMUM(), and ROUNDUP() to misc.h, then use those definitions (diff) | |
| download | wireguard-openbsd-2ee97d96b6fd0a484b5e89f1b8b195b08e727ac9.tar.xz wireguard-openbsd-2ee97d96b6fd0a484b5e89f1b8b195b08e727ac9.zip | |
Add testcase for ssh-keygen -j, -J and -K options for moduli screening.
Does not currently test generation as that is extremely slow.
| -rw-r--r-- | regress/usr.bin/ssh/Makefile | 3 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/keygen-moduli.sh | 15 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/moduli.in | 3 |
3 files changed, 20 insertions, 1 deletions
diff --git a/regress/usr.bin/ssh/Makefile b/regress/usr.bin/ssh/Makefile index d84581458e7..ce515e748cc 100644 --- a/regress/usr.bin/ssh/Makefile +++ b/regress/usr.bin/ssh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.88 2016/06/03 04:10:41 dtucker Exp $ +# $OpenBSD: Makefile,v 1.89 2016/09/12 02:25:46 dtucker Exp $ .ifndef SKIP_UNIT SUBDIR= unittests @@ -32,6 +32,7 @@ LTESTS= connect \ keyscan \ keygen-change \ keygen-convert \ + keygen-moduli \ key-options \ scp \ sftp \ diff --git a/regress/usr.bin/ssh/keygen-moduli.sh b/regress/usr.bin/ssh/keygen-moduli.sh new file mode 100644 index 00000000000..4be7b4d63d3 --- /dev/null +++ b/regress/usr.bin/ssh/keygen-moduli.sh @@ -0,0 +1,15 @@ +# $OpenBSD: keygen-moduli.sh,v 1.1 2016/09/12 02:25:46 dtucker Exp $ +# Placed in the Public Domain. + +tid="keygen moduli" + +for i in 0 1 2; do + rm -f $OBJ/moduli.out $OBJ/moduli.ckpt + ${SSHKEYGEN} -T $OBJ/moduli.out -f ${SRC}/moduli.in -j$i -J1 \ + -K $OBJ/moduli.ckpt 2>/dev/null || \ + fail "keygen screen failed line $i" + lines=`wc -l <$OBJ/moduli.out` + test "$lines" -eq "1" || fail "expected 1 line, got $lines" +done + +rm -f $OBJ/moduli.out $OBJ/moduli.ckpt diff --git a/regress/usr.bin/ssh/moduli.in b/regress/usr.bin/ssh/moduli.in new file mode 100644 index 00000000000..e69c902a222 --- /dev/null +++ b/regress/usr.bin/ssh/moduli.in @@ -0,0 +1,3 @@ +20160301052556 2 6 100 2047 5 DA57B18976E9C55CEAC3BFFF70419A1550258EA7359400BD4FAC8F4203B73E0BC54D62C0A2D9AA9B543FACA0290514EA426DE6FEF897CB858243511DCE5170420C799D888DCFDC4502FF49B66F34E75C00E98A55408A791FF5CFEA7C288F8E6664226A6A90BE237D2E40C207B5AD0CAEDFDA4946E63AEA351A09EF462515FED4098694241CD07E2CB7727B39B8B1B9467D72DFB908D8169F5DB3CD5A6BEBE1344C585A882508B760402E86EB9B5548A7B98635ECFCDC02FF62B29C53847142FC598ADC66F622F6E9F73BDF02B3D795C0DF23D00E5A3A7748F3E1D5B06F46D4568CE3F4CC57E67D4C36DF5C12800620698C727CC5F5BCACF3B7E17E37D19F4647 +20160301052601 2 6 100 2047 2 DA57B18976E9C55CEAC3BFFF70419A1550258EA7359400BD4FAC8F4203B73E0BC54D62C0A2D9AA9B543FACA0290514EA426DE6FEF897CB858243511DCE5170420C799D888DCFDC4502FF49B66F34E75C00E98A55408A791FF5CFEA7C288F8E6664226A6A90BE237D2E40C207B5AD0CAEDFDA4946E63AEA351A09EF462515FED4098694241CD07E2CB7727B39B8B1B9467D72DFB908D8169F5DB3CD5A6BEBE1344C585A882508B760402E86EB9B5548A7B98635ECFCDC02FF62B29C53847142FC598ADC66F622F6E9F73BDF02B3D795C0DF23D00E5A3A7748F3E1D5B06F46D4568CE3F4CC57E67D4C36DF5C12800620698C727CC5F5BCACF3B7E17E37D1A5C13B +20160301052612 2 6 100 2047 5 DA57B18976E9C55CEAC3BFFF70419A1550258EA7359400BD4FAC8F4203B73E0BC54D62C0A2D9AA9B543FACA0290514EA426DE6FEF897CB858243511DCE5170420C799D888DCFDC4502FF49B66F34E75C00E98A55408A791FF5CFEA7C288F8E6664226A6A90BE237D2E40C207B5AD0CAEDFDA4946E63AEA351A09EF462515FED4098694241CD07E2CB7727B39B8B1B9467D72DFB908D8169F5DB3CD5A6BEBE1344C585A882508B760402E86EB9B5548A7B98635ECFCDC02FF62B29C53847142FC598ADC66F622F6E9F73BDF02B3D795C0DF23D00E5A3A7748F3E1D5B06F46D4568CE3F4CC57E67D4C36DF5C12800620698C727CC5F5BCACF3B7E17E37D1B7A3EF |