diff options
| author | Guy Harris <guy@alum.mit.edu> | 2010-02-23 20:30:27 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2010-02-23 20:30:27 +0000 |
| commit | e646e71d0f213f3667c6c7a05cbf75565e5388e0 (patch) | |
| tree | 544617df373ff031eb542bdcc17ff10330467226 /epan/crypt | |
| parent | 761414b98ed60e6ba4662cfc3db1125309f7835f (diff) | |
Fix some compiler warnings.
svn path=/trunk/; revision=31969
Diffstat (limited to 'epan/crypt')
| -rw-r--r-- | epan/crypt/airpdcap.c | 4 | ||||
| -rw-r--r-- | epan/crypt/crypt-aes.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/epan/crypt/airpdcap.c b/epan/crypt/airpdcap.c index ed0934ddd9..35c3c1eff5 100644 --- a/epan/crypt/airpdcap.c +++ b/epan/crypt/airpdcap.c @@ -520,7 +520,7 @@ static INT AirPDcapScanForGroupKey( /* skip EAPOL MPDU and go to the first byte of the body */ offset+=4; - pEAPKey = (P_EAPOL_RSN_KEY) (data+offset); + pEAPKey = (const EAPOL_RSN_KEY *) (data+offset); /* check if the key descriptor type is valid (IEEE 802.1X-2004, pg. 27) */ if (/*pEAPKey->type!=0x1 &&*/ /* RC4 Key Descriptor Type (deprecated) */ @@ -1406,7 +1406,7 @@ AirPDcapRsna4WHandshake( /* If using WPA2 PSK, message 3 will contain an RSN for the group key (GTK KDE). In order to properly support decrypting WPA2-PSK packets, we need to parse this to get the group key. */ - pEAPKey = (P_EAPOL_RSN_KEY)(&(data[offset-1])); + pEAPKey = (const EAPOL_RSN_KEY *)(&(data[offset-1])); if (pEAPKey->type == AIRPDCAP_RSN_WPA2_KEY_DESCRIPTOR){ PAIRPDCAP_SEC_ASSOCIATION broadcast_sa; AIRPDCAP_SEC_ASSOCIATION_ID id; diff --git a/epan/crypt/crypt-aes.c b/epan/crypt/crypt-aes.c index 71088088dd..a94cc7c7e4 100644 --- a/epan/crypt/crypt-aes.c +++ b/epan/crypt/crypt-aes.c @@ -723,7 +723,7 @@ static const guint32 rcon[] = { 0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */ }; -gint rijndaelKeySetupEnc( +static gint rijndaelKeySetupEnc( guint32 rk[/*4*(Nr + 1)*/], const guint8 cipherKey[], gint keyBits) @@ -811,7 +811,7 @@ gint rijndaelKeySetupEnc( return 0; } -gint rijndaelKeySetupDec( +static gint rijndaelKeySetupDec( guint32 rk[/*4*(Nr + 1)*/], const guint8 cipherKey[], gint keyBits) @@ -867,7 +867,7 @@ void rijndael_set_key( rijndaelKeySetupDec(ctx->dk, key, bits); } -void rijndaelEncrypt( +static void rijndaelEncrypt( const guint32 rk[/*4*(Nr + 1)*/], gint Nr, const guint8 pt[16], @@ -1063,7 +1063,7 @@ void rijndael_encrypt( } -void rijndaelDecrypt(const guint32 rk[/*4*(Nr + 1)*/], gint Nr, const guint8 ct[16], guint8 pt[16]) { +static void rijndaelDecrypt(const guint32 rk[/*4*(Nr + 1)*/], gint Nr, const guint8 ct[16], guint8 pt[16]) { guint32 s0, s1, s2, s3, t0, t1, t2, t3; #ifndef FULL_UNROLL gint r; |