update to cvs head srtp

libs/srtp/crypto/include/aes.h

@@ -9,7 +9,7 @@
 
 /*
  *	
- * Copyright (c) 2001-2005, Cisco Systems, Inc.
+ * Copyright (c) 2001-2006, Cisco Systems, Inc.
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -50,24 +50,30 @@
 
 #include "datatypes.h"
 #include "gf2_8.h"
+#include "err.h"
 
 /* aes internals */
 
-typedef v128_t aes_expanded_key_t[11];
+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);
 
 void
-aes_expand_encryption_key(const v128_t *key,
-			  aes_expanded_key_t expanded_key);
+aes_encrypt(v128_t *plaintext, const aes_expanded_key_t *exp_key);
 
 void
-aes_expand_decryption_key(const v128_t *key,
-			  aes_expanded_key_t expanded_key);
-
-void
-aes_encrypt(v128_t *plaintext, const aes_expanded_key_t exp_key);
-
-void
-aes_decrypt(v128_t *plaintext, const aes_expanded_key_t exp_key);
+aes_decrypt(v128_t *plaintext, const aes_expanded_key_t *exp_key);
 
 #if 0
 /*