diff options
Diffstat (limited to 'regress/unittests/sshkey/test_file.c')
-rw-r--r-- | regress/unittests/sshkey/test_file.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/regress/unittests/sshkey/test_file.c b/regress/unittests/sshkey/test_file.c index 764f7fb76..fa95212bf 100644 --- a/regress/unittests/sshkey/test_file.c +++ b/regress/unittests/sshkey/test_file.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: test_file.c,v 1.1 2014/06/24 01:14:18 djm Exp $ */ | 1 | /* $OpenBSD: test_file.c,v 1.3 2015/03/04 23:22:35 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Regress test for sshkey.h key management API | 3 | * Regress test for sshkey.h key management API |
4 | * | 4 | * |
@@ -33,6 +33,7 @@ | |||
33 | #include "authfile.h" | 33 | #include "authfile.h" |
34 | #include "sshkey.h" | 34 | #include "sshkey.h" |
35 | #include "sshbuf.h" | 35 | #include "sshbuf.h" |
36 | #include "digest.h" | ||
36 | 37 | ||
37 | #include "common.h" | 38 | #include "common.h" |
38 | 39 | ||
@@ -50,6 +51,7 @@ sshkey_file_tests(void) | |||
50 | pw = load_text_file("pw"); | 51 | pw = load_text_file("pw"); |
51 | TEST_DONE(); | 52 | TEST_DONE(); |
52 | 53 | ||
54 | #ifdef WITH_SSH1 | ||
53 | TEST_START("parse RSA1 from private"); | 55 | TEST_START("parse RSA1 from private"); |
54 | buf = load_file("rsa1_1"); | 56 | buf = load_file("rsa1_1"); |
55 | ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "rsa1_1", | 57 | ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "rsa1_1", |
@@ -81,7 +83,7 @@ sshkey_file_tests(void) | |||
81 | 83 | ||
82 | TEST_START("RSA1 key hex fingerprint"); | 84 | TEST_START("RSA1 key hex fingerprint"); |
83 | buf = load_text_file("rsa1_1.fp"); | 85 | buf = load_text_file("rsa1_1.fp"); |
84 | cp = sshkey_fingerprint(k1, SSH_FP_MD5, SSH_FP_HEX); | 86 | cp = sshkey_fingerprint(k1, SSH_DIGEST_MD5, SSH_FP_HEX); |
85 | ASSERT_PTR_NE(cp, NULL); | 87 | ASSERT_PTR_NE(cp, NULL); |
86 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 88 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
87 | sshbuf_free(buf); | 89 | sshbuf_free(buf); |
@@ -90,7 +92,7 @@ sshkey_file_tests(void) | |||
90 | 92 | ||
91 | TEST_START("RSA1 key bubblebabble fingerprint"); | 93 | TEST_START("RSA1 key bubblebabble fingerprint"); |
92 | buf = load_text_file("rsa1_1.fp.bb"); | 94 | buf = load_text_file("rsa1_1.fp.bb"); |
93 | cp = sshkey_fingerprint(k1, SSH_FP_SHA1, SSH_FP_BUBBLEBABBLE); | 95 | cp = sshkey_fingerprint(k1, SSH_DIGEST_SHA1, SSH_FP_BUBBLEBABBLE); |
94 | ASSERT_PTR_NE(cp, NULL); | 96 | ASSERT_PTR_NE(cp, NULL); |
95 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 97 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
96 | sshbuf_free(buf); | 98 | sshbuf_free(buf); |
@@ -98,6 +100,7 @@ sshkey_file_tests(void) | |||
98 | TEST_DONE(); | 100 | TEST_DONE(); |
99 | 101 | ||
100 | sshkey_free(k1); | 102 | sshkey_free(k1); |
103 | #endif | ||
101 | 104 | ||
102 | TEST_START("parse RSA from private"); | 105 | TEST_START("parse RSA from private"); |
103 | buf = load_file("rsa_1"); | 106 | buf = load_file("rsa_1"); |
@@ -164,7 +167,7 @@ sshkey_file_tests(void) | |||
164 | 167 | ||
165 | TEST_START("RSA key hex fingerprint"); | 168 | TEST_START("RSA key hex fingerprint"); |
166 | buf = load_text_file("rsa_1.fp"); | 169 | buf = load_text_file("rsa_1.fp"); |
167 | cp = sshkey_fingerprint(k1, SSH_FP_MD5, SSH_FP_HEX); | 170 | cp = sshkey_fingerprint(k1, SSH_DIGEST_MD5, SSH_FP_HEX); |
168 | ASSERT_PTR_NE(cp, NULL); | 171 | ASSERT_PTR_NE(cp, NULL); |
169 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 172 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
170 | sshbuf_free(buf); | 173 | sshbuf_free(buf); |
@@ -173,7 +176,7 @@ sshkey_file_tests(void) | |||
173 | 176 | ||
174 | TEST_START("RSA cert hex fingerprint"); | 177 | TEST_START("RSA cert hex fingerprint"); |
175 | buf = load_text_file("rsa_1-cert.fp"); | 178 | buf = load_text_file("rsa_1-cert.fp"); |
176 | cp = sshkey_fingerprint(k2, SSH_FP_MD5, SSH_FP_HEX); | 179 | cp = sshkey_fingerprint(k2, SSH_DIGEST_MD5, SSH_FP_HEX); |
177 | ASSERT_PTR_NE(cp, NULL); | 180 | ASSERT_PTR_NE(cp, NULL); |
178 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 181 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
179 | sshbuf_free(buf); | 182 | sshbuf_free(buf); |
@@ -183,7 +186,7 @@ sshkey_file_tests(void) | |||
183 | 186 | ||
184 | TEST_START("RSA key bubblebabble fingerprint"); | 187 | TEST_START("RSA key bubblebabble fingerprint"); |
185 | buf = load_text_file("rsa_1.fp.bb"); | 188 | buf = load_text_file("rsa_1.fp.bb"); |
186 | cp = sshkey_fingerprint(k1, SSH_FP_SHA1, SSH_FP_BUBBLEBABBLE); | 189 | cp = sshkey_fingerprint(k1, SSH_DIGEST_SHA1, SSH_FP_BUBBLEBABBLE); |
187 | ASSERT_PTR_NE(cp, NULL); | 190 | ASSERT_PTR_NE(cp, NULL); |
188 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 191 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
189 | sshbuf_free(buf); | 192 | sshbuf_free(buf); |
@@ -257,7 +260,7 @@ sshkey_file_tests(void) | |||
257 | 260 | ||
258 | TEST_START("DSA key hex fingerprint"); | 261 | TEST_START("DSA key hex fingerprint"); |
259 | buf = load_text_file("dsa_1.fp"); | 262 | buf = load_text_file("dsa_1.fp"); |
260 | cp = sshkey_fingerprint(k1, SSH_FP_MD5, SSH_FP_HEX); | 263 | cp = sshkey_fingerprint(k1, SSH_DIGEST_MD5, SSH_FP_HEX); |
261 | ASSERT_PTR_NE(cp, NULL); | 264 | ASSERT_PTR_NE(cp, NULL); |
262 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 265 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
263 | sshbuf_free(buf); | 266 | sshbuf_free(buf); |
@@ -266,7 +269,7 @@ sshkey_file_tests(void) | |||
266 | 269 | ||
267 | TEST_START("DSA cert hex fingerprint"); | 270 | TEST_START("DSA cert hex fingerprint"); |
268 | buf = load_text_file("dsa_1-cert.fp"); | 271 | buf = load_text_file("dsa_1-cert.fp"); |
269 | cp = sshkey_fingerprint(k2, SSH_FP_MD5, SSH_FP_HEX); | 272 | cp = sshkey_fingerprint(k2, SSH_DIGEST_MD5, SSH_FP_HEX); |
270 | ASSERT_PTR_NE(cp, NULL); | 273 | ASSERT_PTR_NE(cp, NULL); |
271 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 274 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
272 | sshbuf_free(buf); | 275 | sshbuf_free(buf); |
@@ -276,7 +279,7 @@ sshkey_file_tests(void) | |||
276 | 279 | ||
277 | TEST_START("DSA key bubblebabble fingerprint"); | 280 | TEST_START("DSA key bubblebabble fingerprint"); |
278 | buf = load_text_file("dsa_1.fp.bb"); | 281 | buf = load_text_file("dsa_1.fp.bb"); |
279 | cp = sshkey_fingerprint(k1, SSH_FP_SHA1, SSH_FP_BUBBLEBABBLE); | 282 | cp = sshkey_fingerprint(k1, SSH_DIGEST_SHA1, SSH_FP_BUBBLEBABBLE); |
280 | ASSERT_PTR_NE(cp, NULL); | 283 | ASSERT_PTR_NE(cp, NULL); |
281 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 284 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
282 | sshbuf_free(buf); | 285 | sshbuf_free(buf); |
@@ -357,7 +360,7 @@ sshkey_file_tests(void) | |||
357 | 360 | ||
358 | TEST_START("ECDSA key hex fingerprint"); | 361 | TEST_START("ECDSA key hex fingerprint"); |
359 | buf = load_text_file("ecdsa_1.fp"); | 362 | buf = load_text_file("ecdsa_1.fp"); |
360 | cp = sshkey_fingerprint(k1, SSH_FP_MD5, SSH_FP_HEX); | 363 | cp = sshkey_fingerprint(k1, SSH_DIGEST_MD5, SSH_FP_HEX); |
361 | ASSERT_PTR_NE(cp, NULL); | 364 | ASSERT_PTR_NE(cp, NULL); |
362 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 365 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
363 | sshbuf_free(buf); | 366 | sshbuf_free(buf); |
@@ -366,7 +369,7 @@ sshkey_file_tests(void) | |||
366 | 369 | ||
367 | TEST_START("ECDSA cert hex fingerprint"); | 370 | TEST_START("ECDSA cert hex fingerprint"); |
368 | buf = load_text_file("ecdsa_1-cert.fp"); | 371 | buf = load_text_file("ecdsa_1-cert.fp"); |
369 | cp = sshkey_fingerprint(k2, SSH_FP_MD5, SSH_FP_HEX); | 372 | cp = sshkey_fingerprint(k2, SSH_DIGEST_MD5, SSH_FP_HEX); |
370 | ASSERT_PTR_NE(cp, NULL); | 373 | ASSERT_PTR_NE(cp, NULL); |
371 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 374 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
372 | sshbuf_free(buf); | 375 | sshbuf_free(buf); |
@@ -376,7 +379,7 @@ sshkey_file_tests(void) | |||
376 | 379 | ||
377 | TEST_START("ECDSA key bubblebabble fingerprint"); | 380 | TEST_START("ECDSA key bubblebabble fingerprint"); |
378 | buf = load_text_file("ecdsa_1.fp.bb"); | 381 | buf = load_text_file("ecdsa_1.fp.bb"); |
379 | cp = sshkey_fingerprint(k1, SSH_FP_SHA1, SSH_FP_BUBBLEBABBLE); | 382 | cp = sshkey_fingerprint(k1, SSH_DIGEST_SHA1, SSH_FP_BUBBLEBABBLE); |
380 | ASSERT_PTR_NE(cp, NULL); | 383 | ASSERT_PTR_NE(cp, NULL); |
381 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 384 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
382 | sshbuf_free(buf); | 385 | sshbuf_free(buf); |
@@ -424,7 +427,7 @@ sshkey_file_tests(void) | |||
424 | 427 | ||
425 | TEST_START("Ed25519 key hex fingerprint"); | 428 | TEST_START("Ed25519 key hex fingerprint"); |
426 | buf = load_text_file("ed25519_1.fp"); | 429 | buf = load_text_file("ed25519_1.fp"); |
427 | cp = sshkey_fingerprint(k1, SSH_FP_MD5, SSH_FP_HEX); | 430 | cp = sshkey_fingerprint(k1, SSH_DIGEST_MD5, SSH_FP_HEX); |
428 | ASSERT_PTR_NE(cp, NULL); | 431 | ASSERT_PTR_NE(cp, NULL); |
429 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 432 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
430 | sshbuf_free(buf); | 433 | sshbuf_free(buf); |
@@ -433,7 +436,7 @@ sshkey_file_tests(void) | |||
433 | 436 | ||
434 | TEST_START("Ed25519 cert hex fingerprint"); | 437 | TEST_START("Ed25519 cert hex fingerprint"); |
435 | buf = load_text_file("ed25519_1-cert.fp"); | 438 | buf = load_text_file("ed25519_1-cert.fp"); |
436 | cp = sshkey_fingerprint(k2, SSH_FP_MD5, SSH_FP_HEX); | 439 | cp = sshkey_fingerprint(k2, SSH_DIGEST_MD5, SSH_FP_HEX); |
437 | ASSERT_PTR_NE(cp, NULL); | 440 | ASSERT_PTR_NE(cp, NULL); |
438 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 441 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
439 | sshbuf_free(buf); | 442 | sshbuf_free(buf); |
@@ -443,7 +446,7 @@ sshkey_file_tests(void) | |||
443 | 446 | ||
444 | TEST_START("Ed25519 key bubblebabble fingerprint"); | 447 | TEST_START("Ed25519 key bubblebabble fingerprint"); |
445 | buf = load_text_file("ed25519_1.fp.bb"); | 448 | buf = load_text_file("ed25519_1.fp.bb"); |
446 | cp = sshkey_fingerprint(k1, SSH_FP_SHA1, SSH_FP_BUBBLEBABBLE); | 449 | cp = sshkey_fingerprint(k1, SSH_DIGEST_SHA1, SSH_FP_BUBBLEBABBLE); |
447 | ASSERT_PTR_NE(cp, NULL); | 450 | ASSERT_PTR_NE(cp, NULL); |
448 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 451 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
449 | sshbuf_free(buf); | 452 | sshbuf_free(buf); |