Update libsrtp to upstream 1.5.0

srtp/crypto/cipher/aes_icm.c

 /*
  * aes_icm.c
  *
  * AES Integer Counter Mode
  *
  * David A. McGrew
  * Cisco Systems, Inc.
  */
 
 /*
  *      
- * Copyright (c) 2001-2006, Cisco Systems, Inc.
+ * Copyright (c) 2001-2006,2013 Cisco Systems, Inc.
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 
  *   Redistributions of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
  * 
  *   Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (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.
  *
  */
 
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #define ALIGN_32 0
 
 #include "aes_icm.h"
 #include "alloc.h"
 
 
 debug_module_t mod_aes_icm = {
   0,                 /* debugging is off by default */
   "aes icm"          /* printable module name       */
@@ skipping 55 matching lines @@
     return err_status_bad_param;
 
   /* allocate memory a cipher of type aes_icm */
   tmp = (sizeof(aes_icm_ctx_t) + sizeof(cipher_t));
   pointer = (uint8_t*)crypto_alloc(tmp);
   if (pointer == NULL) 
     return err_status_alloc_fail;
 
   /* set pointers */
   *c = (cipher_t *)pointer;
+  switch (key_len) {
+  case 46:
+      (*c)->algorithm = AES_256_ICM;
+      break;
+  case 38:
+      (*c)->algorithm = AES_192_ICM;
+      break;
+  default:
+      (*c)->algorithm = AES_128_ICM;
+      break;
+  }
   (*c)->type = &aes_icm;
   (*c)->state = pointer + sizeof(cipher_t);
 
   /* increment ref_count */
   aes_icm.ref_count++;
 
   /* set key size        */
   (*c)->key_len = key_len;
 
   return err_status_ok;  
@@ skipping 36 matching lines @@
   err_status_t status;
   int base_key_len, copy_len;
 
   if (key_len > 16 && key_len < 30) /* Ismacryp */
     base_key_len = 16;
   else if (key_len == 30 || key_len == 38 || key_len == 46)
     base_key_len = key_len - 14;
   else
     return err_status_bad_param;
 
-  /* 
+  /*
    * set counter and initial values to 'offset' value, being careful not to
-   * go past the end of the key buffer.
+   * go past the end of the key buffer
    */
   v128_set_to_zero(&c->counter);
   v128_set_to_zero(&c->offset);
 
-  /* force last two octets of the offset to be left zero 
-   * (for srtp compatibility) */
   copy_len = key_len - base_key_len;
-  
+  /* force last two octets of the offset to be left zero (for srtp compatibility) */
+  if (copy_len > 14)
+    copy_len = 14;
+
   memcpy(&c->counter, key + base_key_len, copy_len);
   memcpy(&c->offset, key + base_key_len, copy_len);
 
   debug_print(mod_aes_icm, 
               "key:  %s", octet_string_hex_string(key, base_key_len)); 
   debug_print(mod_aes_icm, 
               "offset: %s", v128_hex_string(&c->offset)); 
 
   /* expand key */
   status = aes_expand_encryption_key(key, base_key_len, &c->expanded_key);
@@ skipping 66 matching lines @@
 
   return err_status_ok;
 }
 
 /*
  * aes_icm_set_iv(c, iv) sets the counter value to the exor of iv with
  * the offset
  */
 
 err_status_t
-aes_icm_set_iv(aes_icm_ctx_t *c, void *iv) {
-  v128_t *nonce = (v128_t *) iv;
+aes_icm_set_iv(aes_icm_ctx_t *c, void *iv, int direction) {
+  v128_t nonce;
+
+  /* set nonce (for alignment) */
+  v128_copy_octet_string(&nonce, iv);
 
   debug_print(mod_aes_icm, 
-              "setting iv: %s", v128_hex_string(nonce)); 
+              "setting iv: %s", v128_hex_string(&nonce)); 
  
-  v128_xor(&c->counter, &c->offset, nonce);
+  v128_xor(&c->counter, &c->offset, &nonce);
   
   debug_print(mod_aes_icm, 
               "set_counter: %s", v128_hex_string(&c->counter)); 
 
   /* indicate that the keystream_buffer is empty */
   c->bytes_in_buffer = 0;
 
   return err_status_ok;
 }
 
 
 
 /*
  * aes_icm_advance(...) refills the keystream_buffer and
  * advances the block index of the sicm_context forward by one
  *
  * this is an internal, hopefully inlined function
  */
   
