diff options
Diffstat (limited to 'user/libotr/fix-test.patch')
| -rw-r--r-- | user/libotr/fix-test.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/user/libotr/fix-test.patch b/user/libotr/fix-test.patch new file mode 100644 index 000000000..b71d1c128 --- /dev/null +++ b/user/libotr/fix-test.patch @@ -0,0 +1,67 @@ +auth and proto have wrong C code. + +b64 calls strcmp on a C string without a \0 terminator. + +regression tests fail to produce TAP plans (but all succeed on gwyn and ciall) + +--- libotr-4.1.1/tests/unit/test_auth.c.old 2015-12-25 17:39:45.000000000 +0000 ++++ libotr-4.1.1/tests/unit/test_auth.c 2018-11-12 00:08:59.010000000 +0000 +@@ -67,6 +67,7 @@ + OtrlAuthInfo *auth = &ctx.auth; + + /* API call. */ ++ otrl_auth_new(&ctx); + otrl_auth_clear(auth); + + ok(auth->authstate == OTRL_AUTHSTATE_NONE && +--- libotr-4.1.1/tests/unit/test_proto.c.old 2015-12-25 17:39:45.000000000 +0000 ++++ libotr-4.1.1/tests/unit/test_proto.c 2018-11-12 00:15:46.650000000 +0000 +@@ -24,7 +24,7 @@ + + GCRY_THREAD_OPTION_PTHREAD_IMPL; + +-#define NUM_TESTS 48 ++#define NUM_TESTS 47 + + static ConnContext *new_context(const char *user, const char *accountname, + const char *protocol) +@@ -176,12 +176,13 @@ + ok(otrl_init(OTRL_VERSION_MAJOR, OTRL_VERSION_MINOR+1, 0) + == gcry_error(GPG_ERR_INV_VALUE), + "Too recent minor version"); +- ok(otrl_api_version = expected, "Api number unchanged"); ++ ok(otrl_api_version == expected, "Api number unchanged"); + + ok(otrl_init(OTRL_VERSION_MAJOR, OTRL_VERSION_MINOR?OTRL_VERSION_MINOR-1:0, + OTRL_VERSION_SUB) == gcry_error(GPG_ERR_NO_ERROR), + "Inferior minor version"); +- ok(otrl_api_version = expected, "Api number unchanged"); ++ // there is no reason why it shouldn't change version if otrl_init accepted... ++ //ok(otrl_api_version == expected, "Api number unchanged"); + + otrl_api_version = 0; + +--- libotr-4.1.1/tests/unit/test_b64.c.old 2015-12-25 17:39:45.000000000 +0000 ++++ libotr-4.1.1/tests/unit/test_b64.c 2018-11-12 00:19:08.350000000 +0000 +@@ -64,6 +64,7 @@ + + ok(otrl_base64_otr_decode(alphanum_encoded, &bufp, &len) == 0, + "Call with valid data successfull"); ++ bufp[len] = 0; + ok(strcmp((const char*)bufp, alphanum_decoded) == 0 + && len == 37, "Decoded valid b64 test vector with success"); + free(bufp); +--- libotr-4.1.1/tests/test_list.old 2015-12-25 17:39:45.000000000 +0000 ++++ libotr-4.1.1/tests/test_list 2018-11-12 00:22:33.840000000 +0000 +@@ -9,11 +9,3 @@ + unit/test_sm + unit/test_instag + unit/test_privkey +-regression/random-msg.sh +-regression/random-msg-auth.sh +-regression/random-msg-fast.sh +-regression/random-msg-frag.sh +-regression/random-msg-disconnect.sh +-regression/random-msg-disconnect-frag.sh +-regression/random-msg-disconnect-auth.sh +-regression/random-msg-disconnect-frag-auth.sh |