diff options
Diffstat (limited to 'regress/unittests/sshkey/test_file.c')
-rw-r--r-- | regress/unittests/sshkey/test_file.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/regress/unittests/sshkey/test_file.c b/regress/unittests/sshkey/test_file.c index 764f7fb76..9c38a7c61 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.2 2014/12/22 02:15:52 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 | ||
@@ -81,7 +82,7 @@ sshkey_file_tests(void) | |||
81 | 82 | ||
82 | TEST_START("RSA1 key hex fingerprint"); | 83 | TEST_START("RSA1 key hex fingerprint"); |
83 | buf = load_text_file("rsa1_1.fp"); | 84 | buf = load_text_file("rsa1_1.fp"); |
84 | cp = sshkey_fingerprint(k1, SSH_FP_MD5, SSH_FP_HEX); | 85 | cp = sshkey_fingerprint(k1, SSH_DIGEST_MD5, SSH_FP_HEX); |
85 | ASSERT_PTR_NE(cp, NULL); | 86 | ASSERT_PTR_NE(cp, NULL); |
86 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 87 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
87 | sshbuf_free(buf); | 88 | sshbuf_free(buf); |
@@ -90,7 +91,7 @@ sshkey_file_tests(void) | |||
90 | 91 | ||
91 | TEST_START("RSA1 key bubblebabble fingerprint"); | 92 | TEST_START("RSA1 key bubblebabble fingerprint"); |
92 | buf = load_text_file("rsa1_1.fp.bb"); | 93 | buf = load_text_file("rsa1_1.fp.bb"); |
93 | cp = sshkey_fingerprint(k1, SSH_FP_SHA1, SSH_FP_BUBBLEBABBLE); | 94 | cp = sshkey_fingerprint(k1, SSH_DIGEST_SHA1, SSH_FP_BUBBLEBABBLE); |
94 | ASSERT_PTR_NE(cp, NULL); | 95 | ASSERT_PTR_NE(cp, NULL); |
95 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 96 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
96 | sshbuf_free(buf); | 97 | sshbuf_free(buf); |
@@ -164,7 +165,7 @@ sshkey_file_tests(void) | |||
164 | 165 | ||
165 | TEST_START("RSA key hex fingerprint"); | 166 | TEST_START("RSA key hex fingerprint"); |
166 | buf = load_text_file("rsa_1.fp"); | 167 | buf = load_text_file("rsa_1.fp"); |
167 | cp = sshkey_fingerprint(k1, SSH_FP_MD5, SSH_FP_HEX); | 168 | cp = sshkey_fingerprint(k1, SSH_DIGEST_MD5, SSH_FP_HEX); |
168 | ASSERT_PTR_NE(cp, NULL); | 169 | ASSERT_PTR_NE(cp, NULL); |
169 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 170 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
170 | sshbuf_free(buf); | 171 | sshbuf_free(buf); |
@@ -173,7 +174,7 @@ sshkey_file_tests(void) | |||
173 | 174 | ||
174 | TEST_START("RSA cert hex fingerprint"); | 175 | TEST_START("RSA cert hex fingerprint"); |
175 | buf = load_text_file("rsa_1-cert.fp"); | 176 | buf = load_text_file("rsa_1-cert.fp"); |
176 | cp = sshkey_fingerprint(k2, SSH_FP_MD5, SSH_FP_HEX); | 177 | cp = sshkey_fingerprint(k2, SSH_DIGEST_MD5, SSH_FP_HEX); |
177 | ASSERT_PTR_NE(cp, NULL); | 178 | ASSERT_PTR_NE(cp, NULL); |
178 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 179 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
179 | sshbuf_free(buf); | 180 | sshbuf_free(buf); |
@@ -183,7 +184,7 @@ sshkey_file_tests(void) | |||
183 | 184 | ||
184 | TEST_START("RSA key bubblebabble fingerprint"); | 185 | TEST_START("RSA key bubblebabble fingerprint"); |
185 | buf = load_text_file("rsa_1.fp.bb"); | 186 | buf = load_text_file("rsa_1.fp.bb"); |
186 | cp = sshkey_fingerprint(k1, SSH_FP_SHA1, SSH_FP_BUBBLEBABBLE); | 187 | cp = sshkey_fingerprint(k1, SSH_DIGEST_SHA1, SSH_FP_BUBBLEBABBLE); |
187 | ASSERT_PTR_NE(cp, NULL); | 188 | ASSERT_PTR_NE(cp, NULL); |
188 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 189 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
189 | sshbuf_free(buf); | 190 | sshbuf_free(buf); |
@@ -257,7 +258,7 @@ sshkey_file_tests(void) | |||
257 | 258 | ||
258 | TEST_START("DSA key hex fingerprint"); | 259 | TEST_START("DSA key hex fingerprint"); |
259 | buf = load_text_file("dsa_1.fp"); | 260 | buf = load_text_file("dsa_1.fp"); |
260 | cp = sshkey_fingerprint(k1, SSH_FP_MD5, SSH_FP_HEX); | 261 | cp = sshkey_fingerprint(k1, SSH_DIGEST_MD5, SSH_FP_HEX); |
261 | ASSERT_PTR_NE(cp, NULL); | 262 | ASSERT_PTR_NE(cp, NULL); |
262 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 263 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
263 | sshbuf_free(buf); | 264 | sshbuf_free(buf); |
@@ -266,7 +267,7 @@ sshkey_file_tests(void) | |||
266 | 267 | ||
267 | TEST_START("DSA cert hex fingerprint"); | 268 | TEST_START("DSA cert hex fingerprint"); |
268 | buf = load_text_file("dsa_1-cert.fp"); | 269 | buf = load_text_file("dsa_1-cert.fp"); |
269 | cp = sshkey_fingerprint(k2, SSH_FP_MD5, SSH_FP_HEX); | 270 | cp = sshkey_fingerprint(k2, SSH_DIGEST_MD5, SSH_FP_HEX); |
270 | ASSERT_PTR_NE(cp, NULL); | 271 | ASSERT_PTR_NE(cp, NULL); |
271 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 272 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
272 | sshbuf_free(buf); | 273 | sshbuf_free(buf); |
@@ -276,7 +277,7 @@ sshkey_file_tests(void) | |||
276 | 277 | ||
277 | TEST_START("DSA key bubblebabble fingerprint"); | 278 | TEST_START("DSA key bubblebabble fingerprint"); |
278 | buf = load_text_file("dsa_1.fp.bb"); | 279 | buf = load_text_file("dsa_1.fp.bb"); |
279 | cp = sshkey_fingerprint(k1, SSH_FP_SHA1, SSH_FP_BUBBLEBABBLE); | 280 | cp = sshkey_fingerprint(k1, SSH_DIGEST_SHA1, SSH_FP_BUBBLEBABBLE); |
280 | ASSERT_PTR_NE(cp, NULL); | 281 | ASSERT_PTR_NE(cp, NULL); |
281 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 282 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
282 | sshbuf_free(buf); | 283 | sshbuf_free(buf); |
@@ -357,7 +358,7 @@ sshkey_file_tests(void) | |||
357 | 358 | ||
358 | TEST_START("ECDSA key hex fingerprint"); | 359 | TEST_START("ECDSA key hex fingerprint"); |
359 | buf = load_text_file("ecdsa_1.fp"); | 360 | buf = load_text_file("ecdsa_1.fp"); |
360 | cp = sshkey_fingerprint(k1, SSH_FP_MD5, SSH_FP_HEX); | 361 | cp = sshkey_fingerprint(k1, SSH_DIGEST_MD5, SSH_FP_HEX); |
361 | ASSERT_PTR_NE(cp, NULL); | 362 | ASSERT_PTR_NE(cp, NULL); |
362 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 363 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
363 | sshbuf_free(buf); | 364 | sshbuf_free(buf); |
@@ -366,7 +367,7 @@ sshkey_file_tests(void) | |||
366 | 367 | ||
367 | TEST_START("ECDSA cert hex fingerprint"); | 368 | TEST_START("ECDSA cert hex fingerprint"); |
368 | buf = load_text_file("ecdsa_1-cert.fp"); | 369 | buf = load_text_file("ecdsa_1-cert.fp"); |
369 | cp = sshkey_fingerprint(k2, SSH_FP_MD5, SSH_FP_HEX); | 370 | cp = sshkey_fingerprint(k2, SSH_DIGEST_MD5, SSH_FP_HEX); |
370 | ASSERT_PTR_NE(cp, NULL); | 371 | ASSERT_PTR_NE(cp, NULL); |
371 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 372 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
372 | sshbuf_free(buf); | 373 | sshbuf_free(buf); |
@@ -376,7 +377,7 @@ sshkey_file_tests(void) | |||
376 | 377 | ||
377 | TEST_START("ECDSA key bubblebabble fingerprint"); | 378 | TEST_START("ECDSA key bubblebabble fingerprint"); |
378 | buf = load_text_file("ecdsa_1.fp.bb"); | 379 | buf = load_text_file("ecdsa_1.fp.bb"); |
379 | cp = sshkey_fingerprint(k1, SSH_FP_SHA1, SSH_FP_BUBBLEBABBLE); | 380 | cp = sshkey_fingerprint(k1, SSH_DIGEST_SHA1, SSH_FP_BUBBLEBABBLE); |
380 | ASSERT_PTR_NE(cp, NULL); | 381 | ASSERT_PTR_NE(cp, NULL); |
381 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 382 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
382 | sshbuf_free(buf); | 383 | sshbuf_free(buf); |
@@ -424,7 +425,7 @@ sshkey_file_tests(void) | |||
424 | 425 | ||
425 | TEST_START("Ed25519 key hex fingerprint"); | 426 | TEST_START("Ed25519 key hex fingerprint"); |
426 | buf = load_text_file("ed25519_1.fp"); | 427 | buf = load_text_file("ed25519_1.fp"); |
427 | cp = sshkey_fingerprint(k1, SSH_FP_MD5, SSH_FP_HEX); | 428 | cp = sshkey_fingerprint(k1, SSH_DIGEST_MD5, SSH_FP_HEX); |
428 | ASSERT_PTR_NE(cp, NULL); | 429 | ASSERT_PTR_NE(cp, NULL); |
429 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 430 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
430 | sshbuf_free(buf); | 431 | sshbuf_free(buf); |
@@ -433,7 +434,7 @@ sshkey_file_tests(void) | |||
433 | 434 | ||
434 | TEST_START("Ed25519 cert hex fingerprint"); | 435 | TEST_START("Ed25519 cert hex fingerprint"); |
435 | buf = load_text_file("ed25519_1-cert.fp"); | 436 | buf = load_text_file("ed25519_1-cert.fp"); |
436 | cp = sshkey_fingerprint(k2, SSH_FP_MD5, SSH_FP_HEX); | 437 | cp = sshkey_fingerprint(k2, SSH_DIGEST_MD5, SSH_FP_HEX); |
437 | ASSERT_PTR_NE(cp, NULL); | 438 | ASSERT_PTR_NE(cp, NULL); |
438 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 439 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
439 | sshbuf_free(buf); | 440 | sshbuf_free(buf); |
@@ -443,7 +444,7 @@ sshkey_file_tests(void) | |||
443 | 444 | ||
444 | TEST_START("Ed25519 key bubblebabble fingerprint"); | 445 | TEST_START("Ed25519 key bubblebabble fingerprint"); |
445 | buf = load_text_file("ed25519_1.fp.bb"); | 446 | buf = load_text_file("ed25519_1.fp.bb"); |
446 | cp = sshkey_fingerprint(k1, SSH_FP_SHA1, SSH_FP_BUBBLEBABBLE); | 447 | cp = sshkey_fingerprint(k1, SSH_DIGEST_SHA1, SSH_FP_BUBBLEBABBLE); |
447 | ASSERT_PTR_NE(cp, NULL); | 448 | ASSERT_PTR_NE(cp, NULL); |
448 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); | 449 | ASSERT_STRING_EQ(cp, (const char *)sshbuf_ptr(buf)); |
449 | sshbuf_free(buf); | 450 | sshbuf_free(buf); |