Open Build Service

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 3

_service:tar_scm_kernel_repo:libsrtp.spec Changed

@@ -1,19 +1,13 @@
 Name:           libsrtp
-Version:        1.5.4
-Release:        10
+Version:        2.4.2
+Release:        1
 Summary:        Library for SRTP (Secure Realtime Transport Protocol)
 License:        BSD
 URL:            https://github.com/cisco/libsrtp
 Source0:        https://github.com/cisco/libsrtp/archive/v%{version}.tar.gz
-Source2:        config.h
 
 BuildRequires:  gcc
 
-Patch0000:      libsrtp-1.5.4-shared-fix.patch
-Patch0001:      libsrtp-srtp_aes_encrypt.patch
-Patch0002:      libsrtp-sha1-name-fix.patch
-Patch0003:      libsrtp-fix-name-collision-on-MIPS.patch
-
 %description
 This package provides an implementation of the Secure Real-time Transport Protocol (SRTP),
 the Universal Security Transform (UST), and a supporting cryptographic kernel.
@@ -38,23 +32,23 @@
 %make_install
 %delete_la
 
-mv -f %{buildroot}%{_includedir}/srtp/config.h %{buildroot}%{_includedir}/srtp/config-%{__isa_bits}.h
-install -pm644 %{SOURCE2} %{buildroot}%{_includedir}/srtp/config.h
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
 %license LICENSE
