commit 91911de3fad99884ab7fe3d5f1616422a4e25ee5 Author: Sukhbir Singh sukhbir@torproject.org Date: Wed Mar 9 14:15:57 2016 -0500

Update libotr to 4.1.1 (patch by Nicolas) --- keyring/libotr.gpg | Bin 3238 -> 5304 bytes projects/libotr/bugs-otr-im-72.patch | 60 ----------------------------------- projects/libotr/build | 1 - projects/libotr/config | 3 +- 4 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/keyring/libotr.gpg b/keyring/libotr.gpg index a7a2d09..03efcd9 100644 Binary files a/keyring/libotr.gpg and b/keyring/libotr.gpg differ diff --git a/projects/libotr/bugs-otr-im-72.patch b/projects/libotr/bugs-otr-im-72.patch deleted file mode 100644 index a56dda3..0000000 --- a/projects/libotr/bugs-otr-im-72.patch +++ /dev/null @@ -1,60 +0,0 @@ -From f466e0c698d022cbd6ddb279e1ca4c84a0703b3b Mon Sep 17 00:00:00 2001 -From: David Goulet dgoulet@ev0ke.net -Date: Tue, 18 Aug 2015 09:32:19 +0200 -Subject: [PATCH] Fix: set to NULL the sendsmp pointer when handling SMP - -Also, for extra precaution, set the message pointer in -otrl_proto_create_data() to NULL at the beginning. - -Fixes #72 - -Signed-off-by: David Goulet dgoulet@ev0ke.net ---- - src/message.c | 4 ++-- - src/proto.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/message.c b/src/message.c -index f17e5e1..9572fc9 100644 ---- a/src/message.c -+++ b/src/message.c -@@ -1502,7 +1502,7 @@ int otrl_message_receiving(OtrlUserState us, const OtrlMessageAppOps *ops, - unsigned char* nextmsg; - int nextmsglen; - OtrlTLV *sendtlv; -- char *sendsmp; -+ char *sendsmp = NULL; - otrl_sm_step3(context->smstate, tlv->data, - tlv->len, &nextmsg, &nextmsglen); - -@@ -1557,7 +1557,7 @@ int otrl_message_receiving(OtrlUserState us, const OtrlMessageAppOps *ops, - unsigned char* nextmsg; - int nextmsglen; - OtrlTLV *sendtlv; -- char *sendsmp; -+ char *sendsmp = NULL; - err = otrl_sm_step4(context->smstate, tlv->data, - tlv->len, &nextmsg, &nextmsglen); - /* Set trust level based on result */ -diff --git a/src/proto.c b/src/proto.c -index f560a82..a8813ab 100644 ---- a/src/proto.c -+++ b/src/proto.c -@@ -497,6 +497,8 @@ gcry_error_t otrl_proto_create_data(char **encmessagep, ConnContext *context, - char *msgdup; - int version = context->protocol_version; - -+ *encmessagep = NULL; -+ - /* Make sure we're actually supposed to be able to encrypt */ - if (context->msgstate != OTRL_MSGSTATE_ENCRYPTED || - context->context_priv->their_keyid == 0) { -@@ -511,8 +513,6 @@ gcry_error_t otrl_proto_create_data(char **encmessagep, ConnContext *context, - } - strcpy(msgdup, msg); - -- *encmessagep = NULL; -- - /* Header, msg flags, send keyid, recv keyid, counter, msg len, msg - * len of revealed mac keys, revealed mac keys, MAC */ - buflen = OTRL_HEADER_LEN + (version == 3 ? 8 : 0) diff --git a/projects/libotr/build b/projects/libotr/build index 30ec46c..4cf811c 100755 --- a/projects/libotr/build +++ b/projects/libotr/build @@ -13,7 +13,6 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf libotr-[% c('version') %].tar.gz cd /var/tmp/build/libotr-[% c('version') %] -patch -p1 < $rootdir/bugs-otr-im-72.patch export SOURCE_DATE_EPOCH=$(stat -c %Y ChangeLog) ./configure --prefix=$distdir [% c("var/configure_opt") %] make -j4 [% IF c("var/windows") %]LDFLAGS='-no-undefined -lssp'[% END %] diff --git a/projects/libotr/config b/projects/libotr/config index 21e52e3..6bb1826 100644 --- a/projects/libotr/config +++ b/projects/libotr/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 4.1.0 +version: 4.1.1 filename: 'libotr-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 var: @@ -25,7 +25,6 @@ input_files: file_gpg_id: 1 sig_ext: asc gpg_keyring: libotr.gpg - - filename: bugs-otr-im-72.patch - project: libgcrypt name: libgcrypt - project: libgpg-error