-static INLINE void
+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);
   c->bytes_in_buffer = sizeof(v128_t);
 
   debug_print(mod_aes_icm, "counter:    %s", 
               v128_hex_string(&c->counter));
   debug_print(mod_aes_icm, "ciphertext: %s", 
               v128_hex_string(&c->keystream_buffer));    
   
   /* clock counter forward */
 
   if (forIsmacryp) {
     uint32_t temp;    
     //alex's clock counter forward
     temp = ntohl(c->counter.v32[3]);
-    c->counter.v32[3] = htonl(++temp);
+    ++temp;
+    c->counter.v32[3] = htonl(temp);
   } else {
     if (!++(c->counter.v8[15])) 
       ++(c->counter.v8[14]);
   }
 }
 
-static INLINE void aes_icm_advance(aes_icm_ctx_t *c) {
-  aes_icm_advance_ismacryp(c, 0);
-}
-
-
 /*e
  * icm_encrypt deals with the following cases:
  *
  * bytes_to_encr < bytes_in_buffer
  *  - add keystream into data
  *
  * bytes_to_encr > bytes_in_buffer
  *  - add keystream into data until keystream_buffer is depleted
  *  - loop over blocks, filling keystream_buffer and then
  *    adding keystream into data
@@ skipping 107 matching lines @@
 
   return err_status_ok;
 }
 
 err_status_t
 aes_icm_encrypt(aes_icm_ctx_t *c, unsigned char *buf, unsigned int *enc_len) {
   return aes_icm_encrypt_ismacryp(c, buf, enc_len, 0);
 }
 
 err_status_t
-aes_icm_output(aes_icm_ctx_t *c, uint8_t *buffer, int num_octets_to_output) {
+aes_icm_output(aes_icm_ctx_t *c, uint8_t *buffer, unsigned int num_octets_to_output) {
   unsigned int len = num_octets_to_output;
   
   /* zeroize the buffer */
   octet_string_set_to_zero(buffer, num_octets_to_output);
   
   /* exor keystream into buffer */
   return aes_icm_encrypt(c, buffer, &len);
 }
 
+uint16_t
+aes_icm_bytes_encrypted(aes_icm_ctx_t *c) {
+    return htons(c->counter.v16[7]);
+}
 
 char 
 aes_icm_description[] = "aes integer counter mode";
 
 uint8_t aes_icm_test_case_0_key[30] = {
   0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6,
   0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c,
   0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
   0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd
 };
@@ skipping 18 matching lines @@
 };
 
 cipher_test_case_t aes_icm_test_case_0 = {
   30,                                    /* octets in key            */
   aes_icm_test_case_0_key,               /* key                      */
   aes_icm_test_case_0_nonce,             /* packet index             */
   32,                                    /* octets in plaintext      */
   aes_icm_test_case_0_plaintext,         /* plaintext                */
   32,                                    /* octets in ciphertext     */
   aes_icm_test_case_0_ciphertext,        /* ciphertext               */
+  0,
+  NULL,
+  0,
   NULL                                   /* pointer to next testcase */
 };
 
 uint8_t aes_icm_test_case_1_key[46] = {
   0x57, 0xf8, 0x2f, 0xe3, 0x61, 0x3f, 0xd1, 0x70,
   0xa8, 0x5e, 0xc9, 0x3c, 0x40, 0xb1, 0xf0, 0x92,
   0x2e, 0xc4, 0xcb, 0x0d, 0xc0, 0x25, 0xb5, 0x82,
   0x72, 0x14, 0x7c, 0xc4, 0x38, 0x94, 0x4a, 0x98,
   0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
   0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd
@@ skipping 19 matching lines @@
 };
 
 cipher_test_case_t aes_icm_test_case_1 = {
   46,                                    /* octets in key            */
   aes_icm_test_case_1_key,               /* key                      */
   aes_icm_test_case_1_nonce,             /* packet index             */
   32,                                    /* octets in plaintext      */
   aes_icm_test_case_1_plaintext,         /* plaintext                */
   32,                                    /* octets in ciphertext     */
   aes_icm_test_case_1_ciphertext,        /* ciphertext               */
+  0,
+  NULL,
+  0,
   &aes_icm_test_case_0                   /* pointer to next testcase */
 };
 
 
 
 /*
  * note: the encrypt function is identical to the decrypt function
  */
 
 cipher_type_t aes_icm = {
   (cipher_alloc_func_t)          aes_icm_alloc,
   (cipher_dealloc_func_t)        aes_icm_dealloc,  
   (cipher_init_func_t)           aes_icm_context_init,
+  (cipher_set_aad_func_t)        0,
   (cipher_encrypt_func_t)        aes_icm_encrypt,
   (cipher_decrypt_func_t)        aes_icm_encrypt,
   (cipher_set_iv_func_t)         aes_icm_set_iv,
+  (cipher_get_tag_func_t)        0,
   (char *)                       aes_icm_description,
   (int)                          0,   /* instance count */
   (cipher_test_case_t *)        &aes_icm_test_case_1,
   (debug_module_t *)            &mod_aes_icm,
   (cipher_type_id_t)             AES_ICM
 };