witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Srtp version from 1.4.2 to 1.4.4.

Browse source 
Required by zrtp.c.
This commit is contained in:
Guillaume Beraudo 2011-09-09 14:20:33 +02:00
parent 265cd6b105
commit 2ec412b969
2 changed files with 10 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
submodules/build/builders.d/srtp.mk
View file

@ -1,11 +1,15 @@
srtp_version?=1.4.2
srtp_url?=http://srtp.sourceforge.net/srtp-$(srtp_version).tgz
srtp_version?=1.4.4
#srtp_url?=http://srtp.sourceforge.net/srtp-$(srtp_version).tgz
srtp_url=http://sourceforge.net/projects/srtp/files/srtp/$(srtp_version)/srtp-$(srtp_version).tgz/download
srtp_tgz_file=srtp-$(srtp_version).tgz
$(BUILDER_SRC_DIR)/$(srtp_dir)/configure:
$(BUILDER_SRC_DIR)/externals/$(srtp_tgz_file):
cd $(BUILDER_SRC_DIR)/externals \
&& wget $(srtp_url) \
&& tar zxvf srtp-$(srtp_version).tgz \
&& wget $(srtp_url) -O $(srtp_tgz_file)
$(BUILDER_SRC_DIR)/$(srtp_dir)/configure: $(BUILDER_SRC_DIR)/externals/$(srtp_tgz_file)
cd $(BUILDER_SRC_DIR)/externals \
&& tar zxvf $(srtp_tgz_file) \
&& cd srtp && patch -p0 < $(BUILDER_SRC_DIR)/build/builders.d/srtp.patch
$(BUILDER_BUILD_DIR)/$(srtp_dir)/Makefile: $(BUILDER_SRC_DIR)/$(srtp_dir)/configure

38
submodules/build/builders.d/srtp.patch
View file

@ -1,24 +1,3 @@
diff -rupN ../srtp_old/crypto/cipher/aes.c ./crypto/cipher/aes.c
--- ../srtp_old/crypto/cipher/aes.c 2005-10-08 18:39:25.000000000 +0200
+++ ./crypto/cipher/aes.c 2011-09-06 10:05:35.000000000 +0200
@@ -1358,7 +1358,7 @@ static uint32_t U4[256] = {
extern debug_module_t mod_aes_icm;
-inline void
+void
aes_expand_encryption_key(const v128_t *key,
aes_expanded_key_t expanded_key) {
int i;
@@ -1411,7 +1411,7 @@ aes_expand_encryption_key(const v128_t *
}
}
-inline void
+void
aes_expand_decryption_key(const v128_t *key,
aes_expanded_key_t expanded_key) {
int i;
diff -rupN ../srtp_old/crypto/cipher/aes_icm.c ./crypto/cipher/aes_icm.c
--- ../srtp_old/crypto/cipher/aes_icm.c 2006-03-16 18:11:29.000000000 +0100
+++ ./crypto/cipher/aes_icm.c 2011-09-06 10:19:16.000000000 +0200
@ -31,23 +10,6 @@ diff -rupN ../srtp_old/crypto/cipher/aes_icm.c ./crypto/cipher/aes_icm.c
aes_icm_advance_ismacryp(aes_icm_ctx_t *c, uint8_t forIsmacryp) {
/* fill buffer with new keystream */
v128_copy(&c->keystream_buffer, &c->counter);
diff -rupN ../srtp_old/crypto/include/aes.h ./crypto/include/aes.h
--- ../srtp_old/crypto/include/aes.h 2005-10-08 18:06:05.000000000 +0200
+++ ./crypto/include/aes.h 2011-09-06 10:03:53.000000000 +0200
@@ -55,11 +55,11 @@
typedef v128_t aes_expanded_key_t[11];
-inline void
+void
aes_expand_encryption_key(const v128_t *key,
aes_expanded_key_t expanded_key);
-inline void
+void
aes_expand_decryption_key(const v128_t *key,
aes_expanded_key_t expanded_key);
diff -rupN ../srtp_old/crypto/math/datatypes.c ./crypto/math/datatypes.c
--- ../srtp_old/crypto/math/datatypes.c 2005-10-08 18:38:06.000000000 +0200
+++ ./crypto/math/datatypes.c 2011-09-06 10:02:55.000000000 +0200