1
0
forked from pool/libzrtpcpp
OBS User unknown 2008-09-09 17:11:37 +00:00 committed by Git OBS Bridge
parent d3ac69b478
commit b799b5e38a
7 changed files with 102 additions and 38 deletions

View File

@ -1,24 +0,0 @@
Index: src/ZrtpQueue.cxx
===================================================================
--- src/ZrtpQueue.cxx.orig 2008-02-28 02:30:54.000000000 +0100
+++ src/ZrtpQueue.cxx 2008-05-11 23:24:17.000000000 +0200
@@ -452,6 +452,7 @@ bool ZrtpQueue::srtpSecretsReady(SrtpSec
}
secureParts++;
}
+ return true;
}
void ZrtpQueue::srtpSecretsOn(const char* c, const char* s)
Index: src/ZrtpStateClass.cxx
===================================================================
--- src/ZrtpStateClass.cxx.orig 2008-05-11 23:24:17.000000000 +0200
+++ src/ZrtpStateClass.cxx 2008-05-11 23:25:25.000000000 +0200
@@ -429,6 +429,7 @@ int32_t ZrtpStateClass::evAckSent(void)
nextState(Initial);
return (Fail);
}
+ return (Fail);
}
/*
* The protocol engine got a peer's HelloAck state Detect, thus the peer got

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:18850f578b2d035fd0cd449b0f073b4d174f13ad1de461c324b16c7612445f85
size 283269

View File

@ -0,0 +1,60 @@
--- src/ZrtpQueue.cpp
+++ src/ZrtpQueue.cpp
@@ -585,6 +585,7 @@
if (zrtpUserCallback != NULL) {
return zrtpUserCallback->checkSASSignature(sas);
}
+ return false;
}
void ZrtpQueue::setEnableZrtp(bool onOff) {
@@ -649,6 +650,7 @@
bool ZrtpQueue::isMultiStream() {
if (zrtpEngine != NULL)
return zrtpEngine->isMultiStream();
+ return false;
}
void ZrtpQueue::acceptEnrollment(bool accepted) {
@@ -659,16 +661,19 @@
bool ZrtpQueue::setSignatureData(uint8* data, int32 length) {
if (zrtpEngine != NULL)
return zrtpEngine->setSignatureData(data, length);
+ return false;
}
int32 ZrtpQueue::getSignatureData(uint8* data) {
if (zrtpEngine != NULL)
return zrtpEngine->getSignatureData(data);
+ return 0;
}
int32 ZrtpQueue::getSignatureLength() {
if (zrtpEngine != NULL)
return zrtpEngine->getSignatureLength();
+ return 0;
}
void ZrtpQueue::setPBXEnrollment(bool yesNo) {
--- src/ZrtpStateClass.cxx
+++ src/ZrtpStateClass.cxx
@@ -421,7 +421,8 @@
*/
else if (event->type == Timer) {
if (!parent->sendPacketZRTP(sentPacket)) {
- return sendFailed(); // returns to state Initial
+ sendFailed(); // returns to state Initial
+ return;
}
if (nextTimer(&T1) <= 0) {
parent->zrtpNotSuppOther();
--- src/libzrtpcpp/ZrtpStates.h
+++ src/libzrtpcpp/ZrtpStates.h
@@ -58,6 +58,7 @@
int32_t processEvent(ZrtpStateClass& zsc) {
// fprintf(stdout, "ZrtpStates::processEvent, state: %d\n", state);
(zsc.*states[state].handler)();
+ return state;
}
bool inState(const int32_t s) { return ((s == state)); }

3
libzrtpcpp-1.3.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3f53e0d56e35496cfdf8e4718f82ac44afb69fa0fbfe85f68995ba67bfbc6f6f
size 339263

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Sep 8 14:21:01 CEST 2008 - hvogel@suse.de
- Update to 1.3.0
* implements the latest changes define in the ZRTP draft
* The Method ''setSipsSecret(...)'' is no longer available.
* The method ''setOtherSecret(...)'' was renamed to
''setPbxSecret(...)''
* The methos ''setSrtpsSecret(...)'' is was renamed to
''setAuxSecret(...)''
-------------------------------------------------------------------
Sun May 11 23:30:44 CEST 2008 - crrodriguez@suse.de

View File

@ -1,26 +1,34 @@
#
# spec file for package libzrtpcpp (Version 1.0.1)
# spec file for package libzrtpcpp (Version 1.3.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: libzrtpcpp
Summary: a ccrtp extension for zrtp/Zfone support
BuildRequires: ccrtp-devel >= 1.5.0 gcc-c++ libgcc libgcrypt-devel pkgconfig
Version: 1.0.1
Release: 2
Summary: A ccrtp extension for zrtp/Zfone support
BuildRequires: gcc-c++ libccrtp-devel libgcc libgcrypt-devel pkgconfig
Version: 1.3.0
Release: 1
License: GPL v3 or later
Group: Development/Libraries/Other
Url: http://www.gnu.org/software/commoncpp/commoncpp.html
Source0: ftp://ftp.gnu.org/gnu/cccrtp/%{name}-%{version}.tar.bz2
Source1: rpmlintrc
Patch1: %name-1.0.1-compiler_warnings.patch
Patch2: libzrtpcpp-1.0.1-no-return-in-nonvoid-function.patch
Patch2: libzrtpcpp-1.3.0-missing_returns.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -34,7 +42,7 @@ applications.
%package -n libzrtpcpp1
License: GPL v2 or later; LGPL v2.1 or later
Group: Development/Libraries/Other
Summary: a ccrtp extension for zrtp/Zfone support
Summary: A ccrtp extension for zrtp/Zfone support
Provides: %{name} = %{version}
Obsoletes: %{name} <= %{version}
@ -50,7 +58,7 @@ applications.
License: GPL v3 or later
Group: Development/Libraries/Other
Summary: Headers and static link library for libzrtpcpp
Requires: libzrtpcpp1 = %{version} ccrtp-devel
Requires: libzrtpcpp1 = %{version} libccrtp-devel
%description devel
This package provides the header files, link libraries, and
@ -94,6 +102,14 @@ rm -rf %{buildroot}
%postun -n libzrtpcpp1 -p /sbin/ldconfig
%changelog
* Mon Sep 08 2008 hvogel@suse.de
- Update to 1.3.0
* implements the latest changes define in the ZRTP draft
* The Method ''setSipsSecret(...)'' is no longer available.
* The method ''setOtherSecret(...)'' was renamed to
''setPbxSecret(...)''
* The methos ''setSrtpsSecret(...)'' is was renamed to
''setAuxSecret(...)''
* Mon May 12 2008 crrodriguez@suse.de
- fix no-return-in-nonvoid-function errors
- fix both buildRequires and -devel package dependencies

1
rpmlintrc Normal file
View File

@ -0,0 +1 @@
addFilter("shlib-policy-name-error .*")