Update libsrtp to upstream 1.5.0

srtp/srtp/ekt.c

 /*
  * ekt.c
  *
  * Encrypted Key Transport for SRTP
  * 
  * David McGrew
  * Cisco Systems, Inc.
  */
 /*
  *      
@@ skipping 25 matching lines @@
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 
+#include "srtp_priv.h"
 #include "err.h"
-#include "srtp_priv.h"
 #include "ekt.h"
 
 extern debug_module_t mod_srtp;
 
 /*
  *  The EKT Authentication Tag format.
  *
  *    0                   1                   2                   3
  *    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
  *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ skipping 25 matching lines @@
   switch(ekt->data->ekt_cipher_type) {
   case EKT_CIPHER_AES_128_ECB:
     return 16 + EKT_OCTETS_AFTER_EMK;
     break;
   default:
     break;
   }
   return 0;
 }
 
-static INLINE ekt_spi_t
+static inline ekt_spi_t
 srtcp_packet_get_ekt_spi(const uint8_t *packet_start, unsigned pkt_octet_len) {
   const uint8_t *spi_location;
   
   spi_location = packet_start + (pkt_octet_len - EKT_SPI_LEN);
   
   return *((const ekt_spi_t *)spi_location);
 }
 
-static INLINE uint32_t
+static inline uint32_t
 srtcp_packet_get_ekt_roc(const uint8_t *packet_start, unsigned pkt_octet_len) {
   const uint8_t *roc_location;
   
   roc_location = packet_start + (pkt_octet_len - EKT_OCTETS_AFTER_ROC);
   
   return *((const uint32_t *)roc_location);
 }
 
-static INLINE const uint8_t *
+static inline const uint8_t *
 srtcp_packet_get_emk_location(const uint8_t *packet_start, 
                               unsigned pkt_octet_len) {
   const uint8_t *location;
   
   location = packet_start + (pkt_octet_len - EKT_OCTETS_AFTER_BASE_TAG);
 
   return location;
 }
 
 
@@ skipping 19 matching lines @@
 ekt_stream_init_from_policy(ekt_stream_t stream_data, ekt_policy_t policy) {
   if (!stream_data)
     return err_status_ok;
 
   return err_status_ok;
 }
 
 
 void
 aes_decrypt_with_raw_key(void *ciphertext, const void *key, int key_len) {
+#ifndef OPENSSL
+//FIXME: need to get this working through the crypto module interface
   aes_expanded_key_t expanded_key;
 
   aes_expand_decryption_key(key, key_len, &expanded_key);
   aes_decrypt(ciphertext, &expanded_key);
+#endif
 }
 
 /*
  * The function srtp_stream_init_from_ekt() initializes a stream using
  * the EKT data from an SRTCP trailer.  
  */
 
 err_status_t
 srtp_stream_init_from_ekt(srtp_stream_t stream,                   
                           const void *srtcp_hdr,
                           unsigned pkt_octet_len) {
   err_status_t err;
   const uint8_t *master_key;
   srtp_policy_t srtp_policy;
-  unsigned master_key_len;
   uint32_t roc;
 
   /*
    * NOTE: at present, we only support a single ekt_policy at a time.  
    */
   if (stream->ekt->data->spi != 
       srtcp_packet_get_ekt_spi(srtcp_hdr, pkt_octet_len))
     return err_status_no_ctx;
 
   if (stream->ekt->data->ekt_cipher_type != EKT_CIPHER_AES_128_ECB)
     return err_status_bad_param;
-  master_key_len = 16;
 
   /* decrypt the Encrypted Master Key field */
   master_key = srtcp_packet_get_emk_location(srtcp_hdr, pkt_octet_len);
   /* FIX!? This decrypts the master key in-place, and never uses it */
   /* FIX!? It's also passing to ekt_dec_key (which is an aes_expanded_key_t)
    * to a function which expects a raw (unexpanded) key */
   aes_decrypt_with_raw_key((void*)master_key, &stream->ekt->data->ekt_dec_key, 16);
 
   /* set the SRTP ROC */
   roc = srtcp_packet_get_ekt_roc(srtcp_hdr, pkt_octet_len);
@@ skipping 77 matching lines @@
   /* 
    * if there is no EKT policy, then the other inputs are unaffected
    */
   if (!ekt) 
     return;
       
   /* copy auth_tag into temporary location */
   
 }