Deleted Added
sdiff udiff text old ( 294336 ) new ( 294464 )
full compact
test_sshkey.c (294336) test_sshkey.c (294464)
1/* $OpenBSD: test_sshkey.c,v 1.4 2015/04/22 01:38:36 djm Exp $ */
1/* $OpenBSD: test_sshkey.c,v 1.7 2015/08/05 05:27:33 djm Exp $ */
2/*
3 * Regress test for sshkey.h key management API
4 *
5 * Placed in the public domain
6 */
7
8#include "includes.h"
9

--- 273 unchanged lines hidden (view full) ---

283 ASSERT_INT_EQ(sshkey_generate(KEY_ECDSA, 42, &k1),
284 SSH_ERR_INVALID_ARGUMENT);
285 ASSERT_PTR_EQ(k1, NULL);
286 sshkey_free(k1);
287 TEST_DONE();
288#endif
289
290 TEST_START("generate KEY_RSA");
2/*
3 * Regress test for sshkey.h key management API
4 *
5 * Placed in the public domain
6 */
7
8#include "includes.h"
9

--- 273 unchanged lines hidden (view full) ---

283 ASSERT_INT_EQ(sshkey_generate(KEY_ECDSA, 42, &k1),
284 SSH_ERR_INVALID_ARGUMENT);
285 ASSERT_PTR_EQ(k1, NULL);
286 sshkey_free(k1);
287 TEST_DONE();
288#endif
289
290 TEST_START("generate KEY_RSA");
291 ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 768, &kr), 0);
291 ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 767, &kr),
292 SSH_ERR_INVALID_ARGUMENT);
293 ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 1024, &kr), 0);
292 ASSERT_PTR_NE(kr, NULL);
293 ASSERT_PTR_NE(kr->rsa, NULL);
294 ASSERT_PTR_NE(kr->rsa->n, NULL);
295 ASSERT_PTR_NE(kr->rsa->e, NULL);
296 ASSERT_PTR_NE(kr->rsa->p, NULL);
294 ASSERT_PTR_NE(kr, NULL);
295 ASSERT_PTR_NE(kr->rsa, NULL);
296 ASSERT_PTR_NE(kr->rsa->n, NULL);
297 ASSERT_PTR_NE(kr->rsa->e, NULL);
298 ASSERT_PTR_NE(kr->rsa->p, NULL);
297 ASSERT_INT_EQ(BN_num_bits(kr->rsa->n), 768);
299 ASSERT_INT_EQ(BN_num_bits(kr->rsa->n), 1024);
298 TEST_DONE();
299
300 TEST_START("generate KEY_DSA");
301 ASSERT_INT_EQ(sshkey_generate(KEY_DSA, 1024, &kd), 0);
302 ASSERT_PTR_NE(kd, NULL);
303 ASSERT_PTR_NE(kd->dsa, NULL);
304 ASSERT_PTR_NE(kd->dsa->g, NULL);
305 ASSERT_PTR_NE(kd->dsa->priv_key, NULL);

--- 86 unchanged lines hidden (view full) ---

392 ASSERT_INT_EQ(sshkey_equal(kd, ke), 0);
393 ASSERT_INT_EQ(sshkey_equal(kr, ke), 0);
394 ASSERT_INT_EQ(sshkey_equal(ke, kf), 0);
395#endif
396 ASSERT_INT_EQ(sshkey_equal(kd, kf), 0);
397 TEST_DONE();
398
399 TEST_START("equal different keys");
300 TEST_DONE();
301
302 TEST_START("generate KEY_DSA");
303 ASSERT_INT_EQ(sshkey_generate(KEY_DSA, 1024, &kd), 0);
304 ASSERT_PTR_NE(kd, NULL);
305 ASSERT_PTR_NE(kd->dsa, NULL);
306 ASSERT_PTR_NE(kd->dsa->g, NULL);
307 ASSERT_PTR_NE(kd->dsa->priv_key, NULL);

--- 86 unchanged lines hidden (view full) ---

394 ASSERT_INT_EQ(sshkey_equal(kd, ke), 0);
395 ASSERT_INT_EQ(sshkey_equal(kr, ke), 0);
396 ASSERT_INT_EQ(sshkey_equal(ke, kf), 0);
397#endif
398 ASSERT_INT_EQ(sshkey_equal(kd, kf), 0);
399 TEST_DONE();
400
401 TEST_START("equal different keys");
400 ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 768, &k1), 0);
402 ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 1024, &k1), 0);
401 ASSERT_INT_EQ(sshkey_equal(kr, k1), 0);
402 sshkey_free(k1);
403 ASSERT_INT_EQ(sshkey_generate(KEY_DSA, 1024, &k1), 0);
404 ASSERT_INT_EQ(sshkey_equal(kd, k1), 0);
405 sshkey_free(k1);
406#ifdef OPENSSL_HAS_ECC
407 ASSERT_INT_EQ(sshkey_generate(KEY_ECDSA, 256, &k1), 0);
408 ASSERT_INT_EQ(sshkey_equal(ke, k1), 0);

--- 10 unchanged lines hidden (view full) ---

419 sshkey_free(ke);
420#endif
421 sshkey_free(kf);
422
423 TEST_START("certify key");
424 ASSERT_INT_EQ(sshkey_load_public(test_data_file("ed25519_1.pub"),
425 &k1, NULL), 0);
426 k2 = get_private("ed25519_2");
403 ASSERT_INT_EQ(sshkey_equal(kr, k1), 0);
404 sshkey_free(k1);
405 ASSERT_INT_EQ(sshkey_generate(KEY_DSA, 1024, &k1), 0);
406 ASSERT_INT_EQ(sshkey_equal(kd, k1), 0);
407 sshkey_free(k1);
408#ifdef OPENSSL_HAS_ECC
409 ASSERT_INT_EQ(sshkey_generate(KEY_ECDSA, 256, &k1), 0);
410 ASSERT_INT_EQ(sshkey_equal(ke, k1), 0);

--- 10 unchanged lines hidden (view full) ---

421 sshkey_free(ke);
422#endif
423 sshkey_free(kf);
424
425 TEST_START("certify key");
426 ASSERT_INT_EQ(sshkey_load_public(test_data_file("ed25519_1.pub"),
427 &k1, NULL), 0);
428 k2 = get_private("ed25519_2");
427 ASSERT_INT_EQ(sshkey_to_certified(k1, 0), 0);
429 ASSERT_INT_EQ(sshkey_to_certified(k1), 0);
428 ASSERT_PTR_NE(k1->cert, NULL);
429 k1->cert->type = SSH2_CERT_TYPE_USER;
430 k1->cert->serial = 1234;
431 k1->cert->key_id = strdup("estragon");
432 ASSERT_PTR_NE(k1->cert->key_id, NULL);
433 k1->cert->principals = calloc(4, sizeof(*k1->cert->principals));
434 ASSERT_PTR_NE(k1->cert->principals, NULL);
435 k1->cert->principals[0] = strdup("estragon");

--- 84 unchanged lines hidden --- 		430 ASSERT_PTR_NE(k1->cert, NULL);
431 k1->cert->type = SSH2_CERT_TYPE_USER;
432 k1->cert->serial = 1234;
433 k1->cert->key_id = strdup("estragon");
434 ASSERT_PTR_NE(k1->cert->key_id, NULL);
435 k1->cert->principals = calloc(4, sizeof(*k1->cert->principals));
436 ASSERT_PTR_NE(k1->cert->principals, NULL);
437 k1->cert->principals[0] = strdup("estragon");

--- 84 unchanged lines hidden ---