diff options
Diffstat (limited to 'regress')
-rw-r--r-- | regress/unittests/sshkey/test_fuzz.c | 4 | ||||
-rw-r--r-- | regress/unittests/sshkey/test_sshkey.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/regress/unittests/sshkey/test_fuzz.c b/regress/unittests/sshkey/test_fuzz.c index c444c3813..14518ce98 100644 --- a/regress/unittests/sshkey/test_fuzz.c +++ b/regress/unittests/sshkey/test_fuzz.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: test_fuzz.c,v 1.2 2015/01/18 19:53:58 djm Exp $ */ | 1 | /* $OpenBSD: test_fuzz.c,v 1.3 2015/01/26 06:11:28 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Fuzz tests for key parsing | 3 | * Fuzz tests for key parsing |
4 | * | 4 | * |
@@ -53,7 +53,7 @@ public_fuzz(struct sshkey *k) | |||
53 | struct fuzz *fuzz; | 53 | struct fuzz *fuzz; |
54 | 54 | ||
55 | ASSERT_PTR_NE(buf = sshbuf_new(), NULL); | 55 | ASSERT_PTR_NE(buf = sshbuf_new(), NULL); |
56 | ASSERT_INT_EQ(sshkey_to_blob_buf(k, buf), 0); | 56 | ASSERT_INT_EQ(sshkey_putb(k, buf), 0); |
57 | /* XXX need a way to run the tests in "slow, but complete" mode */ | 57 | /* XXX need a way to run the tests in "slow, but complete" mode */ |
58 | fuzz = fuzz_begin(FUZZ_1_BIT_FLIP | /* XXX too slow FUZZ_2_BIT_FLIP | */ | 58 | fuzz = fuzz_begin(FUZZ_1_BIT_FLIP | /* XXX too slow FUZZ_2_BIT_FLIP | */ |
59 | FUZZ_1_BYTE_FLIP | /* XXX too slow FUZZ_2_BYTE_FLIP | */ | 59 | FUZZ_1_BYTE_FLIP | /* XXX too slow FUZZ_2_BYTE_FLIP | */ |
diff --git a/regress/unittests/sshkey/test_sshkey.c b/regress/unittests/sshkey/test_sshkey.c index 247d42019..3e4e39b62 100644 --- a/regress/unittests/sshkey/test_sshkey.c +++ b/regress/unittests/sshkey/test_sshkey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: test_sshkey.c,v 1.2 2015/01/18 19:54:46 djm Exp $ */ | 1 | /* $OpenBSD: test_sshkey.c,v 1.3 2015/01/26 06:11:28 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Regress test for sshkey.h key management API | 3 | * Regress test for sshkey.h key management API |
4 | * | 4 | * |
@@ -60,7 +60,7 @@ build_cert(struct sshbuf *b, const struct sshkey *k, const char *type, | |||
60 | 60 | ||
61 | ca_buf = sshbuf_new(); | 61 | ca_buf = sshbuf_new(); |
62 | ASSERT_PTR_NE(ca_buf, NULL); | 62 | ASSERT_PTR_NE(ca_buf, NULL); |
63 | ASSERT_INT_EQ(sshkey_to_blob_buf(ca_key, ca_buf), 0); | 63 | ASSERT_INT_EQ(sshkey_putb(ca_key, ca_buf), 0); |
64 | 64 | ||
65 | /* | 65 | /* |
66 | * Get the public key serialisation by rendering the key and skipping | 66 | * Get the public key serialisation by rendering the key and skipping |
@@ -68,7 +68,7 @@ build_cert(struct sshbuf *b, const struct sshkey *k, const char *type, | |||
68 | */ | 68 | */ |
69 | pk = sshbuf_new(); | 69 | pk = sshbuf_new(); |
70 | ASSERT_PTR_NE(pk, NULL); | 70 | ASSERT_PTR_NE(pk, NULL); |
71 | ASSERT_INT_EQ(sshkey_plain_to_blob_buf(k, pk), 0); | 71 | ASSERT_INT_EQ(sshkey_putb_plain(k, pk), 0); |
72 | ASSERT_INT_EQ(sshbuf_skip_string(pk), 0); | 72 | ASSERT_INT_EQ(sshbuf_skip_string(pk), 0); |
73 | 73 | ||
74 | principals = sshbuf_new(); | 74 | principals = sshbuf_new(); |
@@ -447,7 +447,7 @@ sshkey_tests(void) | |||
447 | ASSERT_INT_EQ(sshkey_certify(k1, k2), 0); | 447 | ASSERT_INT_EQ(sshkey_certify(k1, k2), 0); |
448 | b = sshbuf_new(); | 448 | b = sshbuf_new(); |
449 | ASSERT_PTR_NE(b, NULL); | 449 | ASSERT_PTR_NE(b, NULL); |
450 | ASSERT_INT_EQ(sshkey_to_blob_buf(k1, b), 0); | 450 | ASSERT_INT_EQ(sshkey_putb(k1, b), 0); |
451 | ASSERT_INT_EQ(sshkey_from_blob(sshbuf_ptr(b), sshbuf_len(b), &k3), 0); | 451 | ASSERT_INT_EQ(sshkey_from_blob(sshbuf_ptr(b), sshbuf_len(b), &k3), 0); |
452 | 452 | ||
453 | sshkey_free(k1); | 453 | sshkey_free(k1); |