New upstream release (7.0p1).

1 files changed, 7 insertions, 5 deletions

diff --git a/regress/unittests/sshkey/test_sshkey.c b/regress/unittests/sshkey/test_sshkey.c
index 4453a8599..9b3ce7ee4 100644
--- a/regress/unittests/sshkey/test_sshkey.c
+++ b/regress/unittests/sshkey/test_sshkey.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: test_sshkey.c,v 1.4 2015/04/22 01:38:36 djm Exp $ */
+/*      $OpenBSD: test_sshkey.c,v 1.7 2015/08/05 05:27:33 djm Exp $ */
 /*
  * Regress test for sshkey.h key management API
  *
@@ -288,13 +288,15 @@ sshkey_tests(void)
 #endif
 
         TEST_START("generate KEY_RSA");
-        ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 768, &kr), 0);
+        ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 767, &kr),
+            SSH_ERR_INVALID_ARGUMENT);
+        ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 1024, &kr), 0);
         ASSERT_PTR_NE(kr, NULL);
         ASSERT_PTR_NE(kr->rsa, NULL);
         ASSERT_PTR_NE(kr->rsa->n, NULL);
         ASSERT_PTR_NE(kr->rsa->e, NULL);
         ASSERT_PTR_NE(kr->rsa->p, NULL);
-        ASSERT_INT_EQ(BN_num_bits(kr->rsa->n), 768);
+        ASSERT_INT_EQ(BN_num_bits(kr->rsa->n), 1024);
         TEST_DONE();
 
         TEST_START("generate KEY_DSA");
@@ -397,7 +399,7 @@ sshkey_tests(void)
         TEST_DONE();
 
         TEST_START("equal different keys");
-        ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 768, &k1), 0);
+        ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 1024, &k1), 0);
         ASSERT_INT_EQ(sshkey_equal(kr, k1), 0);
         sshkey_free(k1);
         ASSERT_INT_EQ(sshkey_generate(KEY_DSA, 1024, &k1), 0);
@@ -424,7 +426,7 @@ sshkey_tests(void)
         ASSERT_INT_EQ(sshkey_load_public(test_data_file("ed25519_1.pub"),
             &k1, NULL), 0);
         k2 = get_private("ed25519_2");
-        ASSERT_INT_EQ(sshkey_to_certified(k1, 0), 0);
+        ASSERT_INT_EQ(sshkey_to_certified(k1), 0);
         ASSERT_PTR_NE(k1->cert, NULL);
         k1->cert->type = SSH2_CERT_TYPE_USER;
         k1->cert->serial = 1234;