tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Undo unwanted changes to unittest files

Browse Source
This commit is contained in:
Manoj Ampalam 2017-02-05 17:08:04 -08:00
parent 42670c7867
commit 13f99e8cb8
9 changed files with 12 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
regress/netcat.c
View File

@ -558,9 +558,8 @@ unix_connect(char *path)
if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
return (-1); return (-1);
} }
#ifndef WIN32_FIXME
(void)fcntl(s, F_SETFD, FD_CLOEXEC); (void)fcntl(s, F_SETFD, FD_CLOEXEC);
#endif
memset(&sun_sa, 0, sizeof(struct sockaddr_un)); memset(&sun_sa, 0, sizeof(struct sockaddr_un));
sun_sa.sun_family = AF_UNIX; sun_sa.sun_family = AF_UNIX;
@ -670,13 +669,12 @@ timeout_connect(int s, const struct sockaddr *name, socklen_t namelen)
socklen_t optlen; socklen_t optlen;
int flags = 0, optval; int flags = 0, optval;
int ret; int ret;
#ifndef WIN32_FIXME
if (timeout != -1) { if (timeout != -1) {
flags = fcntl(s, F_GETFL, 0); flags = fcntl(s, F_GETFL, 0);
if (fcntl(s, F_SETFL, flags | O_NONBLOCK) == -1) if (fcntl(s, F_SETFL, flags | O_NONBLOCK) == -1)
err(1, "set non-blocking mode"); err(1, "set non-blocking mode");
} }
#endif
if ((ret = connect(s, name, namelen)) != 0 && errno == EINPROGRESS) { if ((ret = connect(s, name, namelen)) != 0 && errno == EINPROGRESS) {
pfd.fd = s; pfd.fd = s;
@ -694,10 +692,10 @@ timeout_connect(int s, const struct sockaddr *name, socklen_t namelen)
} else } else
err(1, "poll failed"); err(1, "poll failed");
} }
#ifndef WIN32_FIXME
if (timeout != -1 && fcntl(s, F_SETFL, flags) == -1) if (timeout != -1 && fcntl(s, F_SETFL, flags) == -1)
err(1, "restoring flags"); err(1, "restoring flags");
#endif
return (ret); return (ret);
} }
@ -766,13 +764,6 @@ local_listen(char *host, char *port, struct addrinfo hints)
* readwrite() * readwrite()
* Loop that polls on the network file descriptor and stdin. * 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 void
readwrite(int net_fd) readwrite(int net_fd)
{ {
@ -1222,9 +1213,7 @@ map_tos(char *s, int *val)
{ "af41", IPTOS_DSCP_AF41 }, { "af41", IPTOS_DSCP_AF41 },
{ "af42", IPTOS_DSCP_AF42 }, { "af42", IPTOS_DSCP_AF42 },
{ "af43", IPTOS_DSCP_AF43 }, { "af43", IPTOS_DSCP_AF43 },
#ifndef WIN32_FIXME
{ "critical", IPTOS_PREC_CRITIC_ECP }, { "critical", IPTOS_PREC_CRITIC_ECP },
#endif
{ "cs0", IPTOS_DSCP_CS0 }, { "cs0", IPTOS_DSCP_CS0 },
{ "cs1", IPTOS_DSCP_CS1 }, { "cs1", IPTOS_DSCP_CS1 },
{ "cs2", IPTOS_DSCP_CS2 }, { "cs2", IPTOS_DSCP_CS2 },
@ -1234,13 +1223,9 @@ map_tos(char *s, int *val)
{ "cs6", IPTOS_DSCP_CS6 }, { "cs6", IPTOS_DSCP_CS6 },
{ "cs7", IPTOS_DSCP_CS7 }, { "cs7", IPTOS_DSCP_CS7 },
{ "ef", IPTOS_DSCP_EF }, { "ef", IPTOS_DSCP_EF },
#ifndef WIN32_FIXME
{ "inetcontrol", IPTOS_PREC_INTERNETCONTROL }, { "inetcontrol", IPTOS_PREC_INTERNETCONTROL },
#endif
{ "lowdelay", IPTOS_LOWDELAY }, { "lowdelay", IPTOS_LOWDELAY },
#ifndef WIN32_FIXME
{ "netcontrol", IPTOS_PREC_NETCONTROL }, { "netcontrol", IPTOS_PREC_NETCONTROL },
#endif
{ "reliability", IPTOS_RELIABILITY }, { "reliability", IPTOS_RELIABILITY },
{ "throughput", IPTOS_THROUGHPUT }, { "throughput", IPTOS_THROUGHPUT },
{ NULL, -1 }, { NULL, -1 },
@ -1450,10 +1435,8 @@ getproxypass(const char *proxyuser, const char *proxyhost)
snprintf(prompt, sizeof(prompt), "Proxy password for %s@%s: ", snprintf(prompt, sizeof(prompt), "Proxy password for %s@%s: ",
proxyuser, proxyhost); proxyuser, proxyhost);
#ifndef WIN32_FIXME
if (readpassphrase(prompt, pw, sizeof(pw), RPP_REQUIRE_TTY) == NULL) if (readpassphrase(prompt, pw, sizeof(pw), RPP_REQUIRE_TTY) == NULL)
errx(1, "Unable to read proxy passphrase"); errx(1, "Unable to read proxy passphrase");
#endif
return (pw); return (pw);
} }

