Update libsrtp to upstream 1.5.0

srtp/crypto/cipher/cipher.c

 /*
  * cipher.c
  *
  * cipher meta-functions
  *
  * 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
+
 #include "cipher.h"
+#include "crypto_types.h"
 #include "rand_source.h"        /* used in invertibiltiy tests        */
 #include "alloc.h"              /* for crypto_alloc(), crypto_free()  */
 
 debug_module_t mod_cipher = {
   0,                 /* debugging is off by default */
   "cipher"           /* printable module name       */
 };
 
 err_status_t
 cipher_output(cipher_t *c, uint8_t *buffer, int num_octets_to_output) {
@@ skipping 22 matching lines @@
 #define NUM_RAND_TESTS       128
 #define MAX_KEY_LEN          64
 
 err_status_t
 cipher_type_test(const cipher_type_t *ct, const cipher_test_case_t *test_data) {
   const cipher_test_case_t *test_case = test_data;
   cipher_t *c;
   err_status_t status;
   uint8_t buffer[SELF_TEST_BUF_OCTETS];
   uint8_t buffer2[SELF_TEST_BUF_OCTETS];
+  int tag_len;
   unsigned int len;
   int i, j, case_num = 0;
 
   debug_print(mod_cipher, "running self-test for cipher %s", 
               ct->description);
   
   /*
    * check to make sure that we have at least one test case, and
    * return an error if we don't - we need to be paranoid here
    */
   if (test_case == NULL)
     return err_status_cant_check;
 
   /*
    * loop over all test cases, perform known-answer tests of both the
    * encryption and decryption functions
    */  
   while (test_case != NULL) {
-
     /* allocate cipher */
-    status = cipher_type_alloc(ct, &c, test_case->key_length_octets);
+    status = cipher_type_alloc(ct, &c, test_case->key_length_octets, test_case->tag_length_octets);
     if (status)
       return status;
     
     /*
      * test the encrypt function 
      */
     debug_print(mod_cipher, "testing encryption", NULL);    
     
     /* initialize cipher */
-    status = cipher_init(c, test_case->key, direction_encrypt);
+    status = cipher_init(c, test_case->key);
     if (status) {
       cipher_dealloc(c);
       return status;
     }
     
     /* copy plaintext into test buffer */
     if (test_case->ciphertext_length_octets > SELF_TEST_BUF_OCTETS) {
       cipher_dealloc(c);    
       return err_status_bad_param;
     }
     for (i=0; i < test_case->plaintext_length_octets; i++)
       buffer[i] = test_case->plaintext[i];
 
     debug_print(mod_cipher, "plaintext:    %s",
              octet_string_hex_string(buffer,
                                      test_case->plaintext_length_octets));
 
     /* set the initialization vector */
-    status = cipher_set_iv(c, test_case->idx);
+    status = cipher_set_iv(c, test_case->idx, direction_encrypt);
     if (status) {
       cipher_dealloc(c);
       return status;
     } 
     
+    if (c->algorithm == AES_128_GCM || c->algorithm == AES_256_GCM) {
+        debug_print(mod_cipher, "IV:    %s",
+                    octet_string_hex_string(test_case->idx, 12));
+
+        /*
+         * Set the AAD 
+         */
+        status = cipher_set_aad(c, test_case->aad, 
+                                test_case->aad_length_octets);
+        if (status) {
+            cipher_dealloc(c);
+            return status;
+        } 
+        debug_print(mod_cipher, "AAD:    %s",
+        octet_string_hex_string(test_case->aad, 
+                                test_case->aad_length_octets));
+    }
+
     /* encrypt */
     len = test_case->plaintext_length_octets;
     status = cipher_encrypt(c, buffer, &len);
     if (status) {
       cipher_dealloc(c);
       return status;
     }
     
+    if (c->algorithm == AES_128_GCM || c->algorithm == AES_256_GCM) {
+        /*
+         * Get the GCM tag
+         */
+        status = cipher_get_tag(c, buffer + len, &tag_len);
+        if (status) {
+            cipher_dealloc(c);
+            return status;
+        }
+        len += tag_len;
+    }
+
     debug_print(mod_cipher, "ciphertext:   %s",
              octet_string_hex_string(buffer,
                                      test_case->ciphertext_length_octets));
 
     /* compare the resulting ciphertext with that in the test case */
     if (len != test_case->ciphertext_length_octets)
       return err_status_algo_fail;
     status = err_status_ok;
     for (i=0; i < test_case->ciphertext_length_octets; i++)
       if (buffer[i] != test_case->ciphertext[i]) {
@@ skipping 14 matching lines @@
       cipher_dealloc(c);
       return err_status_algo_fail;
     }
 
     /*
      * test the decrypt function
      */
     debug_print(mod_cipher, "testing decryption", NULL);    
 
     /* re-initialize cipher for decryption */
-    status = cipher_init(c, test_case->key, direction_decrypt);
+    status = cipher_init(c, test_case->key);
     if (status) {
       cipher_dealloc(c);
       return status;
     }
 
     /* copy ciphertext into test buffer */
     if (test_case->ciphertext_length_octets > SELF_TEST_BUF_OCTETS) {
       cipher_dealloc(c);    
       return err_status_bad_param;
     }
     for (i=0; i < test_case->ciphertext_length_octets; i++)
       buffer[i] = test_case->ciphertext[i];
 
     debug_print(mod_cipher, "ciphertext:    %s",
                 octet_string_hex_string(buffer,
                                         test_case->plaintext_length_octets));
 
     /* set the initialization vector */
-    status = cipher_set_iv(c, test_case->idx);
+    status = cipher_set_iv(c, test_case->idx, direction_decrypt);
     if (status) {
       cipher_dealloc(c);
       return status;
     } 
     
+    if (c->algorithm == AES_128_GCM || c->algorithm == AES_256_GCM) {
+        /*
+         * Set the AAD 
+         */
+        status = cipher_set_aad(c, test_case->aad, 
+                                test_case->aad_length_octets);
+        if (status) {
+            cipher_dealloc(c);
+            return status;
+        } 
+        debug_print(mod_cipher, "AAD:    %s",
+                    octet_string_hex_string(test_case->aad, 
+                                            test_case->aad_length_octets));
+    }
+
     /* decrypt */
     len = test_case->ciphertext_length_octets;
     status = cipher_decrypt(c, buffer, &len);
     if (status) {
       cipher_dealloc(c);
       return status;
     }
     
     debug_print(mod_cipher, "plaintext:   %s",
              octet_string_hex_string(buffer,
@@ skipping 32 matching lines @@
      * case in the list; if NULL, we'l proceed to the next test
      */   
     test_case = test_case->next_test_case;
     ++case_num;
   }
   
   /* now run some random invertibility tests */
 
   /* allocate cipher, using paramaters from the first test case */
   test_case = test_data;
-  status = cipher_type_alloc(ct, &c, test_case->key_length_octets);
+  status = cipher_type_alloc(ct, &c, test_case->key_length_octets, test_case->tag_length_octets);
   if (status)
       return status;
   
   rand_source_init();
   
   for (j=0; j < NUM_RAND_TESTS; j++) {
     unsigned length;
     int plaintext_len;
     uint8_t key[MAX_KEY_LEN];
     uint8_t  iv[MAX_KEY_LEN];
@@ skipping 15 matching lines @@
     if (test_case->key_length_octets > MAX_KEY_LEN)
       return err_status_cant_check;
     status = rand_source_get_octet_string(key, test_case->key_length_octets);
     if (status) return status;
 
    /* chose a random initialization vector */
     status = rand_source_get_octet_string(iv, MAX_KEY_LEN);
     if (status) return status;
         
     /* initialize cipher */
-    status = cipher_init(c, key, direction_encrypt);
+    status = cipher_init(c, key);
     if (status) {
       cipher_dealloc(c);
       return status;
     }
 
     /* set initialization vector */
-    status = cipher_set_iv(c, test_case->idx);
+    status = cipher_set_iv(c, test_case->idx, direction_encrypt);
     if (status) {
       cipher_dealloc(c);
       return status;
     } 
 
+    if (c->algorithm == AES_128_GCM || c->algorithm == AES_256_GCM) {
+        /*
+         * Set the AAD 
+         */
+        status = cipher_set_aad(c, test_case->aad, 
+        test_case->aad_length_octets);
+        if (status) {
+            cipher_dealloc(c);
+            return status;
+        } 
+        debug_print(mod_cipher, "AAD:    %s",
+                    octet_string_hex_string(test_case->aad, 
+                                            test_case->aad_length_octets));
+    }
+
     /* encrypt buffer with cipher */
     plaintext_len = length;
     status = cipher_encrypt(c, buffer, &length);
     if (status) {
       cipher_dealloc(c);
       return status;
     }
+    if (c->algorithm == AES_128_GCM || c->algorithm == AES_256_GCM) {
+        /*
+         * Get the GCM tag
+         */
+        status = cipher_get_tag(c, buffer + length, &tag_len);
+        if (status) {
+            cipher_dealloc(c);
+            return status;
+        }
+        length += tag_len;
+    }
     debug_print(mod_cipher, "ciphertext:   %s",
                 octet_string_hex_string(buffer, length));
 
     /* 
      * re-initialize cipher for decryption, re-set the iv, then
      * decrypt the ciphertext
      */
-    status = cipher_init(c, key, direction_decrypt);
+    status = cipher_init(c, key);
     if (status) {
       cipher_dealloc(c);
       return status;
     }
-    status = cipher_set_iv(c, test_case->idx);
+    status = cipher_set_iv(c, test_case->idx, direction_decrypt);
     if (status) {
       cipher_dealloc(c);
       return status;
     } 
+    if (c->algorithm == AES_128_GCM || c->algorithm == AES_256_GCM) {
+        /*
+         * Set the AAD 
+         */
+        status = cipher_set_aad(c, test_case->aad, 
+                                test_case->aad_length_octets);
+        if (status) {
+            cipher_dealloc(c);
+            return status;
+        } 
+        debug_print(mod_cipher, "AAD:    %s",
+                    octet_string_hex_string(test_case->aad, 
+                                            test_case->aad_length_octets));
+    }
     status = cipher_decrypt(c, buffer, &length);
     if (status) {
       cipher_dealloc(c);
       return status;
     }    
 
     debug_print(mod_cipher, "plaintext[2]: %s",
                 octet_string_hex_string(buffer, length));    
 
     /* compare the resulting plaintext with the original one */
-    if (length != plaintext_len)
+    if (length != plaintext_len) {
       return err_status_algo_fail;
+    }
     status = err_status_ok;
     for (i=0; i < plaintext_len; i++)
       if (buffer[i] != buffer2[i]) {
         status = err_status_algo_fail;
         debug_print(mod_cipher, "random test case %d failed", case_num);
         debug_print(mod_cipher, "(failure at byte %d)", i);
       }
     if (status) {
       cipher_dealloc(c);
       return err_status_algo_fail;
@@ skipping 39 matching lines @@
   unsigned int len = octets_in_buffer;
 
   enc_buf = (unsigned char*) crypto_alloc(octets_in_buffer);
   if (enc_buf == NULL)
     return 0;  /* indicate bad parameters by returning null */
   
   /* time repeated trials */
   v128_set_to_zero(&nonce);
   timer = clock();
   for(i=0; i < num_trials; i++, nonce.v32[3] = i) {
-    cipher_set_iv(c, &nonce);
+    cipher_set_iv(c, &nonce, direction_encrypt);
     cipher_encrypt(c, enc_buf, &len);
   }
   timer = clock() - timer;
 
   crypto_free(enc_buf);
 
   if (timer == 0) {
     /* Too fast! */
     return 0;
   }
   
   return (uint64_t)CLOCKS_PER_SEC * num_trials * 8 * octets_in_buffer / timer;
 }