From 13f99e8cb8f604d32051a264b7b82ec4bea80eee Mon Sep 17 00:00:00 2001 From: Manoj Ampalam Date: Sun, 5 Feb 2017 17:08:04 -0800 Subject: [PATCH] Undo unwanted changes to unittest files --- regress/netcat.c | 25 ++++------------------- regress/setuid-allowed.c | 4 ---- regress/unittests/hostkeys/test_iterate.c | 3 +-- regress/unittests/kex/test_kex.c | 4 ---- regress/unittests/sshbuf/tests.c | 4 ---- regress/unittests/sshkey/common.c | 5 +---- regress/unittests/sshkey/test_file.c | 6 ++---- regress/unittests/sshkey/test_sshkey.c | 11 +++------- regress/unittests/sshkey/tests.c | 3 +-- 9 files changed, 12 insertions(+), 53 deletions(-) diff --git a/regress/netcat.c b/regress/netcat.c index 91642df31..98a08b1ec 100644 --- a/regress/netcat.c +++ b/regress/netcat.c @@ -558,9 +558,8 @@ unix_connect(char *path) if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) return (-1); } -#ifndef WIN32_FIXME (void)fcntl(s, F_SETFD, FD_CLOEXEC); -#endif + memset(&sun_sa, 0, sizeof(struct sockaddr_un)); sun_sa.sun_family = AF_UNIX; @@ -670,13 +669,12 @@ timeout_connect(int s, const struct sockaddr *name, socklen_t namelen) socklen_t optlen; int flags = 0, optval; int ret; -#ifndef WIN32_FIXME + if (timeout != -1) { flags = fcntl(s, F_GETFL, 0); if (fcntl(s, F_SETFL, flags | O_NONBLOCK) == -1) err(1, "set non-blocking mode"); } -#endif if ((ret = connect(s, name, namelen)) != 0 && errno == EINPROGRESS) { pfd.fd = s; @@ -694,10 +692,10 @@ timeout_connect(int s, const struct sockaddr *name, socklen_t namelen) } else err(1, "poll failed"); } -#ifndef WIN32_FIXME + if (timeout != -1 && fcntl(s, F_SETFL, flags) == -1) err(1, "restoring flags"); -#endif + return (ret); } @@ -766,13 +764,6 @@ local_listen(char *host, char *port, struct addrinfo hints) * readwrite() * Loop that polls on the network file descriptor and stdin. */ - -#ifdef WIN32_FIXME -#define POLLNVAL 0x0020 -#define POLLHUP 0x0010 -#define RPP_REQUIRE_TTY 0x02 /* Fail if there is no tty. */ -#endif - void readwrite(int net_fd) { @@ -1222,9 +1213,7 @@ map_tos(char *s, int *val) { "af41", IPTOS_DSCP_AF41 }, { "af42", IPTOS_DSCP_AF42 }, { "af43", IPTOS_DSCP_AF43 }, -#ifndef WIN32_FIXME { "critical", IPTOS_PREC_CRITIC_ECP }, -#endif { "cs0", IPTOS_DSCP_CS0 }, { "cs1", IPTOS_DSCP_CS1 }, { "cs2", IPTOS_DSCP_CS2 }, @@ -1234,13 +1223,9 @@ map_tos(char *s, int *val) { "cs6", IPTOS_DSCP_CS6 }, { "cs7", IPTOS_DSCP_CS7 }, { "ef", IPTOS_DSCP_EF }, -#ifndef WIN32_FIXME { "inetcontrol", IPTOS_PREC_INTERNETCONTROL }, -#endif { "lowdelay", IPTOS_LOWDELAY }, -#ifndef WIN32_FIXME { "netcontrol", IPTOS_PREC_NETCONTROL }, -#endif { "reliability", IPTOS_RELIABILITY }, { "throughput", IPTOS_THROUGHPUT }, { NULL, -1 }, @@ -1450,10 +1435,8 @@ getproxypass(const char *proxyuser, const char *proxyhost) snprintf(prompt, sizeof(prompt), "Proxy password for %s@%s: ", proxyuser, proxyhost); -#ifndef WIN32_FIXME if (readpassphrase(prompt, pw, sizeof(pw), RPP_REQUIRE_TTY) == NULL) errx(1, "Unable to read proxy passphrase"); -#endif return (pw); } diff --git a/regress/setuid-allowed.c b/regress/setuid-allowed.c index 3fcbae8ec..7a0527fd0 100644 --- a/regress/setuid-allowed.c +++ b/regress/setuid-allowed.c @@ -26,10 +26,6 @@ #include #include -#ifdef WIN32_FIXME -void debug3(const char *fmt,...) {/*stub*/} -#endif -void static void usage(void) { diff --git a/regress/unittests/hostkeys/test_iterate.c b/regress/unittests/hostkeys/test_iterate.c index 38cf32be4..2eaaf063a 100644 --- a/regress/unittests/hostkeys/test_iterate.c +++ b/regress/unittests/hostkeys/test_iterate.c @@ -61,6 +61,7 @@ check(struct hostkey_foreach_line *l, void *_ctx) test_subtest_info("entry %zu/%zu, file line %ld", ctx->i + 1, ctx->nexpected, l->linenum); + for (;;) { ASSERT_SIZE_T_LT(ctx->i, ctx->nexpected); expected = ctx->expected + ctx->i++; @@ -281,7 +282,6 @@ struct expected expected_full[] = { NULL, /* filled at runtime */ "DSA #2", } }, -#ifdef OPENSSL_HAS_NISTP521 { "ecdsa_2.pub" , -1, -1, HKF_MATCH_HOST, 0, HKF_MATCH_IP, HKF_MATCH_IP, -1, { NULL, 10, @@ -295,7 +295,6 @@ struct expected expected_full[] = { NULL, /* filled at runtime */ "ECDSA #2", } }, -#endif { "ed25519_2.pub" , -1, -1, HKF_MATCH_HOST, 0, HKF_MATCH_IP, HKF_MATCH_IP, -1, { NULL, 11, diff --git a/regress/unittests/kex/test_kex.c b/regress/unittests/kex/test_kex.c index 5bb9a2f88..6e5999bb9 100644 --- a/regress/unittests/kex/test_kex.c +++ b/regress/unittests/kex/test_kex.c @@ -145,12 +145,10 @@ do_kex_with_key(char *kex, int keytype, int bits) sshbuf_free(state); ASSERT_PTR_NE(server2->kex, NULL); /* XXX we need to set the callbacks */ -#ifdef WITH_OPENSSL server2->kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; server2->kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; server2->kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; server2->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; -#endif #ifdef OPENSSL_HAS_ECC server2->kex->kex[KEX_ECDH_SHA2] = kexecdh_server; #endif @@ -195,9 +193,7 @@ kex_tests(void) #ifdef OPENSSL_HAS_ECC do_kex("ecdh-sha2-nistp256"); do_kex("ecdh-sha2-nistp384"); -#ifdef OPENSSL_HAS_NISTP521 do_kex("ecdh-sha2-nistp521"); -#endif #endif do_kex("diffie-hellman-group-exchange-sha256"); do_kex("diffie-hellman-group-exchange-sha1"); diff --git a/regress/unittests/sshbuf/tests.c b/regress/unittests/sshbuf/tests.c index 21495b6b1..1557e4342 100644 --- a/regress/unittests/sshbuf/tests.c +++ b/regress/unittests/sshbuf/tests.c @@ -20,13 +20,9 @@ tests(void) { sshbuf_tests(); sshbuf_getput_basic_tests(); -#ifdef WITH_OPENSSL sshbuf_getput_crypto_tests(); -#endif sshbuf_misc_tests(); sshbuf_fuzz_tests(); -#ifdef WITH_OPENSSL sshbuf_getput_fuzz_tests(); -#endif sshbuf_fixed(); } diff --git a/regress/unittests/sshkey/common.c b/regress/unittests/sshkey/common.c index c8d5560b0..b598f05cb 100644 --- a/regress/unittests/sshkey/common.c +++ b/regress/unittests/sshkey/common.c @@ -19,12 +19,10 @@ #include #include -#ifdef WITH_OPENSSL #include #include #include #include -#endif #ifdef OPENSSL_HAS_NISTP256 # include #endif @@ -72,7 +70,6 @@ load_text_file(const char *name) return ret; } -#ifdef WITH_OPENSSL BIGNUM * load_bignum(const char *name) { @@ -84,4 +81,4 @@ load_bignum(const char *name) sshbuf_free(buf); return ret; } -#endif + diff --git a/regress/unittests/sshkey/test_file.c b/regress/unittests/sshkey/test_file.c index cebe0e980..906491f2b 100644 --- a/regress/unittests/sshkey/test_file.c +++ b/regress/unittests/sshkey/test_file.c @@ -101,7 +101,6 @@ sshkey_file_tests(void) sshkey_free(k1); #endif -#ifdef WITH_OPENSSL TEST_START("parse RSA from private"); buf = load_file("rsa_1"); ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0); @@ -136,7 +135,7 @@ sshkey_file_tests(void) ASSERT_INT_EQ(sshkey_equal(k1, k2), 1); sshkey_free(k2); TEST_DONE(); - + TEST_START("parse RSA from new-format w/ passphrase"); buf = load_file("rsa_n_pw"); ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, @@ -146,7 +145,7 @@ sshkey_file_tests(void) ASSERT_INT_EQ(sshkey_equal(k1, k2), 1); sshkey_free(k2); TEST_DONE(); - + TEST_START("load RSA from public"); ASSERT_INT_EQ(sshkey_load_public(test_data_file("rsa_1.pub"), &k2, NULL), 0); @@ -283,7 +282,6 @@ sshkey_file_tests(void) TEST_DONE(); sshkey_free(k1); -#endif #ifdef OPENSSL_HAS_ECC TEST_START("parse ECDSA from private"); diff --git a/regress/unittests/sshkey/test_sshkey.c b/regress/unittests/sshkey/test_sshkey.c index b6aae8326..1476dc2e3 100644 --- a/regress/unittests/sshkey/test_sshkey.c +++ b/regress/unittests/sshkey/test_sshkey.c @@ -193,7 +193,6 @@ sshkey_tests(void) sshkey_free(k1); TEST_DONE(); -#ifdef WITH_OPENSSL TEST_START("new/free KEY_RSA1"); k1 = sshkey_new(KEY_RSA1); ASSERT_PTR_NE(k1, NULL); @@ -222,7 +221,6 @@ sshkey_tests(void) ASSERT_PTR_EQ(k1->dsa->priv_key, NULL); sshkey_free(k1); TEST_DONE(); -#endif #ifdef OPENSSL_HAS_ECC TEST_START("new/free KEY_ECDSA"); @@ -242,7 +240,6 @@ sshkey_tests(void) sshkey_free(k1); TEST_DONE(); -#ifdef WITH_OPENSSL TEST_START("new_private KEY_RSA"); k1 = sshkey_new_private(KEY_RSA); ASSERT_PTR_NE(k1, NULL); @@ -311,7 +308,7 @@ sshkey_tests(void) ASSERT_PTR_NE(kd->dsa->g, NULL); ASSERT_PTR_NE(kd->dsa->priv_key, NULL); TEST_DONE(); -#endif + #ifdef OPENSSL_HAS_ECC TEST_START("generate KEY_ECDSA"); ASSERT_INT_EQ(sshkey_generate(KEY_ECDSA, 256, &ke), 0); @@ -330,7 +327,6 @@ sshkey_tests(void) ASSERT_PTR_NE(kf->ed25519_sk, NULL); TEST_DONE(); -#ifdef WITH_OPENSSL TEST_START("demote KEY_RSA"); ASSERT_INT_EQ(sshkey_demote(kr, &k1), 0); ASSERT_PTR_NE(k1, NULL); @@ -361,7 +357,6 @@ sshkey_tests(void) ASSERT_INT_EQ(sshkey_equal(kd, k1), 1); sshkey_free(k1); TEST_DONE(); -#endif #ifdef OPENSSL_HAS_ECC TEST_START("demote KEY_ECDSA"); @@ -508,7 +503,6 @@ sshkey_tests(void) sshkey_free(k2); TEST_DONE(); - #ifdef OPENSSL_HAS_ECC TEST_START("sign and verify ECDSA"); k1 = get_private("ecdsa_1"); @@ -518,6 +512,7 @@ sshkey_tests(void) sshkey_free(k1); sshkey_free(k2); TEST_DONE(); +#endif TEST_START("sign and verify ED25519"); k1 = get_private("ed25519_1"); @@ -542,5 +537,5 @@ sshkey_tests(void) sshkey_free(k3); sshbuf_free(b); TEST_DONE(); -#endif + } diff --git a/regress/unittests/sshkey/tests.c b/regress/unittests/sshkey/tests.c index 1b89eb941..13f265cdb 100644 --- a/regress/unittests/sshkey/tests.c +++ b/regress/unittests/sshkey/tests.c @@ -18,10 +18,9 @@ void sshkey_fuzz_tests(void); void tests(void) { -#ifdef WITH_OPENSSL OpenSSL_add_all_algorithms(); ERR_load_CRYPTO_strings(); -#endif + sshkey_tests(); sshkey_file_tests(); sshkey_fuzz_tests();