Mon Sep 14 13:30:03 2015 UTC ()
Fix inline use.
(joerg)
diff -r1.1 -r1.2 pkgsrc/comms/srtp/distinfo
diff -r0 -r1.1 pkgsrc/comms/srtp/patches/patch-crypto_cipher_aes__icm.c
diff -r0 -r1.1 pkgsrc/comms/srtp/patches/patch-crypto_math_datatypes.c
diff -r0 -r1.1 pkgsrc/comms/srtp/patches/patch-crypto_math_gf2__8.c
diff -r0 -r1.1 pkgsrc/comms/srtp/patches/patch-crypto_math_math.c
--- pkgsrc/comms/srtp/distinfo 2015/09/06 14:02:08 1.1
+++ pkgsrc/comms/srtp/distinfo 2015/09/14 13:30:03 1.2
| @@ -1,11 +1,15 @@ | | | @@ -1,11 +1,15 @@ |
1 | $NetBSD: distinfo,v 1.1 2015/09/06 14:02:08 joerg Exp $ | | 1 | $NetBSD: distinfo,v 1.2 2015/09/14 13:30:03 joerg Exp $ |
2 | | | 2 | |
3 | SHA1 (srtp-1.4.4.tgz) = 299c6cfe0c9d6f1804bc5921cfbdb6a6bc76a521 | | 3 | SHA1 (srtp-1.4.4.tgz) = 299c6cfe0c9d6f1804bc5921cfbdb6a6bc76a521 |
4 | RMD160 (srtp-1.4.4.tgz) = 64e58a3fc2cc30a8d7cba6b6ce59f807649d9dee | | 4 | RMD160 (srtp-1.4.4.tgz) = 64e58a3fc2cc30a8d7cba6b6ce59f807649d9dee |
5 | Size (srtp-1.4.4.tgz) = 502890 bytes | | 5 | Size (srtp-1.4.4.tgz) = 502890 bytes |
6 | SHA1 (patch-Makefile.in) = 8e0e6d7bed257263e4609d305dfa6a27efc1906d | | 6 | SHA1 (patch-Makefile.in) = 8e0e6d7bed257263e4609d305dfa6a27efc1906d |
7 | SHA1 (patch-configure) = d70d01b5f846b2f163ba2246511cf1314005fa35 | | 7 | SHA1 (patch-configure) = d70d01b5f846b2f163ba2246511cf1314005fa35 |
8 | SHA1 (patch-configure.in) = 217c066920fedaaba02d86e3c2017a368ea8fee7 | | 8 | SHA1 (patch-configure.in) = 217c066920fedaaba02d86e3c2017a368ea8fee7 |
| | | 9 | SHA1 (patch-crypto_cipher_aes__icm.c) = 7e402b790678bd6c27daf8f56bf0a1123b087d07 |
| | | 10 | SHA1 (patch-crypto_math_datatypes.c) = f5358856026b91ae40db4a7c38bae6138656d94e |
| | | 11 | SHA1 (patch-crypto_math_gf2__8.c) = 4e878e3debc2c287dcbce6ab1127ba8cd22352c3 |
| | | 12 | SHA1 (patch-crypto_math_math.c) = 06961bd3184b0e47475f76a55d9669ce6d3a7149 |
9 | SHA1 (patch-include_srtp.h) = 4e680a004d14a338c7ec4cc135f21da38490c315 | | 13 | SHA1 (patch-include_srtp.h) = 4e680a004d14a338c7ec4cc135f21da38490c315 |
10 | SHA1 (patch-srtp_srtp.c) = 90f2674702dc2070350abc61f7773a4a6234ae33 | | 14 | SHA1 (patch-srtp_srtp.c) = 90f2674702dc2070350abc61f7773a4a6234ae33 |
11 | SHA1 (patch-test_rtpw__test.sh) = 00f28ef1e91b963ab4d413ac10925150bff4b6be | | 15 | SHA1 (patch-test_rtpw__test.sh) = 00f28ef1e91b963ab4d413ac10925150bff4b6be |
$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);
}
$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;
$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;
$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;