Update libsrtp to version 2.0

crypto/include/aes.h

Index: crypto/include/aes.h
diff --git a/srtp/crypto/include/aes.h b/crypto/include/aes.h
similarity index 75%
rename from srtp/crypto/include/aes.h
rename to crypto/include/aes.h
index d88ce4030c1e2ed9fb5ee2b1b9306b9e7ff42641..e869e9dd2b9c99cdcabe3538b726e61e2b831509 100644
--- a/srtp/crypto/include/aes.h
+++ b/crypto/include/aes.h
@@ -8,26 +8,26 @@
  */
 
 /*
- *	
+ *
  * 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
  *   notice, this list of conditions and the following disclaimer.
- * 
+ *
  *   Redistributions in binary form must reproduce the above
  *   copyright notice, this list of conditions and the following
  *   disclaimer in the documentation and/or other materials provided
  *   with the distribution.
- * 
+ *
  *   Neither the name of the Cisco Systems, Inc. nor the names of its
  *   contributors may be used to endorse or promote products derived
  *   from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -47,42 +47,35 @@
 #define _AES_H
 
 #include "datatypes.h"
-#include "gf2_8.h"
 #include "err.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* aes internals */
 
 typedef struct {
-  v128_t round[15];
-  int num_rounds;
-} aes_expanded_key_t;
-
-err_status_t
-aes_expand_encryption_key(const uint8_t *key,
-			  int key_len,
-			  aes_expanded_key_t *expanded_key);
-
-err_status_t
-aes_expand_decryption_key(const uint8_t *key,
-			  int key_len,
-			  aes_expanded_key_t *expanded_key);
+    v128_t round[15];
+    int num_rounds;
+} srtp_aes_expanded_key_t;
 
-void
-aes_encrypt(v128_t *plaintext, const aes_expanded_key_t *exp_key);
+srtp_err_status_t srtp_aes_expand_encryption_key(
+    const uint8_t *key,
+    int key_len,
+    srtp_aes_expanded_key_t *expanded_key);
 
-void
-aes_decrypt(v128_t *plaintext, const aes_expanded_key_t *exp_key);
+srtp_err_status_t srtp_aes_expand_decryption_key(
+    const uint8_t *key,
+    int key_len,
+    srtp_aes_expanded_key_t *expanded_key);
 
-#if 0
-/*
- * internal functions 
- */
+void srtp_aes_encrypt(v128_t *plaintext, const srtp_aes_expanded_key_t *exp_key);
 
-void
-aes_init_sbox(void);
+void srtp_aes_decrypt(v128_t *plaintext, const srtp_aes_expanded_key_t *exp_key);
 
-void
-aes_compute_tables(void);
-#endif 
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _AES_H */