diff options
| author |   djm <djm@openbsd.org> | 2015-03-04 23:22:35 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2015-03-04 23:22:35 +0000 |
| commit | 14dfbf97cfe5582cc31c333e41193f328bb2f9ed (patch) | |
| tree | f6f8ec5f97e85b8f6ee864660d8d4c9ec3456199 /regress/usr.bin/ssh/unittests/sshkey | |
| parent | make ssh-add -D work with !SSH1 agent (diff) | |
| download | wireguard-openbsd-14dfbf97cfe5582cc31c333e41193f328bb2f9ed.tar.xz wireguard-openbsd-14dfbf97cfe5582cc31c333e41193f328bb2f9ed.zip | |
make these work with !SSH1; ok markus@ deraadt@
Diffstat (limited to 'regress/usr.bin/ssh/unittests/sshkey')
| -rw-r--r-- | regress/usr.bin/ssh/unittests/sshkey/test_file.c | 4 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/unittests/sshkey/test_fuzz.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/regress/usr.bin/ssh/unittests/sshkey/test_file.c b/regress/usr.bin/ssh/unittests/sshkey/test_file.c index a608fd1c241..474e3be00e1 100644 --- a/regress/usr.bin/ssh/unittests/sshkey/test_file.c +++ b/regress/usr.bin/ssh/unittests/sshkey/test_file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: test_file.c,v 1.2 2014/12/22 02:15:52 djm Exp $ */ +/* $OpenBSD: test_file.c,v 1.3 2015/03/04 23:22:35 djm Exp $ */ /* * Regress test for sshkey.h key management API * @@ -45,6 +45,7 @@ sshkey_file_tests(void) pw = load_text_file("pw"); TEST_DONE(); +#ifdef WITH_SSH1 TEST_START("parse RSA1 from private"); buf = load_file("rsa1_1"); ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "rsa1_1", @@ -93,6 +94,7 @@ sshkey_file_tests(void) TEST_DONE(); sshkey_free(k1); +#endif TEST_START("parse RSA from private"); buf = load_file("rsa_1"); diff --git a/regress/usr.bin/ssh/unittests/sshkey/test_fuzz.c b/regress/usr.bin/ssh/unittests/sshkey/test_fuzz.c index 7fcc66cb91a..7f05a648e84 100644 --- a/regress/usr.bin/ssh/unittests/sshkey/test_fuzz.c +++ b/regress/usr.bin/ssh/unittests/sshkey/test_fuzz.c @@ -1,4 +1,4 @@ -/* $OpenBSD: test_fuzz.c,v 1.3 2015/01/26 06:11:28 djm Exp $ */ +/* $OpenBSD: test_fuzz.c,v 1.4 2015/03/04 23:22:35 djm Exp $ */ /* * Fuzz tests for key parsing * @@ -98,6 +98,7 @@ sshkey_fuzz_tests(void) struct fuzz *fuzz; int r; +#ifdef WITH_SSH1 TEST_START("fuzz RSA1 private"); buf = load_file("rsa1_1"); fuzz = fuzz_begin(FUZZ_1_BIT_FLIP | FUZZ_1_BYTE_FLIP | @@ -141,6 +142,7 @@ sshkey_fuzz_tests(void) sshbuf_free(fuzzed); fuzz_cleanup(fuzz); TEST_DONE(); +#endif TEST_START("fuzz RSA private"); buf = load_file("rsa_1"); |