4
regress/setuid-allowed.c
View File

@ -26,10 +26,6 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#ifdef WIN32_FIXME
void debug3(const char *fmt,...) {/*stub*/}
#endif
void
static void static void
usage(void) usage(void)
{ {

3
regress/unittests/hostkeys/test_iterate.c
View File

@ -61,6 +61,7 @@ check(struct hostkey_foreach_line *l, void *_ctx)
test_subtest_info("entry %zu/%zu, file line %ld", test_subtest_info("entry %zu/%zu, file line %ld",
ctx->i + 1, ctx->nexpected, l->linenum); ctx->i + 1, ctx->nexpected, l->linenum);
for (;;) { for (;;) {
ASSERT_SIZE_T_LT(ctx->i, ctx->nexpected); ASSERT_SIZE_T_LT(ctx->i, ctx->nexpected);
expected = ctx->expected + ctx->i++; expected = ctx->expected + ctx->i++;
@ -281,7 +282,6 @@ struct expected expected_full[] = {
NULL, /* filled at runtime */ NULL, /* filled at runtime */
"DSA #2", "DSA #2",
} }, } },
#ifdef OPENSSL_HAS_NISTP521
{ "ecdsa_2.pub" , -1, -1, HKF_MATCH_HOST, 0, HKF_MATCH_IP, HKF_MATCH_IP, -1, { { "ecdsa_2.pub" , -1, -1, HKF_MATCH_HOST, 0, HKF_MATCH_IP, HKF_MATCH_IP, -1, {
NULL, NULL,
10, 10,
@ -295,7 +295,6 @@ struct expected expected_full[] = {
NULL, /* filled at runtime */ NULL, /* filled at runtime */
"ECDSA #2", "ECDSA #2",
} }, } },
#endif
{ "ed25519_2.pub" , -1, -1, HKF_MATCH_HOST, 0, HKF_MATCH_IP, HKF_MATCH_IP, -1, { { "ed25519_2.pub" , -1, -1, HKF_MATCH_HOST, 0, HKF_MATCH_IP, HKF_MATCH_IP, -1, {
NULL, NULL,
11, 11,

4
regress/unittests/kex/test_kex.c
View File

@ -145,12 +145,10 @@ do_kex_with_key(char *kex, int keytype, int bits)
sshbuf_free(state); sshbuf_free(state);
ASSERT_PTR_NE(server2->kex, NULL); ASSERT_PTR_NE(server2->kex, NULL);
/* XXX we need to set the callbacks */ /* XXX we need to set the callbacks */
#ifdef WITH_OPENSSL
server2->kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; server2->kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server;
server2->kex->kex[KEX_DH_GRP14_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_SHA1] = kexgex_server;
server2->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; server2->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
#endif
#ifdef OPENSSL_HAS_ECC #ifdef OPENSSL_HAS_ECC
server2->kex->kex[KEX_ECDH_SHA2] = kexecdh_server; server2->kex->kex[KEX_ECDH_SHA2] = kexecdh_server;
#endif #endif
@ -195,9 +193,7 @@ kex_tests(void)
#ifdef OPENSSL_HAS_ECC #ifdef OPENSSL_HAS_ECC
do_kex("ecdh-sha2-nistp256"); do_kex("ecdh-sha2-nistp256");
do_kex("ecdh-sha2-nistp384"); do_kex("ecdh-sha2-nistp384");
#ifdef OPENSSL_HAS_NISTP521
do_kex("ecdh-sha2-nistp521"); do_kex("ecdh-sha2-nistp521");
#endif
#endif #endif
do_kex("diffie-hellman-group-exchange-sha256"); do_kex("diffie-hellman-group-exchange-sha256");
do_kex("diffie-hellman-group-exchange-sha1"); do_kex("diffie-hellman-group-exchange-sha1");

4
regress/unittests/sshbuf/tests.c
View File

@ -20,13 +20,9 @@ tests(void)
{ {
sshbuf_tests(); sshbuf_tests();
sshbuf_getput_basic_tests(); sshbuf_getput_basic_tests();
#ifdef WITH_OPENSSL
sshbuf_getput_crypto_tests(); sshbuf_getput_crypto_tests();
#endif
sshbuf_misc_tests(); sshbuf_misc_tests();
sshbuf_fuzz_tests(); sshbuf_fuzz_tests();
#ifdef WITH_OPENSSL
sshbuf_getput_fuzz_tests(); sshbuf_getput_fuzz_tests();
#endif
sshbuf_fixed(); sshbuf_fixed();
} }

5
regress/unittests/sshkey/common.c
View File

@ -19,12 +19,10 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#ifdef WITH_OPENSSL
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/rsa.h> #include <openssl/rsa.h>
#include <openssl/dsa.h> #include <openssl/dsa.h>
#include <openssl/objects.h> #include <openssl/objects.h>
#endif
#ifdef OPENSSL_HAS_NISTP256 #ifdef OPENSSL_HAS_NISTP256
# include <openssl/ec.h> # include <openssl/ec.h>
#endif #endif
@ -72,7 +70,6 @@ load_text_file(const char *name)
return ret; return ret;
} }
#ifdef WITH_OPENSSL
BIGNUM * BIGNUM *
load_bignum(const char *name) load_bignum(const char *name)
{ {
@ -84,4 +81,4 @@ load_bignum(const char *name)
sshbuf_free(buf); sshbuf_free(buf);
return ret; return ret;
} }
#endif

6
regress/unittests/sshkey/test_file.c
View File

@ -101,7 +101,6 @@ sshkey_file_tests(void)
sshkey_free(k1); sshkey_free(k1);
#endif #endif
#ifdef WITH_OPENSSL
TEST_START("parse RSA from private"); TEST_START("parse RSA from private");
buf = load_file("rsa_1"); buf = load_file("rsa_1");
ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0); 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); ASSERT_INT_EQ(sshkey_equal(k1, k2), 1);
sshkey_free(k2); sshkey_free(k2);
TEST_DONE(); TEST_DONE();
TEST_START("parse RSA from new-format w/ passphrase"); TEST_START("parse RSA from new-format w/ passphrase");
buf = load_file("rsa_n_pw"); buf = load_file("rsa_n_pw");
ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf,
@ -146,7 +145,7 @@ sshkey_file_tests(void)
ASSERT_INT_EQ(sshkey_equal(k1, k2), 1); ASSERT_INT_EQ(sshkey_equal(k1, k2), 1);
sshkey_free(k2); sshkey_free(k2);
TEST_DONE(); TEST_DONE();
TEST_START("load RSA from public"); TEST_START("load RSA from public");
ASSERT_INT_EQ(sshkey_load_public(test_data_file("rsa_1.pub"), &k2, ASSERT_INT_EQ(sshkey_load_public(test_data_file("rsa_1.pub"), &k2,
NULL), 0); NULL), 0);
@ -283,7 +282,6 @@ sshkey_file_tests(void)
TEST_DONE(); TEST_DONE();
sshkey_free(k1); sshkey_free(k1);
#endif
#ifdef OPENSSL_HAS_ECC #ifdef OPENSSL_HAS_ECC
TEST_START("parse ECDSA from private"); TEST_START("parse ECDSA from private");

11
regress/unittests/sshkey/test_sshkey.c
View File

@ -193,7 +193,6 @@ sshkey_tests(void)
sshkey_free(k1); sshkey_free(k1);
TEST_DONE(); TEST_DONE();
#ifdef WITH_OPENSSL
TEST_START("new/free KEY_RSA1"); TEST_START("new/free KEY_RSA1");
k1 = sshkey_new(KEY_RSA1); k1 = sshkey_new(KEY_RSA1);
ASSERT_PTR_NE(k1, NULL); ASSERT_PTR_NE(k1, NULL);
@ -222,7 +221,6 @@ sshkey_tests(void)
ASSERT_PTR_EQ(k1->dsa->priv_key, NULL); ASSERT_PTR_EQ(k1->dsa->priv_key, NULL);
sshkey_free(k1); sshkey_free(k1);
TEST_DONE(); TEST_DONE();
#endif
#ifdef OPENSSL_HAS_ECC #ifdef OPENSSL_HAS_ECC
TEST_START("new/free KEY_ECDSA"); TEST_START("new/free KEY_ECDSA");
@ -242,7 +240,6 @@ sshkey_tests(void)
sshkey_free(k1); sshkey_free(k1);
TEST_DONE(); TEST_DONE();
#ifdef WITH_OPENSSL
TEST_START("new_private KEY_RSA"); TEST_START("new_private KEY_RSA");
k1 = sshkey_new_private(KEY_RSA); k1 = sshkey_new_private(KEY_RSA);
ASSERT_PTR_NE(k1, NULL); ASSERT_PTR_NE(k1, NULL);
@ -311,7 +308,7 @@ sshkey_tests(void)
ASSERT_PTR_NE(kd->dsa->g, NULL); ASSERT_PTR_NE(kd->dsa->g, NULL);
ASSERT_PTR_NE(kd->dsa->priv_key, NULL); ASSERT_PTR_NE(kd->dsa->priv_key, NULL);
TEST_DONE(); TEST_DONE();
#endif
#ifdef OPENSSL_HAS_ECC #ifdef OPENSSL_HAS_ECC
TEST_START("generate KEY_ECDSA"); TEST_START("generate KEY_ECDSA");
ASSERT_INT_EQ(sshkey_generate(KEY_ECDSA, 256, &ke), 0); ASSERT_INT_EQ(sshkey_generate(KEY_ECDSA, 256, &ke), 0);
@ -330,7 +327,6 @@ sshkey_tests(void)
ASSERT_PTR_NE(kf->ed25519_sk, NULL); ASSERT_PTR_NE(kf->ed25519_sk, NULL);
TEST_DONE(); TEST_DONE();
#ifdef WITH_OPENSSL
TEST_START("demote KEY_RSA"); TEST_START("demote KEY_RSA");
ASSERT_INT_EQ(sshkey_demote(kr, &k1), 0); ASSERT_INT_EQ(sshkey_demote(kr, &k1), 0);
ASSERT_PTR_NE(k1, NULL); ASSERT_PTR_NE(k1, NULL);
@ -361,7 +357,6 @@ sshkey_tests(void)
ASSERT_INT_EQ(sshkey_equal(kd, k1), 1); ASSERT_INT_EQ(sshkey_equal(kd, k1), 1);
sshkey_free(k1); sshkey_free(k1);
TEST_DONE(); TEST_DONE();
#endif
#ifdef OPENSSL_HAS_ECC #ifdef OPENSSL_HAS_ECC
TEST_START("demote KEY_ECDSA"); TEST_START("demote KEY_ECDSA");
@ -508,7 +503,6 @@ sshkey_tests(void)
sshkey_free(k2); sshkey_free(k2);
TEST_DONE(); TEST_DONE();
#ifdef OPENSSL_HAS_ECC #ifdef OPENSSL_HAS_ECC
TEST_START("sign and verify ECDSA"); TEST_START("sign and verify ECDSA");
k1 = get_private("ecdsa_1"); k1 = get_private("ecdsa_1");
@ -518,6 +512,7 @@ sshkey_tests(void)
sshkey_free(k1); sshkey_free(k1);
sshkey_free(k2); sshkey_free(k2);
TEST_DONE(); TEST_DONE();
#endif
TEST_START("sign and verify ED25519"); TEST_START("sign and verify ED25519");
k1 = get_private("ed25519_1"); k1 = get_private("ed25519_1");
@ -542,5 +537,5 @@ sshkey_tests(void)
sshkey_free(k3); sshkey_free(k3);
sshbuf_free(b); sshbuf_free(b);
TEST_DONE(); TEST_DONE();
#endif
} }

3
regress/unittests/sshkey/tests.c
View File

@ -18,10 +18,9 @@ void sshkey_fuzz_tests(void);
void void
tests(void) tests(void)
{ {
#ifdef WITH_OPENSSL
OpenSSL_add_all_algorithms(); OpenSSL_add_all_algorithms();
ERR_load_CRYPTO_strings(); ERR_load_CRYPTO_strings();
#endif
sshkey_tests(); sshkey_tests();
sshkey_file_tests(); sshkey_file_tests();
sshkey_fuzz_tests(); sshkey_fuzz_tests();