]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Revert "fix compiler warning vs2010" - Jeff is faster than I
authorSeven Du <dujinfang@gmail.com>
Tue, 25 Feb 2014 06:24:34 +0000 (14:24 +0800)
committerSeven Du <dujinfang@gmail.com>
Tue, 25 Feb 2014 06:24:34 +0000 (14:24 +0800)
This reverts commit fa9217117a9a729b424fde83fcc9a66a733a8282.

libs/srtp/crypto/cipher/aes_gcm_ossl.c
libs/srtp/srtp/srtp.c

index cb890cb043011d1c0b18cad1d04c4dea93f9a7d7..f36ce9d3b29cf186f7f3ae4c114a0389ecd06e20 100644 (file)
@@ -261,7 +261,7 @@ err_status_t aes_gcm_openssl_set_aad (aes_gcm_ctx_t *c, unsigned char *aad,
     EVP_CIPHER_CTX_ctrl(&c->ctx, EVP_CTRL_GCM_SET_TAG, c->tag_len, aad);
 
     rv = EVP_Cipher(&c->ctx, NULL, aad, aad_len);
-    if (rv != (int)aad_len) {
+    if (rv != aad_len) {
         return (err_status_algo_fail);
     } else {
         return (err_status_ok);
index e545399719d68f1dc839b28f490dce5e262e1611..4dbda3e2724fe37aa8ee9f98ccc1751e8a4730e9 100644 (file)
@@ -2330,7 +2330,7 @@ srtp_unprotect_rtcp_aead (srtp_t ctx, srtp_stream_ctx_t *stream,
     tag_len = auth_get_tag_length(stream->rtcp_auth);
 
     /* Validate packet length */
-    if (*pkt_octet_len < (int)(octets_in_rtcp_header + tag_len + 
+    if (*pkt_octet_len < (octets_in_rtcp_header + tag_len + 
                           sizeof(srtcp_trailer_t))) {
         return err_status_bad_param;
     }