diff options
| author |   Stephan Hartmann <stha09@googlemail.com> | 2020-06-12 18:53:01 +0200 |
|---|---|---|
| committer |   Mike Gilbert <floppym@gentoo.org> | 2020-06-12 12:55:57 -0400 |
| commit | 67270353460d76130476dea6730903a595db3153 (patch) | |
| tree | 4402d9df7f852ab760e3b9068b88ab89201078d3 /net-libs/libsrtp/files | |
| parent | eclass/cargo.eclass: drop EAPI=6 support (diff) | |
| download | gentoo-67270353460d76130476dea6730903a595db3153.tar.gz gentoo-67270353460d76130476dea6730903a595db3153.tar.bz2 gentoo-67270353460d76130476dea6730903a595db3153.zip | |
net-libs/libsrtp: version bump to 2.3.0
Closes: https://bugs.gentoo.org/723492
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Stephan Hartmann <stha09@googlemail.com>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/16204
Diffstat (limited to 'net-libs/libsrtp/files')
| -rw-r--r-- | net-libs/libsrtp/files/libsrtp-2.3.0-gcc-10.patch | 26 | ||||
| -rw-r--r-- | net-libs/libsrtp/files/libsrtp-2.3.0-nss.patch | 12 |
2 files changed, 38 insertions, 0 deletions
diff --git a/net-libs/libsrtp/files/libsrtp-2.3.0-gcc-10.patch b/net-libs/libsrtp/files/libsrtp-2.3.0-gcc-10.patch new file mode 100644 index 000000000000..67d4ad86d516 --- /dev/null +++ b/net-libs/libsrtp/files/libsrtp-2.3.0-gcc-10.patch @@ -0,0 +1,26 @@ +diff --git a/crypto/math/datatypes.c b/crypto/math/datatypes.c +index 001584c..4fcb396 100644 +--- a/crypto/math/datatypes.c ++++ b/crypto/math/datatypes.c +@@ -79,7 +79,7 @@ int octet_get_weight(uint8_t octet) + + /* the value MAX_PRINT_STRING_LEN is defined in datatypes.h */ + +-char bit_string[MAX_PRINT_STRING_LEN]; ++static char bit_string[MAX_PRINT_STRING_LEN]; + + uint8_t srtp_nibble_to_hex_char(uint8_t nibble) + { +diff --git a/test/util.c b/test/util.c +index 2abc28e..c0f7614 100644 +--- a/test/util.c ++++ b/test/util.c +@@ -49,7 +49,7 @@ + #include <stdint.h> + + /* include space for null terminator */ +-char bit_string[MAX_PRINT_STRING_LEN + 1]; ++static char bit_string[MAX_PRINT_STRING_LEN + 1]; + + static inline int hex_char_to_nibble(uint8_t c) + { diff --git a/net-libs/libsrtp/files/libsrtp-2.3.0-nss.patch b/net-libs/libsrtp/files/libsrtp-2.3.0-nss.patch new file mode 100644 index 000000000000..6f71839e69da --- /dev/null +++ b/net-libs/libsrtp/files/libsrtp-2.3.0-nss.patch @@ -0,0 +1,12 @@ +diff --git a/crypto/cipher/aes_gcm_nss.c b/crypto/cipher/aes_gcm_nss.c +index 54547cd..ecbba64 100644 +--- a/crypto/cipher/aes_gcm_nss.c ++++ b/crypto/cipher/aes_gcm_nss.c +@@ -284,6 +284,7 @@ static srtp_err_status_t srtp_aes_gcm_nss_do_crypto(void *cv, + + c->params.pIv = c->iv; + c->params.ulIvLen = GCM_IV_LEN; ++ c->params.ulIvBits = 8 * GCM_IV_LEN; + c->params.pAAD = c->aad; + c->params.ulAADLen = c->aad_size; + |