42 Commits

Author SHA1 Message Date
Spencer Thomason
c08809e290 FS-8783: [libsrtp] Fix alignment issue
Backport upstream alignment fix to correct bus error on platforms
that require strict memory alignment such as SPARC

FS-8783 #resolve

From upstream:
commit 4d8430a504137509f23b5a19f8a06b6df0f651cc
Author: Jaap Keuter <jaap.keuter@xs4all.nl>
Date:   Fri Nov 7 00:13:10 2014 +0100

While setting the IV for AES ICM the nonce is simply typecast from
a void * to a v128_t *. This breaches alignment requirements for
v128_t objects on platforms that require it.
Instead make a copy of the nonce to assure proper alignment.
2016-07-22 07:37:21 -07:00
Michael Jerris
a99f06dfc6 sync changes from srtp upstream 2014-07-08 10:26:08 -04:00
jfigus
024162cfc9 Add support for 16-byte auth tag for AES GCM mode. 2014-06-30 19:18:20 +00:00
jfigus
b9da5149e2 Set the algorithm member on cipher_t when allocating AES crypto instance. Apply same fix to NULL cipher. 2014-06-30 19:18:20 +00:00
Travis Cross
d2aaf15992 Fix misspelling in comment 2014-06-30 19:00:34 +00:00
jfigus
a31491d5b6 This commit resolves issue #46. The GCM mode was using the wrong master SALT length. The master SALT should be 96 bits instead of 112 bits. Note, GCM mode uses the legacy CTR mode for the KDF. The legagacy CTR mode cipher implementations assume a 112 bit SALT. Changes to the cipher abstraction layer API are required to provide the ability to specify the SALT length. For now this commit modifies the SRTP layer to ensure the SALT is zero-appended before initializing the KDF. This commit also provides public definitions for the GCM cipher suite master key sizes to avoid confusion for application developers. 2014-04-08 15:25:39 +00:00
Travis Cross
38fe0a99d3 Prevent sha1_init et al from being undefined
sha1_init, sha1_update, and sha1_final were ending up as undefined
symbols in libfreeswitch.so because of the inline declaration, which
caused us to blow up while linking the freeswitch executable.  Declare
these as static inline instead.
2014-02-28 18:33:32 +00:00
Travis Cross
c011f9daff Remove binary executables in libs/srtp
These files were introduced in commit 72e2d183c1d63a224742e243e4b1fd412f876758.
2014-02-28 18:33:32 +00:00
Seven Du
4fd93b0e67 Revert "fix compiler warning vs2010" - Jeff is faster than I
This reverts commit fa9217117a9a729b424fde83fcc9a66a733a8282.
2014-02-25 14:24:34 +08:00
Seven Du
fa9217117a fix compiler warning vs2010 2014-02-25 14:17:28 +08:00
Michael Jerris
e9a0a0edc9 fix asm issue on sun 2014-02-24 15:28:03 -05:00
Michael Jerris
80c7eb85e6 update libsrtp to use openssl 2014-02-24 09:52:25 -05:00
Brian West
0c7946bfec DragonFly and NetBSD sigh 2014-02-23 20:25:05 -06:00
Michael Jerris
bbb96f936f fix openbsd build issue 2014-02-21 15:20:08 -05:00
Jeff Lenk
998b656799 remove some _MSC_VER stuff 2014-01-31 12:35:55 -06:00
Jeff Lenk
558decda2c srtp fix cast for last round of fixes 2014-01-31 11:19:30 -06:00
Jeff Lenk
37a639860c revert last srtp change and fix for windows different 2014-01-31 10:53:33 -06:00
Jeff Lenk
7454350062 missed one on last commit 2014-01-31 09:16:20 -06:00
Jeff Lenk
035985859c reapply several compiler fixes after last commit 2014-01-31 08:54:26 -06:00
Michael Jerris
91eb5b237d update srtp to master part 1 2014-01-30 16:55:56 -05:00
Michael Jerris
433830a3fe revert previous change that does not correct the issue. opened a bug with apple on this issue https://bugreport.apple.com/problem/viewproblem #15938497 2014-01-29 16:59:55 -05:00
Michael Jerris
8a01410847 FS-5956: fix __sputc included twice due to stdio.h inlining issue 2014-01-29 11:41:49 -05:00
Jeff Lenk
f37467e054 FS-5507 this should fix but I'm not sure its the proper thing 2013-06-17 08:51:56 -05:00
Jeff Lenk
2cef8580a0 oops line endings 2013-04-04 19:41:41 -05:00
Jeff Lenk
231effa3b0 windows correct srtp 2013-04-04 19:35:57 -05:00
Jeff Lenk
e232afda03 windows compiler warnings missed this 2013-04-02 08:35:47 -05:00
Jeff Lenk
d627f7c23d windows compiler warnings 2013-04-01 17:09:37 -05:00
Anthony Minessale
72e2d183c1 update to cvs head srtp 2013-03-31 21:27:19 -05:00
Brian West
0fbe609afb FSCORE-280
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11509 d0543943-73ff-0310-b7d9-9358b9ac24b2
2009-01-27 18:01:17 +00:00
Michael Jerris
6726bf4d34 make definition that should be static static
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4676 d0543943-73ff-0310-b7d9-9358b9ac24b2
2007-03-20 05:14:09 +00:00
Michael Jerris
e415095df3 up the msvc warning level on srtp
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3099 d0543943-73ff-0310-b7d9-9358b9ac24b2
2006-10-19 06:29:49 +00:00
Michael Jerris
64a3ef3c91 resolve unused function warning, this probably works better as a macro anyhow.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2964 d0543943-73ff-0310-b7d9-9358b9ac24b2
2006-10-03 12:38:12 +00:00
Michael Jerris
f524d3a397 remove generated file
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1393 d0543943-73ff-0310-b7d9-9358b9ac24b2
2006-05-08 04:04:48 +00:00
Michael Jerris
f562b523fb remove gcc specific non c99 compliant optimization.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1257 d0543943-73ff-0310-b7d9-9358b9ac24b2
2006-04-26 15:39:05 +00:00
Michael Jerris
d91f8ef358 fix all the bugs introduced by recent chainsaw massacre
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1132 d0543943-73ff-0310-b7d9-9358b9ac24b2
2006-04-12 20:48:47 +00:00
Brian West
255afc7c25 update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1110 d0543943-73ff-0310-b7d9-9358b9ac24b2
2006-04-10 21:36:06 +00:00
Brian West
786bf4d1cb update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1101 d0543943-73ff-0310-b7d9-9358b9ac24b2
2006-04-10 15:37:20 +00:00
Michael Jerris
7d43b0c01f cleanup files that don't belong in tree
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1091 d0543943-73ff-0310-b7d9-9358b9ac24b2
2006-04-07 18:45:54 +00:00
Brian West
78e37908bc Add optional packetization and VAD buster options to RTP
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1090 d0543943-73ff-0310-b7d9-9358b9ac24b2
2006-04-07 17:32:14 +00:00
Anthony Minessale
809dfc8488 add in tree srtp to build system
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1089 d0543943-73ff-0310-b7d9-9358b9ac24b2
2006-04-07 16:39:49 +00:00
Michael Jerris
abda472017 srtp msvc updates and cleanup
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1087 d0543943-73ff-0310-b7d9-9358b9ac24b2
2006-04-07 16:34:02 +00:00
Anthony Minessale
b3d890ef25 add srtp
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1086 d0543943-73ff-0310-b7d9-9358b9ac24b2
2006-04-07 16:10:03 +00:00