upstream commit

fix for new SSH_ERR_KEY_LENGTH error value

Upstream-Regress-ID: c38a6e6174d4c3feca3518df150d4fbae0dca8dc

diff --git a/regress/unittests/sshkey/test_sshkey.c b/regress/unittests/sshkey/test_sshkey.c
index 32f8cb63c5c72f1e30bef70f51693a97f1a715b7..0a73322a34e5a8a3f2f24c4652bbe64de02cdf2c 100644 (file)
--- a/regress/unittests/sshkey/test_sshkey.c
+++ b/regress/unittests/sshkey/test_sshkey.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: test_sshkey.c,v 1.11 2017/04/30 23:33:48 djm Exp $ */
+/*     $OpenBSD: test_sshkey.c,v 1.12 2017/05/08 06:08:42 djm Exp $ */
 /*
  * Regress test for sshkey.h key management API
  *
@@ -253,19 +253,19 @@ sshkey_tests(void)
 
        TEST_START("generate KEY_RSA too small modulus");
        ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 128, &k1),
-           SSH_ERR_INVALID_ARGUMENT);
+           SSH_ERR_KEY_LENGTH);
        ASSERT_PTR_EQ(k1, NULL);
        TEST_DONE();
 
        TEST_START("generate KEY_RSA too large modulus");
        ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 1 << 20, &k1),
-           SSH_ERR_INVALID_ARGUMENT);
+           SSH_ERR_KEY_LENGTH);
        ASSERT_PTR_EQ(k1, NULL);
        TEST_DONE();
 
        TEST_START("generate KEY_DSA wrong bits");
        ASSERT_INT_EQ(sshkey_generate(KEY_DSA, 2048, &k1),
-           SSH_ERR_INVALID_ARGUMENT);
+           SSH_ERR_KEY_LENGTH);
        ASSERT_PTR_EQ(k1, NULL);
        sshkey_free(k1);
        TEST_DONE();
@@ -273,7 +273,7 @@ sshkey_tests(void)
 #ifdef OPENSSL_HAS_ECC
        TEST_START("generate KEY_ECDSA wrong bits");
        ASSERT_INT_EQ(sshkey_generate(KEY_ECDSA, 42, &k1),
-           SSH_ERR_INVALID_ARGUMENT);
+           SSH_ERR_KEY_LENGTH);
        ASSERT_PTR_EQ(k1, NULL);
        sshkey_free(k1);
        TEST_DONE();
@@ -281,7 +281,7 @@ sshkey_tests(void)
 
        TEST_START("generate KEY_RSA");
        ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 767, &kr),
-           SSH_ERR_INVALID_ARGUMENT);
+           SSH_ERR_KEY_LENGTH);
        ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 1024, &kr), 0);
        ASSERT_PTR_NE(kr, NULL);
        ASSERT_PTR_NE(kr->rsa, NULL);