diff options
author | joerg <joerg@pkgsrc.org> | 2015-09-14 13:30:03 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2015-09-14 13:30:03 +0000 |
commit | 2847794ff1c8d650868259dfe98d3e6672a574b5 (patch) | |
tree | 520868cb57e891fc47ca17de3f89c9cf9b737560 /comms/srtp | |
parent | 41e676eb4e0d11405d060cf587bba247bd5e316c (diff) | |
download | pkgsrc-2847794ff1c8d650868259dfe98d3e6672a574b5.tar.gz |
Fix inline use.
Diffstat (limited to 'comms/srtp')
-rw-r--r-- | comms/srtp/distinfo | 6 | ||||
-rw-r--r-- | comms/srtp/patches/patch-crypto_cipher_aes__icm.c | 22 | ||||
-rw-r--r-- | comms/srtp/patches/patch-crypto_math_datatypes.c | 13 | ||||
-rw-r--r-- | comms/srtp/patches/patch-crypto_math_gf2__8.c | 13 | ||||
-rw-r--r-- | comms/srtp/patches/patch-crypto_math_math.c | 47 |
5 files changed, 100 insertions, 1 deletions
diff --git a/comms/srtp/distinfo b/comms/srtp/distinfo index e0ff81f2e38..79b4c7094de 100644 --- a/comms/srtp/distinfo +++ b/comms/srtp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1 2015/09/06 14:02:08 joerg Exp $ +$NetBSD: distinfo,v 1.2 2015/09/14 13:30:03 joerg Exp $ SHA1 (srtp-1.4.4.tgz) = 299c6cfe0c9d6f1804bc5921cfbdb6a6bc76a521 RMD160 (srtp-1.4.4.tgz) = 64e58a3fc2cc30a8d7cba6b6ce59f807649d9dee @@ -6,6 +6,10 @@ Size (srtp-1.4.4.tgz) = 502890 bytes SHA1 (patch-Makefile.in) = 8e0e6d7bed257263e4609d305dfa6a27efc1906d SHA1 (patch-configure) = d70d01b5f846b2f163ba2246511cf1314005fa35 SHA1 (patch-configure.in) = 217c066920fedaaba02d86e3c2017a368ea8fee7 +SHA1 (patch-crypto_cipher_aes__icm.c) = 7e402b790678bd6c27daf8f56bf0a1123b087d07 +SHA1 (patch-crypto_math_datatypes.c) = f5358856026b91ae40db4a7c38bae6138656d94e +SHA1 (patch-crypto_math_gf2__8.c) = 4e878e3debc2c287dcbce6ab1127ba8cd22352c3 +SHA1 (patch-crypto_math_math.c) = 06961bd3184b0e47475f76a55d9669ce6d3a7149 SHA1 (patch-include_srtp.h) = 4e680a004d14a338c7ec4cc135f21da38490c315 SHA1 (patch-srtp_srtp.c) = 90f2674702dc2070350abc61f7773a4a6234ae33 SHA1 (patch-test_rtpw__test.sh) = 00f28ef1e91b963ab4d413ac10925150bff4b6be diff --git a/comms/srtp/patches/patch-crypto_cipher_aes__icm.c b/comms/srtp/patches/patch-crypto_cipher_aes__icm.c new file mode 100644 index 00000000000..922f2810a9a --- /dev/null +++ b/comms/srtp/patches/patch-crypto_cipher_aes__icm.c @@ -0,0 +1,22 @@ +$NetBSD: patch-crypto_cipher_aes__icm.c,v 1.1 2015/09/14 13:30:03 joerg Exp $ + +--- crypto/cipher/aes_icm.c.orig 2015-09-13 19:21:36.000000000 +0000 ++++ crypto/cipher/aes_icm.c +@@ -283,7 +283,7 @@ aes_icm_set_iv(aes_icm_ctx_t *c, void *i + * this is an internal, hopefully inlined function + */ + +-inline void ++static inline void + aes_icm_advance_ismacryp(aes_icm_ctx_t *c, uint8_t forIsmacryp) { + /* fill buffer with new keystream */ + v128_copy(&c->keystream_buffer, &c->counter); +@@ -308,7 +308,7 @@ aes_icm_advance_ismacryp(aes_icm_ctx_t * + } + } + +-inline void aes_icm_advance(aes_icm_ctx_t *c) { ++static inline void aes_icm_advance(aes_icm_ctx_t *c) { + aes_icm_advance_ismacryp(c, 0); + } + diff --git a/comms/srtp/patches/patch-crypto_math_datatypes.c b/comms/srtp/patches/patch-crypto_math_datatypes.c new file mode 100644 index 00000000000..29b59f2680e --- /dev/null +++ b/comms/srtp/patches/patch-crypto_math_datatypes.c @@ -0,0 +1,13 @@ +$NetBSD: patch-crypto_math_datatypes.c,v 1.1 2015/09/14 13:30:03 joerg Exp $ + +--- crypto/math/datatypes.c.orig 2015-09-13 19:22:57.000000000 +0000 ++++ crypto/math/datatypes.c +@@ -124,7 +124,7 @@ octet_string_hex_string(const void *s, i + return bit_string; + } + +-inline int ++static inline int + hex_char_to_nibble(uint8_t c) { + switch(c) { + case ('0'): return 0x0; diff --git a/comms/srtp/patches/patch-crypto_math_gf2__8.c b/comms/srtp/patches/patch-crypto_math_gf2__8.c new file mode 100644 index 00000000000..67bb8780a40 --- /dev/null +++ b/comms/srtp/patches/patch-crypto_math_gf2__8.c @@ -0,0 +1,13 @@ +$NetBSD: patch-crypto_math_gf2__8.c,v 1.1 2015/09/14 13:30:03 joerg Exp $ + +--- crypto/math/gf2_8.c.orig 2015-09-13 19:22:59.000000000 +0000 ++++ crypto/math/gf2_8.c +@@ -50,7 +50,7 @@ + + /* gf2_8_shift() moved to gf2_8.h as an inline function */ + +-inline gf2_8 ++static inline gf2_8 + gf2_8_multiply(gf2_8 x, gf2_8 y) { + gf2_8 z = 0; + diff --git a/comms/srtp/patches/patch-crypto_math_math.c b/comms/srtp/patches/patch-crypto_math_math.c new file mode 100644 index 00000000000..7b5aadf2317 --- /dev/null +++ b/comms/srtp/patches/patch-crypto_math_math.c @@ -0,0 +1,47 @@ +$NetBSD: patch-crypto_math_math.c,v 1.1 2015/09/14 13:30:03 joerg Exp $ + +--- crypto/math/math.c.orig 2015-09-13 19:23:02.000000000 +0000 ++++ crypto/math/math.c +@@ -173,7 +173,7 @@ v32_weight(v32_t a) { + return wt; + } + +-inline unsigned char ++static inline unsigned char + v32_distance(v32_t x, v32_t y) { + x.value ^= y.value; + return v32_weight(x); +@@ -524,13 +524,13 @@ A_times_x_plus_b(uint8_t A[8], uint8_t x + return b; + } + +-inline void ++static inline void + v16_copy_octet_string(v16_t *x, const uint8_t s[2]) { + x->v8[0] = s[0]; + x->v8[1] = s[1]; + } + +-inline void ++static inline void + v32_copy_octet_string(v32_t *x, const uint8_t s[4]) { + x->v8[0] = s[0]; + x->v8[1] = s[1]; +@@ -538,7 +538,7 @@ v32_copy_octet_string(v32_t *x, const ui + x->v8[3] = s[3]; + } + +-inline void ++static inline void + v64_copy_octet_string(v64_t *x, const uint8_t s[8]) { + x->v8[0] = s[0]; + x->v8[1] = s[1]; +@@ -632,7 +632,7 @@ v128_set_bit_to(v128_t *x, int i, int y) + #endif /* DATATYPES_USE_MACROS */ + + +-inline void ++static inline void + v128_left_shift2(v128_t *x, int num_bits) { + int i; + int word_shift = num_bits >> 5; |