Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:15.4:Update
telegram-desktop
0002-tg_owt-fix-name-confliction.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0002-tg_owt-fix-name-confliction.patch of Package telegram-desktop
diff --git a/tg_owt-master/src/pc/external_hmac.cc b/tg_owt/src/pc/external_hmac.cc index 99021f8..19b87cb 100644 --- a/tg_owt-master/src/pc/external_hmac.cc +++ b/tg_owt/src/pc/external_hmac.cc @@ -15,7 +15,7 @@ #include "rtc_base/logging.h" #include "rtc_base/zero_memory.h" -#include "third_party/libsrtp/include/srtp.h" +#include "third_party/libsrtp/include/private_srtp.h" // Begin test case 0 */ static const uint8_t kExternalHmacTestCase0Key[20] = { diff --git a/tg_owt-master/src/pc/external_hmac.h b/tg_owt/src/pc/external_hmac.h index 3319bea..3c1cffc 100644 --- a/tg_owt-master/src/pc/external_hmac.h +++ b/tg_owt/src/pc/external_hmac.h @@ -32,7 +32,7 @@ #include "third_party/libsrtp/crypto/include/auth.h" #include "third_party/libsrtp/crypto/include/crypto_types.h" -#include "third_party/libsrtp/include/srtp.h" +#include "third_party/libsrtp/include/private_srtp.h" #define EXTERNAL_HMAC_SHA1 SRTP_HMAC_SHA1 + 1 #define HMAC_KEY_LENGTH 20 diff --git a/tg_owt-master/src/pc/srtp_session.cc b/tg_owt/src/pc/srtp_session.cc index 5ded455..90643f8 100644 --- a/tg_owt-master/src/pc/srtp_session.cc +++ b/tg_owt/src/pc/srtp_session.cc @@ -21,7 +21,7 @@ #include "rtc_base/time_utils.h" #include "system_wrappers/include/field_trial.h" #include "system_wrappers/include/metrics.h" -#include "third_party/libsrtp/include/srtp.h" +#include "third_party/libsrtp/include/private_srtp.h" #include "third_party/libsrtp/include/srtp_priv.h" namespace cricket { diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/aes_gcm_ossl.c b/tg_owt/src/third_party/libsrtp/crypto/cipher/aes_gcm_ossl.c index b3a449b..ab4c529 100644 --- a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/aes_gcm_ossl.c +++ b/tg_owt/src/third_party/libsrtp/crypto/cipher/aes_gcm_ossl.c @@ -50,7 +50,7 @@ #include "aes_icm_ossl.h" #include "aes_gcm_ossl.h" #include "alloc.h" -#include "err.h" /* for srtp_debug */ +#include "private_err.h" /* for srtp_debug */ #include "crypto_types.h" #include "cipher_types.h" diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/aes_icm_ossl.c b/tg_owt/src/third_party/libsrtp/crypto/cipher/aes_icm_ossl.c index fcd75e8..8ecdd9f 100644 --- a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/aes_icm_ossl.c +++ b/tg_owt/src/third_party/libsrtp/crypto/cipher/aes_icm_ossl.c @@ -53,7 +53,7 @@ #include <openssl/evp.h> #include "aes_icm_ossl.h" #include "crypto_types.h" -#include "err.h" /* for srtp_debug */ +#include "private_err.h" /* for srtp_debug */ #include "alloc.h" #include "cipher_types.h" diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/cipher.c b/tg_owt/src/third_party/libsrtp/crypto/cipher/cipher.c index 822cff0..2593183 100644 --- a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/cipher.c +++ b/tg_owt/src/third_party/libsrtp/crypto/cipher/cipher.c @@ -48,7 +48,7 @@ #include "cipher.h" #include "crypto_types.h" -#include "err.h" /* for srtp_debug */ +#include "private_err.h" /* for srtp_debug */ #include "alloc.h" /* for crypto_alloc(), crypto_free() */ srtp_debug_module_t srtp_mod_cipher = { diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/null_cipher.c b/tg_owt/src/third_party/libsrtp/crypto/cipher/null_cipher.c index f5e4469..1576150 100644 --- a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/null_cipher.c +++ b/tg_owt/src/third_party/libsrtp/crypto/cipher/null_cipher.c @@ -48,7 +48,7 @@ #include "datatypes.h" #include "null_cipher.h" -#include "err.h" /* for srtp_debug */ +#include "private_err.h" /* for srtp_debug */ #include "alloc.h" #include "cipher_types.h" diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/hash/auth.c b/tg_owt/src/third_party/libsrtp/crypto/hash/auth.c index 9ffbfb2..0ef283d 100644 --- a/tg_owt-master/src/third_party/libsrtp/crypto/hash/auth.c +++ b/tg_owt/src/third_party/libsrtp/crypto/hash/auth.c @@ -46,7 +46,7 @@ #include "config.h" #include "auth.h" -#include "err.h" /* for srtp_debug */ +#include "private_err.h" /* for srtp_debug */ #include "datatypes.h" /* for octet_string */ /* the debug module for authentiation */ diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/hash/hmac_ossl.c b/tg_owt/src/third_party/libsrtp/crypto/hash/hmac_ossl.c index 36cfb71..8cb52b9 100644 --- a/tg_owt-master/src/third_party/libsrtp/crypto/hash/hmac_ossl.c +++ b/tg_owt/src/third_party/libsrtp/crypto/hash/hmac_ossl.c @@ -46,7 +46,7 @@ #include "auth.h" #include "alloc.h" -#include "err.h" /* for srtp_debug */ +#include "private_err.h" /* for srtp_debug */ #include <openssl/evp.h> #include <openssl/hmac.h> diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/hash/null_auth.c b/tg_owt/src/third_party/libsrtp/crypto/hash/null_auth.c index 01d7722..219d47d 100644 --- a/tg_owt-master/src/third_party/libsrtp/crypto/hash/null_auth.c +++ b/tg_owt/src/third_party/libsrtp/crypto/hash/null_auth.c @@ -47,7 +47,7 @@ #include "config.h" #include "null_auth.h" -#include "err.h" /* for srtp_debug */ +#include "private_err.h" /* for srtp_debug */ #include "alloc.h" #include "cipher_types.h" diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/aes_gcm_ossl.h b/tg_owt/src/third_party/libsrtp/crypto/include/aes_gcm_ossl.h index d5b83ee..c1862e1 100644 --- a/tg_owt-master/src/third_party/libsrtp/crypto/include/aes_gcm_ossl.h +++ b/tg_owt/src/third_party/libsrtp/crypto/include/aes_gcm_ossl.h @@ -47,7 +47,7 @@ #define AES_GCM_OSSL_H #include "cipher.h" -#include "srtp.h" +#include "private_srtp.h" #include "datatypes.h" #include <openssl/evp.h> #include <openssl/aes.h> diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/auth.h b/tg_owt/src/third_party/libsrtp/crypto/include/auth.h index 774ea16..11f3b93 100644 --- a/tg_owt-master/src/third_party/libsrtp/crypto/include/auth.h +++ b/tg_owt/src/third_party/libsrtp/crypto/include/auth.h @@ -46,7 +46,7 @@ #ifndef SRTP_AUTH_H #define SRTP_AUTH_H -#include "srtp.h" +#include "private_srtp.h" #include "crypto_types.h" /* for values of auth_type_id_t */ #ifdef __cplusplus diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/cipher.h b/tg_owt/src/third_party/libsrtp/crypto/include/cipher.h index 4f14e35..2221cda 100644 --- a/tg_owt-master/src/third_party/libsrtp/crypto/include/cipher.h +++ b/tg_owt/src/third_party/libsrtp/crypto/include/cipher.h @@ -45,7 +45,7 @@ #ifndef SRTP_CIPHER_H #define SRTP_CIPHER_H -#include "srtp.h" +#include "private_srtp.h" #include "crypto_types.h" /* for values of cipher_type_id_t */ #ifdef __cplusplus diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/cipher_types.h b/tg_owt/src/third_party/libsrtp/crypto/include/cipher_types.h index a543b54..88228df 100644 --- a/tg_owt-master/src/third_party/libsrtp/crypto/include/cipher_types.h +++ b/tg_owt/src/third_party/libsrtp/crypto/include/cipher_types.h @@ -39,6 +39,7 @@ #include "cipher.h" #include "auth.h" +#include "private_err.h" /* * cipher types that can be included in the kernel diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/crypto_kernel.h b/tg_owt/src/third_party/libsrtp/crypto/include/crypto_kernel.h index 1f8dfa7..0005b7d 100644 --- a/tg_owt-master/src/third_party/libsrtp/crypto/include/crypto_kernel.h +++ b/tg_owt/src/third_party/libsrtp/crypto/include/crypto_kernel.h @@ -47,7 +47,7 @@ #include "cipher.h" #include "auth.h" -#include "err.h" +#include "private_err.h" #include "crypto_types.h" #include "key.h" diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/key.h b/tg_owt/src/third_party/libsrtp/crypto/include/key.h index 3498114..fe0c220 100644 --- a/tg_owt-master/src/third_party/libsrtp/crypto/include/key.h +++ b/tg_owt/src/third_party/libsrtp/crypto/include/key.h @@ -46,7 +46,7 @@ #define KEY_H #include "rdbx.h" /* for srtp_xtd_seq_num_t */ -#include "err.h" +#include "private_err.h" #ifdef __cplusplus extern "C" { diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/aes.h b/tg_owt/src/third_party/libsrtp/crypto/include/private_aes.h similarity index 98% rename from tg_owt-master/src/third_party/libsrtp/crypto/include/aes.h rename to tg_owt/src/third_party/libsrtp/crypto/include/private_aes.h index 779c3ac..e257fb2 100644 --- a/tg_owt-master/src/third_party/libsrtp/crypto/include/aes.h +++ b/tg_owt/src/third_party/libsrtp/crypto/include/private_aes.h @@ -47,7 +47,7 @@ #define AES_H #include "datatypes.h" -#include "err.h" +#include "private_err.h" #ifdef __cplusplus extern "C" { diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/err.h b/tg_owt/src/third_party/libsrtp/crypto/include/private_err.h similarity index 99% rename from tg_owt-master/src/third_party/libsrtp/crypto/include/err.h rename to tg_owt/src/third_party/libsrtp/crypto/include/private_err.h index 66a1023..d82191a 100644 --- a/tg_owt-master/src/third_party/libsrtp/crypto/include/err.h +++ b/tg_owt/src/third_party/libsrtp/crypto/include/private_err.h @@ -47,7 +47,7 @@ #include <stdio.h> #include <stdarg.h> -#include "srtp.h" +#include "private_srtp.h" #ifdef __cplusplus extern "C" { diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/rdb.h b/tg_owt/src/third_party/libsrtp/crypto/include/rdb.h index 98314c1..97387c0 100644 --- a/tg_owt-master/src/third_party/libsrtp/crypto/include/rdb.h +++ b/tg_owt/src/third_party/libsrtp/crypto/include/rdb.h @@ -48,7 +48,7 @@ #include "integers.h" /* for uint32_t */ #include "datatypes.h" /* for v128_t */ -#include "err.h" /* for srtp_err_status_t */ +#include "private_err.h" /* for srtp_err_status_t */ #ifdef __cplusplus extern "C" { diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/rdbx.h b/tg_owt/src/third_party/libsrtp/crypto/include/rdbx.h index 2194178..8740996 100644 --- a/tg_owt-master/src/third_party/libsrtp/crypto/include/rdbx.h +++ b/tg_owt/src/third_party/libsrtp/crypto/include/rdbx.h @@ -48,7 +48,7 @@ #define RDBX_H #include "datatypes.h" -#include "err.h" +#include "private_err.h" #ifdef __cplusplus extern "C" { diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/stat.h b/tg_owt/src/third_party/libsrtp/crypto/include/stat.h index 1894e04..8001645 100644 --- a/tg_owt-master/src/third_party/libsrtp/crypto/include/stat.h +++ b/tg_owt/src/third_party/libsrtp/crypto/include/stat.h @@ -47,7 +47,7 @@ #define STAT_H #include "datatypes.h" /* for uint8_t */ -#include "err.h" /* for srtp_err_status_t */ +#include "private_err.h" /* for srtp_err_status_t */ #ifdef __cplusplus extern "C" { diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/kernel/err.c b/tg_owt/src/third_party/libsrtp/crypto/kernel/err.c index e9bb64b..ff4123f 100644 --- a/tg_owt-master/src/third_party/libsrtp/crypto/kernel/err.c +++ b/tg_owt/src/third_party/libsrtp/crypto/kernel/err.c @@ -44,7 +44,7 @@ #include "config.h" -#include "err.h" +#include "private_err.h" #include "datatypes.h" #include <string.h> diff --git a/tg_owt-master/src/third_party/libsrtp/include/ekt.h b/tg_owt/src/third_party/libsrtp/include/ekt.h index a289a53..d87d60d 100644 --- a/tg_owt-master/src/third_party/libsrtp/include/ekt.h +++ b/tg_owt/src/third_party/libsrtp/include/ekt.h @@ -62,6 +62,7 @@ // left in commented out as reminder to not include private headers //#include "srtp_priv.h" +#include "private_aes.h" #ifdef __cplusplus extern "C" { diff --git a/tg_owt-master/src/third_party/libsrtp/include/srtp.h b/tg_owt/src/third_party/libsrtp/include/private_srtp.h similarity index 100% rename from tg_owt-master/src/third_party/libsrtp/include/srtp.h rename to tg_owt/src/third_party/libsrtp/include/private_srtp.h diff --git a/tg_owt-master/src/third_party/libsrtp/include/srtp_priv.h b/tg_owt/src/third_party/libsrtp/include/srtp_priv.h index 1e86df7..6fd4997 100644 --- a/tg_owt-master/src/third_party/libsrtp/include/srtp_priv.h +++ b/tg_owt/src/third_party/libsrtp/include/srtp_priv.h @@ -48,13 +48,13 @@ // Leave this as the top level import. Ensures the existence of defines #include "config.h" -#include "srtp.h" +#include "private_srtp.h" #include "rdbx.h" #include "rdb.h" #include "integers.h" #include "cipher.h" #include "auth.h" -#include "aes.h" +#include "private_aes.h" #include "key.h" #include "crypto_kernel.h" diff --git a/tg_owt-master/src/third_party/libsrtp/srtp/ekt.c b/tg_owt/src/third_party/libsrtp/srtp/ekt.c index b54ecf6..96b0a1d 100644 --- a/tg_owt-master/src/third_party/libsrtp/srtp/ekt.c +++ b/tg_owt/src/third_party/libsrtp/srtp/ekt.c @@ -43,7 +43,7 @@ */ #include "srtp_priv.h" -#include "err.h" +#include "private_err.h" #include "ekt.h" extern srtp_debug_module_t mod_srtp; diff --git a/tg_owt-master/src/third_party/libsrtp/srtp/srtp.c b/tg_owt/src/third_party/libsrtp/srtp/srtp.c index 4462501..6de2495 100644 --- a/tg_owt-master/src/third_party/libsrtp/srtp/srtp.c +++ b/tg_owt/src/third_party/libsrtp/srtp/srtp.c @@ -47,10 +47,11 @@ #include "srtp_priv.h" #include "crypto_types.h" -#include "err.h" +#include "private_err.h" #include "ekt.h" /* for SRTP Encrypted Key Transport */ #include "alloc.h" /* for srtp_crypto_alloc() */ + #ifdef OPENSSL #include "aes_gcm_ossl.h" /* for AES GCM mode */ #ifdef OPENSSL_KDF
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
