diff --git a/ChangeLog b/ChangeLog index 292ff7cd81..b455e6f34d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,16 @@ -2005-12-11 Dan Williams +2005-12-12 Robert Love + + * libnm-util/cipher-wep-passphrase.c, + libnm-util/cipher-wpa-psk-passphrase.c, src/NetworkManagerAP.c, + src/NetworkManagerAP.h, src/NetworkManagerDevice.c, + src/NetworkManagerWireless.c, src/NetworkManagerWireless.h: Treat + all WEP/WPA keys as "char *" and not explicitly signed or unsigned. + When handling keys, we don't care what the sign is. The compiler + guarantees us that we get our 8-bits, which is all we care about. + * configure.in: Remove "-Wno-pointer-sign" flag. We are sign-aware! + + +2005-12-12 Dan Williams * gnome/applet/applet-dbus-devices.[ch] gnome/applet/applet.c diff --git a/configure.in b/configure.in index c993cb548a..807bcfba0c 100644 --- a/configure.in +++ b/configure.in @@ -260,10 +260,9 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then AC_MSG_RESULT(yes) CFLAGS="-Wall -Werror -std=gnu89 $CFLAGS" - for option in -Wno-unused -Wno-sign-compare -Wno-pointer-sign \ + for option in -Wno-unused -Wno-sign-compare -Wno-strict-aliasing \ -Wdeclaration-after-statement -Wstrict-prototypes \ - -Wmissing-prototypes -Wmissing-declarations \ - -Wno-strict-aliasing; do + -Wmissing-prototypes -Wmissing-declarations; do SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $option" AC_MSG_CHECKING([whether gcc understands $option]) diff --git a/libnm-util/cipher-wep-passphrase.c b/libnm-util/cipher-wep-passphrase.c index ca4d5d7f1d..ee7ea5fa0e 100644 --- a/libnm-util/cipher-wep-passphrase.c +++ b/libnm-util/cipher-wep-passphrase.c @@ -50,7 +50,7 @@ static char * cipher_wep64_passphrase_hash_func (IEEE_802_11_Cipher *cipher, con static char * cipher_wep_passphrase_ascii_to_hex (const unsigned char *ascii, int req_keylen) { static char hex_digits[] = "0123456789abcdef"; - unsigned char *res; + char *res; int i; g_return_val_if_fail (ascii != NULL, NULL); diff --git a/libnm-util/cipher-wpa-psk-passphrase.c b/libnm-util/cipher-wpa-psk-passphrase.c index 1d2b6f72bb..441070089b 100644 --- a/libnm-util/cipher-wpa-psk-passphrase.c +++ b/libnm-util/cipher-wpa-psk-passphrase.c @@ -59,7 +59,7 @@ static char * cipher_wpa_psk_passphrase_hash_func (IEEE_802_11_Cipher *cipher, c g_return_val_if_fail (ssid_len > 0, NULL); buf = g_malloc0 (WPA_PMK_LEN * 2); - pbkdf2_sha1 (input, (char *) ssid, ssid_len, 4096, buf, WPA_PMK_LEN); + pbkdf2_sha1 (input, (char *) ssid, ssid_len, 4096, (unsigned char *) buf, WPA_PMK_LEN); return buf; } diff --git a/src/NetworkManagerAP.c b/src/NetworkManagerAP.c index c32108f27c..fc05d0b7b9 100644 --- a/src/NetworkManagerAP.c +++ b/src/NetworkManagerAP.c @@ -659,7 +659,7 @@ const guint8 * nm_ap_get_wpa_ie (NMAccessPoint *ap, guint32 *length) return ap->wpa_ie; } -void nm_ap_set_wpa_ie (NMAccessPoint *ap, const guint8 *wpa_ie, guint32 length) +void nm_ap_set_wpa_ie (NMAccessPoint *ap, const char *wpa_ie, guint32 length) { g_return_if_fail (ap != NULL); @@ -690,7 +690,7 @@ const guint8 * nm_ap_get_rsn_ie (NMAccessPoint *ap, guint32 *length) return ap->rsn_ie; } -void nm_ap_set_rsn_ie (NMAccessPoint *ap, const guint8 *rsn_ie, guint32 length) +void nm_ap_set_rsn_ie (NMAccessPoint *ap, const char *rsn_ie, guint32 length) { g_return_if_fail (ap != NULL); diff --git a/src/NetworkManagerAP.h b/src/NetworkManagerAP.h index ecdecf652d..114afa7a42 100644 --- a/src/NetworkManagerAP.h +++ b/src/NetworkManagerAP.h @@ -95,10 +95,10 @@ gboolean nm_ap_is_enc_key_valid (NMAccessPoint *ap); gboolean nm_is_enc_key_valid (const char *key, NMEncKeyType key_type); const guint8 * nm_ap_get_wpa_ie (NMAccessPoint *ap, guint32 *length); -void nm_ap_set_wpa_ie (NMAccessPoint *ap, const guint8 *wpa_ie, guint32 length); +void nm_ap_set_wpa_ie (NMAccessPoint *ap, const char *wpa_ie, guint32 length); const guint8 * nm_ap_get_rsn_ie (NMAccessPoint *ap, guint32 *length); -void nm_ap_set_rsn_ie (NMAccessPoint *ap, const guint8 *rsn_ie, guint32 length); +void nm_ap_set_rsn_ie (NMAccessPoint *ap, const char *rsn_ie, guint32 length); /* * NOTE: diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c index 301ffea1ff..0ee02bfa88 100644 --- a/src/NetworkManagerDevice.c +++ b/src/NetworkManagerDevice.c @@ -4450,11 +4450,11 @@ static int hex2byte(const char *hex) return (a << 4) | b; } -static int hexstr2bin(const char *hex, u8 *buf, size_t len) +static int hexstr2bin(const char *hex, char *buf, size_t len) { int i, a; const char *ipos = hex; - u8 *opos = buf; + char *opos = buf; for (i = 0; i < len; i++) { a = hex2byte(ipos); diff --git a/src/NetworkManagerWireless.c b/src/NetworkManagerWireless.c index 52ed71f851..5621713390 100644 --- a/src/NetworkManagerWireless.c +++ b/src/NetworkManagerWireless.c @@ -40,10 +40,10 @@ * Convert an ASCII string into a suitable WEP key. * */ -char *nm_wireless_64bit_ascii_to_hex (const unsigned char *ascii) +char *nm_wireless_64bit_ascii_to_hex (const char *ascii) { static char hex_digits[] = "0123456789abcdef"; - unsigned char *res; + char *res; int i; res = g_malloc (33); @@ -69,10 +69,10 @@ char *nm_wireless_64bit_ascii_to_hex (const unsigned char *ascii) * copyright Red Hat, Inc. under terms of the LGPL. * */ -char *nm_wireless_128bit_ascii_to_hex (const unsigned char *ascii) +char *nm_wireless_128bit_ascii_to_hex (const char *ascii) { static char hex_digits[] = "0123456789abcdef"; - unsigned char *res; + char *res; int i; res = g_malloc (33); @@ -98,7 +98,7 @@ char *nm_wireless_128bit_ascii_to_hex (const unsigned char *ascii) char *nm_wireless_128bit_key_from_passphrase (const char *passphrase) { char md5_data[65]; - unsigned char digest[16]; + char digest[16]; int passphrase_len; int i; diff --git a/src/NetworkManagerWireless.h b/src/NetworkManagerWireless.h index f84d38f981..1a07c1a2e9 100644 --- a/src/NetworkManagerWireless.h +++ b/src/NetworkManagerWireless.h @@ -28,8 +28,8 @@ #include "NetworkManagerAPList.h" -char * nm_wireless_64bit_ascii_to_hex (const unsigned char *ascii); -char * nm_wireless_128bit_ascii_to_hex (const unsigned char *ascii); +char * nm_wireless_64bit_ascii_to_hex (const char *ascii); +char * nm_wireless_128bit_ascii_to_hex (const char *ascii); char * nm_wireless_128bit_key_from_passphrase (const char *passphrase); int nm_wireless_qual_to_percent (const struct iw_quality *qual,