-%doc CHANGES README TODO VERSION doc/*.txt doc/*.pdf
+%doc CHANGES README.md
 %{_libdir}/*.so.*
 
 %files devel
-%{_includedir}/srtp/
-%{_libdir}/pkgconfig/libsrtp.pc
+%{_includedir}/srtp2/
+%{_libdir}/pkgconfig/libsrtp2.pc
 %{_libdir}/*.so
 
 %changelog
+* Fri Jan 14 2022 wangkai <wangkai385@huawei.com> - 2.4.2-1
+- Update to 2.4.2
+
 * Tue Oct 23 2019 huzhiyu <huzhiyu1@huawei.com> - 1.5.4-10
 - Package init

_service:tar_scm_kernel_repo:libsrtp-1.5.4-shared-fix.patch Deleted

@@ -1,36 +0,0 @@
-diff -up libsrtp-1.5.4/Makefile.in.sharedfix libsrtp-1.5.4/Makefile.in
---- libsrtp-1.5.4/Makefile.in.sharedfix	2016-02-02 14:56:49.000000000 -0500
-+++ libsrtp-1.5.4/Makefile.in	2016-02-12 09:38:18.228208296 -0500
-@@ -84,12 +84,14 @@ pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libsrtp.pc
- endif
- 
--SHAREDLIBVERSION = 1
-+SHAREDLIBMINIVER = 1
-+SHAREDLIBVERSION = $(SHAREDLIBMINIVER).0.0
- ifeq (linux,$(findstring linux,@host@))
- SHAREDLIB_DIR = $(libdir)
--SHAREDLIB_LDFLAGS = -shared -Wl,-soname,$@
- SHAREDLIBSUFFIXNOVER = so
- SHAREDLIBSUFFIX = $(SHAREDLIBSUFFIXNOVER).$(SHAREDLIBVERSION)
-+SHAREDLIBMINISUFFIX = $(SHAREDLIBSUFFIXNOVER).$(SHAREDLIBMINIVER)
-+SHAREDLIB_LDFLAGS = -shared -Wl,-soname,libsrtp.$(SHAREDLIBMINISUFFIX)
- else ifeq (mingw,$(findstring mingw,@host@))
- SHAREDLIB_DIR = $(bindir)
- SHAREDLIB_LDFLAGS = -shared -Wl,--out-implib,libsrtp.dll.a
-@@ -148,6 +150,7 @@ libsrtp.$(SHAREDLIBSUFFIX): $(srtpobj) $
- 	$(CC) -shared -o $@ $(SHAREDLIB_LDFLAGS) \
-                 $^ $(LDFLAGS) $(LIBS)
- 	if [ -n "$(SHAREDLIBVERSION)" ]; then \
-+		ln -sfn $@ libsrtp.$(SHAREDLIBMINISUFFIX); \
- 		ln -sfn $@ libsrtp.$(SHAREDLIBSUFFIXNOVER); \
- 	fi
- 
-@@ -274,6 +277,7 @@ install:
- 		$(INSTALL) -d $(DESTDIR)$(SHAREDLIB_DIR); \
- 		cp libsrtp.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/; \
- 		ln -sfn libsrtp.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/libsrtp.$(SHAREDLIBSUFFIXNOVER); \
-+		ln -sfn libsrtp.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/libsrtp.$(SHAREDLIBMINISUFFIX); \
- 	fi
- 	if [ "$(pkgconfig_DATA)" != "" ]; then \
- 		$(INSTALL) -d $(DESTDIR)$(pkgconfigdir); \

_service:tar_scm_kernel_repo:libsrtp-fix-name-collision-on-MIPS.patch Deleted

@@ -1,55 +0,0 @@
-diff -urp libsrtp-1.5.0/test/srtp_driver.c l/test/srtp_driver.c
---- libsrtp-1.5.0/test/srtp_driver.c	2014-10-13 16:35:33.000000000 +0200
-+++ libsrtp-1.5.4/test/srtp_driver.c	2015-09-18 06:41:50.740727805 +0200
-@@ -341,7 +341,7 @@ main (int argc, char *argv[]) {
-   if (do_codec_timing) {
-     srtp_policy_t policy;
-     int ignore;
--    double mips = mips_estimate(1000000000, &ignore);
-+    double mips_est = mips_estimate(1000000000, &ignore);
- 
-     crypto_policy_set_rtp_default(&policy.rtp);
-     crypto_policy_set_rtcp_default(&policy.rtcp);
-@@ -353,33 +353,33 @@ main (int argc, char *argv[]) {
-     policy.allow_repeat_tx = 0;
-     policy.next = NULL;
- 
--    printf("mips estimate: %e\n", mips);
-+    printf("mips estimate: %e\n", mips_est);
- 
-     printf("testing srtp processing time for voice codecs:\n");
-     printf("codec\t\tlength (octets)\t\tsrtp instructions/second\n");
-     printf("G.711\t\t%d\t\t\t%e\n", 80, 
--           (double) mips * (80 * 8) / 
-+           (double) mips_est * (80 * 8) / 
- 	   srtp_bits_per_second(80, &policy) / .01 );
-     printf("G.711\t\t%d\t\t\t%e\n", 160, 
--           (double) mips * (160 * 8) / 
-+           (double) mips_est * (160 * 8) / 
- 	   srtp_bits_per_second(160, &policy) / .02);
-     printf("G.726-32\t%d\t\t\t%e\n", 40, 
--           (double) mips * (40 * 8) / 
-+           (double) mips_est * (40 * 8) / 
- 	   srtp_bits_per_second(40, &policy) / .01 );
-     printf("G.726-32\t%d\t\t\t%e\n", 80, 
--           (double) mips * (80 * 8) / 
-+           (double) mips_est * (80 * 8) / 
- 	   srtp_bits_per_second(80, &policy) / .02);
-     printf("G.729\t\t%d\t\t\t%e\n", 10, 
--           (double) mips * (10 * 8) / 
-+           (double) mips_est * (10 * 8) / 
- 	   srtp_bits_per_second(10, &policy) / .01 );
-     printf("G.729\t\t%d\t\t\t%e\n", 20, 
--           (double) mips * (20 * 8) /
-+           (double) mips_est * (20 * 8) /
- 	   srtp_bits_per_second(20, &policy) / .02 );
-     printf("Wideband\t%d\t\t\t%e\n", 320, 
--           (double) mips * (320 * 8) /
-+           (double) mips_est * (320 * 8) /
- 	   srtp_bits_per_second(320, &policy) / .01 );
-     printf("Wideband\t%d\t\t\t%e\n", 640, 
--           (double) mips * (640 * 8) /
-+           (double) mips_est * (640 * 8) /
- 	   srtp_bits_per_second(640, &policy) / .02 );
-   }
-

_service:tar_scm_kernel_repo:libsrtp-sha1-name-fix.patch Deleted

@@ -1,174 +0,0 @@
-diff -rup libsrtp-1.5.0/crypto/hash/hmac.c libsrtp-1.5.0/crypto/hash/hmac.c
---- libsrtp-1.5.0/crypto/hash/hmac.c	2014-10-13 10:35:33.000000000 -0400
-+++ libsrtp-1.5.0/crypto/hash/hmac.c	2014-10-31 09:15:20.666474444 -0400
-@@ -141,10 +141,10 @@ hmac_init(hmac_ctx_t *state, const uint8
-   debug_print(mod_hmac, "ipad: %s", octet_string_hex_string(ipad, 64));
-   
-   /* initialize sha1 context */
--  sha1_init(&state->init_ctx);
-+  crypto_sha1_init(&state->init_ctx);
- 
-   /* hash ipad ^ key */
--  sha1_update(&state->init_ctx, ipad, 64);
-+  crypto_sha1_update(&state->init_ctx, ipad, 64);
-   memcpy(&state->ctx, &state->init_ctx, sizeof(sha1_ctx_t)); 
- 
-   return err_status_ok;
-@@ -165,7 +165,7 @@ hmac_update(hmac_ctx_t *state, const uin
- 	      octet_string_hex_string(message, msg_octets));
-   
-   /* hash message into sha1 context */
--  sha1_update(&state->ctx, message, msg_octets);
-+  crypto_sha1_update(&state->ctx, message, msg_octets);
- 
-   return err_status_ok;
- }
-@@ -183,7 +183,7 @@ hmac_compute(hmac_ctx_t *state, const vo
-   
-   /* hash message, copy output into H */
-   hmac_update(state, (const uint8_t*)message, msg_octets);
--  sha1_final(&state->ctx, H);
-+  crypto_sha1_final(&state->ctx, H);
- 
-   /*
-    * note that we don't need to debug_print() the input, since the
-@@ -193,16 +193,16 @@ hmac_compute(hmac_ctx_t *state, const vo
- 	      octet_string_hex_string((uint8_t *)H, 20));
- 
-   /* re-initialize hash context */
--  sha1_init(&state->ctx);
-+  crypto_sha1_init(&state->ctx);
-   
-   /* hash opad ^ key  */
--  sha1_update(&state->ctx, (uint8_t *)state->opad, 64);
-+  crypto_sha1_update(&state->ctx, (uint8_t *)state->opad, 64);
- 
-   /* hash the result of the inner hash */
--  sha1_update(&state->ctx, (uint8_t *)H, 20);
-+  crypto_sha1_update(&state->ctx, (uint8_t *)H, 20);
-   
-   /* the result is returned in the array hash_value[] */
--  sha1_final(&state->ctx, hash_value);
-+  crypto_sha1_final(&state->ctx, hash_value);
- 
-   /* copy hash_value to *result */
-   for (i=0; i < tag_len; i++)    
-diff -rup libsrtp-1.5.0/crypto/hash/sha1.c libsrtp-1.5.0/crypto/hash/sha1.c
---- libsrtp-1.5.0/crypto/hash/sha1.c	2014-10-13 10:35:33.000000000 -0400
-+++ libsrtp-1.5.0/crypto/hash/sha1.c	2014-10-31 09:15:20.667474449 -0400
-@@ -77,12 +77,12 @@ uint32_t SHA_K2 = 0x8F1BBCDC;   /* Kt fo
- uint32_t SHA_K3 = 0xCA62C1D6;   /* Kt for 60 <= t <= 79 */
- 
- void
--sha1(const uint8_t *msg,  int octets_in_msg, uint32_t hash_value[5]) {
-+crypto_sha1(const uint8_t *msg,  int octets_in_msg, uint32_t hash_value[5]) {
-   sha1_ctx_t ctx;
- 
--  sha1_init(&ctx);
--  sha1_update(&ctx, msg, octets_in_msg);
--  sha1_final(&ctx, hash_value);
-+  crypto_sha1_init(&ctx);
-+  crypto_sha1_update(&ctx, msg, octets_in_msg);
-+  crypto_sha1_final(&ctx, hash_value);
- 
- }
- 
-@@ -99,7 +99,7 @@ sha1(const uint8_t *msg,  int octets_in_
-  */
- 
- void
--sha1_core(const uint32_t M[16], uint32_t hash_value[5]) {
-+crypto_sha1_core(const uint32_t M[16], uint32_t hash_value[5]) {
-   uint32_t H0;
-   uint32_t H1;
-   uint32_t H2;
-@@ -186,7 +186,7 @@ sha1_core(const uint32_t M[16], uint32_t
- }
- 
- void
--sha1_init(sha1_ctx_t *ctx) {
-+crypto_sha1_init(sha1_ctx_t *ctx) {
- 
-   /* initialize state vector */
-   ctx->H[0] = 0x67452301;
-@@ -204,7 +204,7 @@ sha1_init(sha1_ctx_t *ctx) {
- }
- 
- void
--sha1_update(sha1_ctx_t *ctx, const uint8_t *msg, int octets_in_msg) {
-+crypto_sha1_update(sha1_ctx_t *ctx, const uint8_t *msg, int octets_in_msg) {
-   int i;
-   uint8_t *buf = (uint8_t *)ctx->M;
- 
-@@ -229,7 +229,7 @@ sha1_update(sha1_ctx_t *ctx, const uint8
- 
-       debug_print(mod_sha1, "(update) running sha1_core()", NULL);
- 
--      sha1_core(ctx->M, ctx->H);
-+      crypto_sha1_core(ctx->M, ctx->H);
- 
-     } else {
- 
-@@ -252,7 +252,7 @@ sha1_update(sha1_ctx_t *ctx, const uint8
-  */
- 
- void
--sha1_final(sha1_ctx_t *ctx, uint32_t *output) {
-+crypto_sha1_final(sha1_ctx_t *ctx, uint32_t *output) {
-   uint32_t A, B, C, D, E, TEMP;
-   uint32_t W[80];  
-   int i, t;
-diff -rup libsrtp-1.5.0/crypto/include/sha1.h libsrtp-1.5.0/crypto/include/sha1.h
---- libsrtp-1.5.0/crypto/include/sha1.h	2014-10-13 10:35:33.000000000 -0400
-+++ libsrtp-1.5.0/crypto/include/sha1.h	2014-10-31 09:16:10.367733196 -0400
-@@ -103,7 +103,7 @@ typedef struct {
-  */
- 
- void
--sha1(const uint8_t *message,  int octets_in_msg, uint32_t output[5]);
-+crypto_sha1(const uint8_t *message,  int octets_in_msg, uint32_t output[5]);
- 
- /*
-  * sha1_init(&ctx) initializes the SHA1 context ctx
-@@ -117,13 +117,13 @@ sha1(const uint8_t *message,  int octets
-  */
- 
- void
--sha1_init(sha1_ctx_t *ctx);
-+crypto_sha1_init(sha1_ctx_t *ctx);
- 
- void
--sha1_update(sha1_ctx_t *ctx, const uint8_t *M, int octets_in_msg);
-+crypto_sha1_update(sha1_ctx_t *ctx, const uint8_t *M, int octets_in_msg);
- 
- void
--sha1_final(sha1_ctx_t *ctx, uint32_t output[5]);
-+crypto_sha1_final(sha1_ctx_t *ctx, uint32_t output[5]);
- 
- /*
-  * The sha1_core function is INTERNAL to SHA-1, but it is declared
-@@ -141,7 +141,7 @@ sha1_final(sha1_ctx_t *ctx, uint32_t out
-  */
- 
- void
--sha1_core(const uint32_t M[16], uint32_t hash_value[5]);
-+crypto_sha1_core(const uint32_t M[16], uint32_t hash_value[5]);
- 
- #endif /* else OPENSSL */
-      
-diff -rup libsrtp-1.5.0/crypto/test/sha1_driver.c libsrtp-1.5.0/crypto/test/sha1_driver.c
---- libsrtp-1.5.0/crypto/test/sha1_driver.c	2014-10-13 10:35:33.000000000 -0400
-+++ libsrtp-1.5.0/crypto/test/sha1_driver.c	2014-10-31 09:15:20.668474454 -0400
-@@ -113,9 +113,9 @@ sha1_test_case_validate(const hash_test_
-   if (test_case->data_len > MAX_HASH_DATA_LEN)
-     return err_status_bad_param;
- 
--  sha1_init(&ctx);
--  sha1_update(&ctx, test_case->data, test_case->data_len);
--  sha1_final(&ctx, hash_value);
-+  crypto_sha1_init(&ctx);
-+  crypto_sha1_update(&ctx, test_case->data, test_case->data_len);
-+  crypto_sha1_final(&ctx, hash_value);
-   if (0 == memcmp(test_case->hash, hash_value, 20)) {
- #if VERBOSE
-     printf("PASSED: reference value: %s\n",

_service:tar_scm_kernel_repo:libsrtp-srtp_aes_encrypt.patch Deleted

@@ -1,129 +0,0 @@
-diff -rup a/crypto/cipher/aes.c b/crypto/cipher/aes.c
---- a/crypto/cipher/aes.c	2014-10-13 10:35:33.000000000 -0400
-+++ b/crypto/cipher/aes.c	2014-10-31 09:25:20.603597823 -0400
-@@ -2002,7 +2002,7 @@ aes_inv_final_round(v128_t *state, const
- 
- 
- void
--aes_encrypt(v128_t *plaintext, const aes_expanded_key_t *exp_key) {
-+srtp_aes_encrypt(v128_t *plaintext, const aes_expanded_key_t *exp_key) {
- 
-   /* add in the subkey */
-   v128_xor_eq(plaintext, &exp_key->round[0]);
-diff -rup a/crypto/cipher/aes_cbc.c b/crypto/cipher/aes_cbc.c
---- a/crypto/cipher/aes_cbc.c	2014-10-13 10:35:33.000000000 -0400
-+++ b/crypto/cipher/aes_cbc.c	2014-10-31 09:25:20.604597828 -0400
-@@ -192,7 +192,7 @@ aes_cbc_encrypt(aes_cbc_ctx_t *c,
-     debug_print(mod_aes_cbc, "inblock:  %s", 
- 	      v128_hex_string(&c->state));
- 
--    aes_encrypt(&c->state, &c->expanded_key);
-+    srtp_aes_encrypt(&c->state, &c->expanded_key);
- 
-     debug_print(mod_aes_cbc, "outblock: %s", 
- 	      v128_hex_string(&c->state));
-diff -rup a/crypto/cipher/aes_icm.c b/crypto/cipher/aes_icm.c
---- a/crypto/cipher/aes_icm.c	2014-10-13 10:35:33.000000000 -0400
-+++ b/crypto/cipher/aes_icm.c	2014-10-31 09:25:20.604597828 -0400
-@@ -260,7 +260,7 @@ aes_icm_set_octet(aes_icm_ctx_t *c,
-   /* fill keystream buffer, if needed */
-   if (tail_num) {
-     v128_copy(&c->keystream_buffer, &c->counter);
--    aes_encrypt(&c->keystream_buffer, &c->expanded_key);
-+    srtp_aes_encrypt(&c->keystream_buffer, &c->expanded_key);
-     c->bytes_in_buffer = sizeof(v128_t);
- 
-     debug_print(mod_aes_icm, "counter:    %s", 
-@@ -316,7 +316,7 @@ 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);
--  aes_encrypt(&c->keystream_buffer, &c->expanded_key);
-+  srtp_aes_encrypt(&c->keystream_buffer, &c->expanded_key);
-   c->bytes_in_buffer = sizeof(v128_t);
- 
-   debug_print(mod_aes_icm, "counter:    %s", 
-diff -rup a/crypto/include/aes.h b/crypto/include/aes.h
---- a/crypto/include/aes.h	2014-10-13 10:35:33.000000000 -0400
-+++ b/crypto/include/aes.h	2014-10-31 09:25:20.604597828 -0400
-@@ -68,7 +68,7 @@ aes_expand_decryption_key(const uint8_t
- 			  aes_expanded_key_t *expanded_key);
- 
- void
--aes_encrypt(v128_t *plaintext, const aes_expanded_key_t *exp_key);
-+srtp_aes_encrypt(v128_t *plaintext, const aes_expanded_key_t *exp_key);
- 
- void
- aes_decrypt(v128_t *plaintext, const aes_expanded_key_t *exp_key);
-diff -rup a/crypto/rng/prng.c b/crypto/rng/prng.c
---- a/crypto/rng/prng.c	2014-10-13 10:35:33.000000000 -0400
-+++ b/crypto/rng/prng.c	2014-10-31 09:25:20.605597833 -0400
-@@ -112,7 +112,7 @@ x917_prng_get_octet_string(uint8_t *dest
-     v128_copy(&buffer, &x917_prng.state);
- 
-     /* apply aes to buffer */
--    aes_encrypt(&buffer, &x917_prng.key);
-+    srtp_aes_encrypt(&buffer, &x917_prng.key);
-     
-     /* write data to output */
-     *dest++ = buffer.v8[0];
-@@ -136,7 +136,7 @@ x917_prng_get_octet_string(uint8_t *dest
-     buffer.v32[0] ^= t;
- 
-     /* encrypt buffer */
--    aes_encrypt(&buffer, &x917_prng.key);
-+    srtp_aes_encrypt(&buffer, &x917_prng.key);
- 
-     /* copy buffer into state */
-     v128_copy(&x917_prng.state, &buffer);
-@@ -154,7 +154,7 @@ x917_prng_get_octet_string(uint8_t *dest
-     v128_copy(&buffer, &x917_prng.state);
- 
-     /* apply aes to buffer */
--    aes_encrypt(&buffer, &x917_prng.key);
-+    srtp_aes_encrypt(&buffer, &x917_prng.key);
- 
-     /* write data to output */
-     for (i=0; i < tail_len; i++) {
-@@ -167,7 +167,7 @@ x917_prng_get_octet_string(uint8_t *dest
-     buffer.v32[0] ^= t;
- 
-     /* encrypt buffer */
--    aes_encrypt(&buffer, &x917_prng.key);
-+    srtp_aes_encrypt(&buffer, &x917_prng.key);
- 
-     /* copy buffer into state */
-     v128_copy(&x917_prng.state, &buffer);
-diff -rup a/crypto/test/aes_calc.c b/crypto/test/aes_calc.c
---- a/crypto/test/aes_calc.c	2014-10-13 10:35:33.000000000 -0400
-+++ b/crypto/test/aes_calc.c	2014-10-31 09:25:20.605597833 -0400
-@@ -109,7 +109,7 @@ main (int argc, char *argv[]) {
-     exit(1);
-   }
- 
--  aes_encrypt(&data, &exp_key);
-+  srtp_aes_encrypt(&data, &exp_key);
- 
-   /* write ciphertext to output */
-   if (verbose) {
-diff -rup a/tables/aes_tables.c b/tables/aes_tables.c
---- a/tables/aes_tables.c	2014-10-13 10:35:33.000000000 -0400
-+++ b/tables/aes_tables.c	2014-10-31 09:25:20.605597833 -0400
-@@ -298,7 +298,7 @@ main(void) {
- 
- #if AES_INVERSE_TEST
-   /* 
--   * test that aes_encrypt and aes_decrypt are actually
-+   * test that srtp_aes_encrypt and aes_decrypt are actually
-    * inverses of each other 
-    */
-     
-@@ -335,7 +335,7 @@ aes_test_inverse(void) {
-   v128_copy_octet_string(&x, plaintext);
-   aes_expand_encryption_key(k, expanded_key);
-   aes_expand_decryption_key(k, decrypt_key);
--  aes_encrypt(&x, expanded_key);
-+  srtp_aes_encrypt(&x, expanded_key);
-   aes_decrypt(&x, decrypt_key);
-   
-   /* compare to expected value then report */

_service:tar_scm_kernel_repo:config.h Deleted

_service:tar_scm_kernel_repo:v1.5.4.tar.gz -> _service:tar_scm_kernel_repo:v2.4.2.tar.gz Changed