Fix compile with gcc 2.95.

(Logical change 1.106)


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@385 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Steven Dake 2004-11-24 22:32:21 +00:00
parent ffe379e2a8
commit 6250b3fba5
2 changed files with 5 additions and 4 deletions

View File

@ -1852,8 +1852,7 @@ void amf_confchg_njoin (struct saAmfComponent *component ,void *data)
void amf_confchg_nleave (struct saAmfComponent *component ,void *data)
{
struct in_addr *source_addr;
source_addr = (struct in_addr *)data;
struct in_addr *source_addr = (struct in_addr *)data;
struct saAmfUnit *unit;
struct list_head *list;
struct saAmfComponent *leave_component = NULL;

View File

@ -760,7 +760,6 @@ static void encrypt_and_sign (struct iovec *iovec, int iov_len)
{
char *addr = iov_encrypted.iov_base + sizeof (struct security_header);
int i;
iov_encrypted.iov_len = 0;
char keys[48];
struct security_header *header = iov_encrypted.iov_base;
prng_state keygen_prng_state;
@ -770,6 +769,8 @@ static void encrypt_and_sign (struct iovec *iovec, int iov_len)
char *initial_vector = &keys[0];
unsigned long len;
iov_encrypted.iov_len = 0;
memset (keys, 0, sizeof (keys));
memset (header->salt, 0, sizeof (header->salt));
@ -848,7 +849,6 @@ print_digest ("hmac_key", hmac_key);
*/
static int authenticate_and_decrypt (struct iovec *iov)
{
iov_encrypted.iov_len = 0;
char keys[48];
struct security_header *header = iov[0].iov_base;
prng_state keygen_prng_state;
@ -859,6 +859,8 @@ static int authenticate_and_decrypt (struct iovec *iov)
char digest_comparison[HMAC_HASH_SIZE];
unsigned long len;
iov_encrypted.iov_len = 0;
#if (defined(ENCRYPTION) || defined(AUTHENITCATION))
/*
* Generate MAC, CIPHER, IV keys from private key