kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-13 09:36:46 +00:00
Code Issues Projects Releases Wiki Activity

update to cvs head srtp

Browse Source
This commit is contained in:
Anthony Minessale
2013-01-17 17:59:53 -06:00
parent aad4da5b71
commit 72e2d183c1
100 changed files with 4732 additions and 1509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/srtp/crypto/cipher/null_cipher.c
View File

@@ -10,7 +10,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
@@ -48,10 +48,6 @@
#include "null_cipher.h"
#include "alloc.h"
#ifdef _MSC_VER
#pragma warning(disable:4100)
#endif
/* the null_cipher uses the cipher debug module */
extern debug_module_t mod_cipher;
@@ -65,7 +61,7 @@ null_cipher_alloc(cipher_t **c, int key_len) {
"allocating cipher with key length %d", key_len);
/* allocate memory a cipher of type null_cipher */
pointer = crypto_alloc(sizeof(null_cipher_ctx_t) + sizeof(cipher_t));
pointer = (uint8_t*)crypto_alloc(sizeof(null_cipher_ctx_t) + sizeof(cipher_t));
if (pointer == NULL)
return err_status_alloc_fail;
@@ -103,7 +99,7 @@ null_cipher_dealloc(cipher_t *c) {
}
err_status_t
null_cipher_init(null_cipher_ctx_t *ctx, const uint8_t *key) {
null_cipher_init(null_cipher_ctx_t *ctx, const uint8_t *key, int key_len) {
debug_print(mod_cipher, "initializing null cipher", NULL);
@@ -151,6 +147,7 @@ cipher_type_t null_cipher = {
(char *) null_cipher_description,
(int) 0,
(cipher_test_case_t *) &null_cipher_test_0,
(debug_module_t *) NULL
(debug_module_t *) NULL,
(cipher_type_id_t) NULL_CIPHER
};