summaryrefslogtreecommitdiff
path: root/regress/unittests/sshkey/test_sshkey.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2017-10-04 11:23:58 +0100
committerColin Watson <cjwatson@debian.org>2017-10-05 23:58:12 +0100
commit0556ea972b15607b7e13ff31bc05840881c91dd3 (patch)
treed6b8d48062d0278b5ae0eeff42d0e9afa9f26860 /regress/unittests/sshkey/test_sshkey.c
parentdb2122d97eb1ecdd8d99b7bf79b0dd2b5addfd92 (diff)
parent801a62eedaaf47b20dbf4b426dc3e084bf0c8d49 (diff)
New upstream release (7.6p1)
Diffstat (limited to 'regress/unittests/sshkey/test_sshkey.c')
-rw-r--r--regress/unittests/sshkey/test_sshkey.c22
1 files changed, 6 insertions, 16 deletions
diff --git a/regress/unittests/sshkey/test_sshkey.c b/regress/unittests/sshkey/test_sshkey.c
index 1476dc2e3..0a73322a3 100644
--- a/regress/unittests/sshkey/test_sshkey.c
+++ b/regress/unittests/sshkey/test_sshkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: test_sshkey.c,v 1.10 2016/05/02 09:52:00 djm Exp $ */ 1/* $OpenBSD: test_sshkey.c,v 1.12 2017/05/08 06:08:42 djm Exp $ */
2/* 2/*
3 * Regress test for sshkey.h key management API 3 * Regress test for sshkey.h key management API
4 * 4 *
@@ -193,16 +193,6 @@ sshkey_tests(void)
193 sshkey_free(k1); 193 sshkey_free(k1);
194 TEST_DONE(); 194 TEST_DONE();
195 195
196 TEST_START("new/free KEY_RSA1");
197 k1 = sshkey_new(KEY_RSA1);
198 ASSERT_PTR_NE(k1, NULL);
199 ASSERT_PTR_NE(k1->rsa, NULL);
200 ASSERT_PTR_NE(k1->rsa->n, NULL);
201 ASSERT_PTR_NE(k1->rsa->e, NULL);
202 ASSERT_PTR_EQ(k1->rsa->p, NULL);
203 sshkey_free(k1);
204 TEST_DONE();
205
206 TEST_START("new/free KEY_RSA"); 196 TEST_START("new/free KEY_RSA");
207 k1 = sshkey_new(KEY_RSA); 197 k1 = sshkey_new(KEY_RSA);
208 ASSERT_PTR_NE(k1, NULL); 198 ASSERT_PTR_NE(k1, NULL);
@@ -263,19 +253,19 @@ sshkey_tests(void)
263 253
264 TEST_START("generate KEY_RSA too small modulus"); 254 TEST_START("generate KEY_RSA too small modulus");
265 ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 128, &k1), 255 ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 128, &k1),
266 SSH_ERR_INVALID_ARGUMENT); 256 SSH_ERR_KEY_LENGTH);
267 ASSERT_PTR_EQ(k1, NULL); 257 ASSERT_PTR_EQ(k1, NULL);
268 TEST_DONE(); 258 TEST_DONE();
269 259
270 TEST_START("generate KEY_RSA too large modulus"); 260 TEST_START("generate KEY_RSA too large modulus");
271 ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 1 << 20, &k1), 261 ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 1 << 20, &k1),
272 SSH_ERR_INVALID_ARGUMENT); 262 SSH_ERR_KEY_LENGTH);
273 ASSERT_PTR_EQ(k1, NULL); 263 ASSERT_PTR_EQ(k1, NULL);
274 TEST_DONE(); 264 TEST_DONE();
275 265
276 TEST_START("generate KEY_DSA wrong bits"); 266 TEST_START("generate KEY_DSA wrong bits");
277 ASSERT_INT_EQ(sshkey_generate(KEY_DSA, 2048, &k1), 267 ASSERT_INT_EQ(sshkey_generate(KEY_DSA, 2048, &k1),
278 SSH_ERR_INVALID_ARGUMENT); 268 SSH_ERR_KEY_LENGTH);
279 ASSERT_PTR_EQ(k1, NULL); 269 ASSERT_PTR_EQ(k1, NULL);
280 sshkey_free(k1); 270 sshkey_free(k1);
281 TEST_DONE(); 271 TEST_DONE();
@@ -283,7 +273,7 @@ sshkey_tests(void)
283#ifdef OPENSSL_HAS_ECC 273#ifdef OPENSSL_HAS_ECC
284 TEST_START("generate KEY_ECDSA wrong bits"); 274 TEST_START("generate KEY_ECDSA wrong bits");
285 ASSERT_INT_EQ(sshkey_generate(KEY_ECDSA, 42, &k1), 275 ASSERT_INT_EQ(sshkey_generate(KEY_ECDSA, 42, &k1),
286 SSH_ERR_INVALID_ARGUMENT); 276 SSH_ERR_KEY_LENGTH);
287 ASSERT_PTR_EQ(k1, NULL); 277 ASSERT_PTR_EQ(k1, NULL);
288 sshkey_free(k1); 278 sshkey_free(k1);
289 TEST_DONE(); 279 TEST_DONE();
@@ -291,7 +281,7 @@ sshkey_tests(void)
291 281
292 TEST_START("generate KEY_RSA"); 282 TEST_START("generate KEY_RSA");
293 ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 767, &kr), 283 ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 767, &kr),
294 SSH_ERR_INVALID_ARGUMENT); 284 SSH_ERR_KEY_LENGTH);
295 ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 1024, &kr), 0); 285 ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 1024, &kr), 0);
296 ASSERT_PTR_NE(kr, NULL); 286 ASSERT_PTR_NE(kr, NULL);
297 ASSERT_PTR_NE(kr->rsa, NULL); 287 ASSERT_PTR_NE(kr->rsa, NULL);