[Pkg-voip-commits] [bzrtp] 01/02: Merge tag 'upstream/1.0.4'

[daniel at gnoutcheff.name]

This is an automated email from the git hooks/post-receive script.

gnoutchd-guest pushed a commit to branch master
in repository bzrtp.

commit 07b7e64dc1bba1b4f937d94a70930f97110f7c9a
Merge: 497b970 b50075c
Author: Daniel Gnoutcheff <daniel at gnoutcheff.name>
Date:   Thu Jan 19 21:28:52 2017 -0500

    Merge tag 'upstream/1.0.4'
    
    Upstream version 1.0.4

 Android.mk                                        |  29 +-
 CMakeLists.txt                                    | 102 ++--
 Makefile.am                                       |   2 +
 NEWS                                              |   9 +-
 README                                            |   4 +-
 cmake/{BZRTPConfig.cmake => BZRTPConfig.cmake.in} |  26 +-
 cmake/FindCUnit.cmake                             |  58 ---
 cmake/FindPolarSSL.cmake                          |  77 ---
 cmake/FindXML2.cmake                              |  16 +-
 config.h.cmake                                    |   2 +-
 configure.ac                                      |  46 +-
 include/CMakeLists.txt                            |  29 +-
 include/Makefile.am                               |   2 +-
 include/bzrtp/bzrtp.h                             | 114 ++--
 include/cryptoUtils.h                             |  49 +-
 include/cryptoWrapper.h                           | 288 ----------
 include/packetParser.h                            |   3 +-
 include/stateMachine.h                            |   2 +-
 include/typedef.h                                 |  30 +-
 include/zidCache.h                                |   2 +-
 src/CMakeLists.txt                                |  43 +-
 src/Makefile.am                                   |  10 +-
 src/bzrtp.c                                       | 605 ++++++++++++++++------
 src/cryptoPolarssl.c                              | 541 -------------------
 src/cryptoUtils.c                                 | 167 +++++-
 src/packetParser.c                                | 109 +++-
 src/stateMachine.c                                | 181 ++++---
 src/zidCache.c                                    | 101 +---
 test/CMakeLists.txt                               |  46 +-
 test/Makefile.am                                  |   4 +-
 test/bzrtpCryptoTest.c                            | 385 +-------------
 test/bzrtpCryptoTest.h                            |   2 +-
 test/bzrtpParserTest.c                            | 326 ++++++++----
 test/bzrtpParserTest.h                            |   4 +-
 test/bzrtpTest.c                                  | 135 ++---
 test/testUtils.c                                  |   6 +-
 test/testUtils.h                                  |   2 +-
 37 files changed, 1511 insertions(+), 2046 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/bzrtp.git