Update libsrtp to version 2.0

crypto/include/null_cipher.h

Index: crypto/include/null_cipher.h
diff --git a/srtp/crypto/include/null_auth.h b/crypto/include/null_cipher.h
similarity index 77%
rename from srtp/crypto/include/null_auth.h
rename to crypto/include/null_cipher.h
index 44f9a4a2ba3c3f20394f41ece7f807037ae3c6a1..f7db5f71b7ce0df80dd7c0e4eef5b35c1c6f503f 100644
--- a/srtp/crypto/include/null_auth.h
+++ b/crypto/include/null_cipher.h
@@ -1,32 +1,34 @@
 /*
- * null-auth.h
+ * null-cipher.h
+ *
+ * header file for the null cipher
+ *
  *
  * 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
  *   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
@@ -42,27 +44,15 @@
  *
  */
 
-#ifndef NULL_AUTH_H
-#define NULL_AUTH_H
-
-#include "auth.h"
-
-typedef struct {
-	char foo;
-} null_auth_ctx_t;
 
-err_status_t
-null_auth_alloc(auth_t **a, int key_len, int out_len);
+#ifndef NULL_CIPHER_H
+#define NULL_CIPHER_H
 
-err_status_t
-null_auth_dealloc(auth_t *a);
-
-err_status_t
-null_auth_init(null_auth_ctx_t *state, const uint8_t *key, int key_len);
-
-err_status_t
-null_auth_compute (null_auth_ctx_t *state, uint8_t *message,
-		   int msg_octets, int tag_len, uint8_t *result);
+#include "datatypes.h"
+#include "cipher.h"
 
+typedef struct {
+    char foo; /* empty, for now */
+} srtp_null_cipher_ctx_t;
 
-#endif /* NULL_AUTH_H */
+#endif /* NULL_CIPHER_H */