1 Change 19593349 by seh@seh-gcomm_android on 2011/02/18 16:57:20 *pending* 2 3 Merge in changes from GComm for mobile's version. 4 5 PRESUBMIT=passed 6 R=astor,hta,juberti,mikaelp,tschmelcher 7 CC=a2a-mobile 8 DELTA=7 (3 added, 0 deleted, 4 changed) 9 OCL=19593349 10 11 Affected files ... 12 13 ... //depot/google3/third_party/libsrtp/README.google#6 edit 14 ... //depot/google3/third_party/libsrtp/crypto/ae_xfm/xfm.c#4 edit 15 ... //depot/google3/third_party/libsrtp/crypto/cipher/aes_icm.c#4 edit 16 ... //depot/google3/third_party/libsrtp/crypto/include/config.h#5 edit 17 ... //depot/google3/third_party/libsrtp/srtp/ekt.c#3 edit 18 19 ==== //depot/google3/third_party/libsrtp/README.google#6 - /Users/seh/dev/source/gcomm_android/google3/third_party/libsrtp/README.google ==== 20 # action=edit type=text 21 --- google3/third_party/libsrtp/README.google 2011-02-18 17:17:34.000000000 -0800 22 +++ google3/third_party/libsrtp/README.google 2011-02-18 17:31:53.000000000 -0800 23 @@ -19,3 +19,6 @@ 24 - applied a security fix to not accept unencrypted SRTP unless specified by policy. 25 - applied a fix to not crash when receiving a RTCP packet that had a much larger sequence number than the previous RTCP packet 26 - all patches are stored individually in the googlepatches subdirectory 27 +- iOS related changes. 28 + undefine HAVE_BYTESWAP_H in config.h 29 + Fix debug build compile errors: added static keyword to inline methods and undefined DEBUG before #define DEBUG 30 \ No newline at end of file 31 ==== //depot/google3/third_party/libsrtp/crypto/ae_xfm/xfm.c#4 - /Users/seh/dev/source/gcomm_android/google3/third_party/libsrtp/crypto/ae_xfm/xfm.c ==== 32 # action=edit type=text 33 --- google3/third_party/libsrtp/crypto/ae_xfm/xfm.c 2011-02-18 16:57:41.000000000 -0800 34 +++ google3/third_party/libsrtp/crypto/ae_xfm/xfm.c 2011-02-18 16:09:33.000000000 -0800 35 @@ -177,6 +177,7 @@ 36 37 #define ENC 1 38 39 +#undef DEBUG 40 #define DEBUG 0 41 42 err_status_t 43 ==== //depot/google3/third_party/libsrtp/crypto/cipher/aes_icm.c#4 - /Users/seh/dev/source/gcomm_android/google3/third_party/libsrtp/crypto/cipher/aes_icm.c ==== 44 # action=edit type=text 45 --- google3/third_party/libsrtp/crypto/cipher/aes_icm.c 2011-02-18 16:57:41.000000000 -0800 46 +++ google3/third_party/libsrtp/crypto/cipher/aes_icm.c 2011-02-18 16:47:09.000000000 -0800 47 @@ -285,7 +285,7 @@ 48 * this is an internal, hopefully inlined function 49 */ 50 51 -inline void 52 +static inline void 53 aes_icm_advance_ismacryp(aes_icm_ctx_t *c, uint8_t forIsmacryp) { 54 /* fill buffer with new keystream */ 55 v128_copy(&c->keystream_buffer, &c->counter); 56 ==== //depot/google3/third_party/libsrtp/crypto/include/config.h#5 - /Users/seh/dev/source/gcomm_android/google3/third_party/libsrtp/crypto/include/config.h ==== 57 # action=edit type=text 58 --- google3/third_party/libsrtp/crypto/include/config.h 2011-02-18 16:57:41.000000000 -0800 59 +++ google3/third_party/libsrtp/crypto/include/config.h 2011-02-18 16:41:52.000000000 -0800 60 @@ -193,6 +193,8 @@ 61 #define inline 62 #endif 63 typedef short int16_t; 64 +#elif defined(IOS) 65 +#undef HAVE_BYTESWAP_H 66 /* Adjustments to build on MacOS. */ 67 #elif defined(OSX) 68 #undef DEV_URANDOM 69 ==== //depot/google3/third_party/libsrtp/srtp/ekt.c#3 - /Users/seh/dev/source/gcomm_android/google3/third_party/libsrtp/srtp/ekt.c ==== 70 # action=edit type=text 71 --- google3/third_party/libsrtp/srtp/ekt.c 2011-02-18 16:57:41.000000000 -0800 72 +++ google3/third_party/libsrtp/srtp/ekt.c 2011-02-18 16:51:58.000000000 -0800 73 @@ -90,7 +90,7 @@ 74 return 0; 75 } 76 77 -inline ekt_spi_t 78 +static inline ekt_spi_t 79 srtcp_packet_get_ekt_spi(const uint8_t *packet_start, unsigned pkt_octet_len) { 80 const uint8_t *spi_location; 81 82 @@ -99,7 +99,7 @@ 83 return *((const ekt_spi_t *)spi_location); 84 } 85 86 -inline uint32_t 87 +static inline uint32_t 88 srtcp_packet_get_ekt_roc(const uint8_t *packet_start, unsigned pkt_octet_len) { 89 const uint8_t *roc_location; 90 91 @@ -108,7 +108,7 @@ 92 return *((const uint32_t *)roc_location); 93 } 94 95 -inline const uint8_t * 96 +static inline const uint8_t * 97 srtcp_packet_get_emk_location(const uint8_t *packet_start, 98 unsigned pkt_octet_len) { 99 const uint8_t *location; 100
