Land https://codereview.chromium.org/889083003/ to update libsrtp to upstream 1.5.0

srtp/crypto/test/aes_calc.c

 /*
  * aes_calc.c
  * 
  * A simple AES calculator for generating AES encryption values
  *
  * David A. McGrew
  * Cisco Systems, Inc.
  */
+
 /*
  *      
  * Copyright (c) 2001-2006, 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
@@ skipping 27 matching lines @@
   
  Example usage (with first NIST FIPS 197 test case):
  
 [sh]$ test/aes_calc 000102030405060708090a0b0c0d0e0f 00112233445566778899aabbccddeeff -v
  plaintext:      00112233445566778899aabbccddeeff
  key:            000102030405060708090a0b0c0d0e0f
  ciphertext:     69c4e0d86a7b0430d8cdb78070b4c55a
 
  */
 
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
+
 #include "aes.h"
 #include <stdio.h>
 #include <string.h>
 
 void
 usage(char *prog_name) {
   printf("usage: %s <key> <plaintext> [-v]\n", prog_name);
   exit(255);
 }
 
 #define AES_MAX_KEY_LEN 32
 
 int
 main (int argc, char *argv[]) {
   v128_t data;
   uint8_t key[AES_MAX_KEY_LEN];
   aes_expanded_key_t exp_key;
   int key_len, len;
-  int verbose;
+  int verbose = 0;
   err_status_t status;
 
   if (argc == 3) {
     /* we're not in verbose mode */
     verbose = 0;
   } else if (argc == 4) {
     if (strncmp(argv[3], "-v", 2) == 0) {
       /* we're in verbose mode */
       verbose = 1;
     } else {
@@ skipping 60 matching lines @@
   /* write ciphertext to output */
   if (verbose) {
     printf("key:\t\t%s\n", octet_string_hex_string(key, key_len));
     printf("ciphertext:\t");
   }
   printf("%s\n", v128_hex_string(&data));
 
   return 0;
 }