{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1752654573, "reponame":"openssl", "desc":"OpenSSL", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://warmcat.com/repo/openssl", "f":3, "items": [ {"schema":"libjg2-1", "cid":"28301eb27275ccba496267009b6cd5a4", "commit": {"type":"commit", "time": 1493050141, "time_ofs": 120, "oid_tree": { "oid": "4015bf01610cfd969b16bdfb91cf4b899d9ff7cf", "alias": []}, "oid":{ "oid": "f044cd05a1d28c998731108dfcd25ba580cdda07", "alias": []}, "msg": "Avoid using BIO streams in bioprinttest.c", "sig_commit": { "git_time": { "time": 1493050141, "offset": 120 }, "name": "Richard Levitte", "email": "levitte@openssl.org", "md5": "b737120f0642a6a5c30c6291e6170c77" }, "sig_author": { "git_time": { "time": 1492599968, "offset": 120 }, "name": "Richard Levitte", "email": "levitte@openssl.org", "md5": "b737120f0642a6a5c30c6291e6170c77" }}, "body": "Avoid using BIO streams in bioprinttest.c\n\nReviewed-by: Rich Salz \u003crsalz@openssl.org\u003e\n(Merged from https://github.com/openssl/openssl/pull/3243)" , "diff": "diff --git a/test/bioprinttest.c b/test/bioprinttest.c\nindex 418d6e4..56aa0b0 100644\n--- a/test/bioprinttest.c\n+++ b/test/bioprinttest.c\n@@ -7,8 +7,16 @@\n * https://www.openssl.org/source/license.html\n */\n \n+#define TESTUTIL_NO_size_t_COMPARISON\n+\n #include \u003cstdio.h\u003e\n #include \u003cstring.h\u003e\n+#include \u003copenssl/e_os2.h\u003e\n+#ifdef OPENSSL_SYS_WINDOWS\n+# include \u003cwinsock.h\u003e\n+#else\n+# include OPENSSL_UNISTD\n+#endif\n #include \u003copenssl/bio.h\u003e\n #include \u0022internal/numbers.h\u0022\n #include \u0022testutil.h\u0022\n@@ -245,3 +253,55 @@ int test_main(int argc, char **argv)\n \n return run_tests(argv[0]);\n }\n+\n+/*\n+ * Replace testutil output routines. We do this to eliminate possible sources\n+ * of BIO error\n+ */\n+void test_open_streams(void)\n+{\n+}\n+\n+void test_close_streams(void)\n+{\n+}\n+\n+int test_puts_stdout(const char *str)\n+{\n+ return write(1, str, strlen(str));\n+}\n+\n+int test_puts_stderr(const char *str)\n+{\n+ return write(2, str, strlen(str));\n+}\n+\n+static char vprint_buf[10240];\n+\n+int test_vprintf_stdout(const char *fmt, va_list ap)\n+{\n+ size_t len \u003d vsnprintf(vprint_buf, sizeof(vprint_buf), fmt, ap);\n+\n+ if (len \u003e\u003d sizeof(vprint_buf))\n+ return -1;\n+ return test_puts_stdout(vprint_buf);\n+}\n+\n+int test_vprintf_stderr(const char *fmt, va_list ap)\n+{\n+ size_t len \u003d vsnprintf(vprint_buf, sizeof(vprint_buf), fmt, ap);\n+\n+ if (len \u003e\u003d sizeof(vprint_buf))\n+ return -1;\n+ return test_puts_stderr(vprint_buf);\n+}\n+\n+int test_flush_stdout(void)\n+{\n+ return 0;\n+}\n+\n+int test_flush_stderr(void)\n+{\n+ return 0;\n+}\ndiff --git a/test/testutil.h b/test/testutil.h\nindex d266fd5..5d96ddd 100644\n--- a/test/testutil.h\n+++ b/test/testutil.h\n@@ -176,7 +176,13 @@ DECLARE_COMPARISONS(char, char)\n DECLARE_COMPARISONS(unsigned char, uchar)\n DECLARE_COMPARISONS(long, long)\n DECLARE_COMPARISONS(unsigned long, ulong)\n+/*\n+ * Because this comparison uses a printf format specifier that's not\n+ * universally known (yet), we provide an option to not have it declared.\n+ */\n+# ifndef TESTUTIL_NO_size_t_COMPARISON\n DECLARE_COMPARISONS(size_t, size_t)\n+# endif\n \n /*\n * Pointer comparisons against other pointers and null.\n","s":{"c":1752654573,"u": 28450}} ],"g": 29317,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}