Mercurial > illumos > illumos-gate
changeset 11034:417289cdaf0e
6894571 wpad is not lint clean
6779504 Package dependency issue with SUNWwpau
6881246 SUNWrum device ID for Gigabyte GN-WI05GS-RH mini-pci-e
| author | Quaker Fang <Quaker.Fang@Sun.COM> |
|---|---|
| date | Wed, 11 Nov 2009 12:29:07 +0800 |
| parents | 50ebc24999b1 |
| children | 7dfb6a27ef28 |
| files | usr/src/cmd/cmd-inet/usr.lib/wpad/wpa_enc.c usr/src/pkgdefs/SUNWrum/postinstall usr/src/pkgdefs/SUNWwpar/depend usr/src/pkgdefs/SUNWwpau/depend |
| diffstat | 4 files changed, 10 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa_enc.c Tue Nov 10 20:21:01 2009 -0800 +++ b/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa_enc.c Wed Nov 11 12:29:07 2009 +0800 @@ -1,5 +1,5 @@ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -9,8 +9,6 @@ * See README for more details. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -43,7 +41,7 @@ (void) memset(a, 0xa6, 8); (void) memcpy(r, plain, 8 * n); - AES_set_encrypt_key(kek, 128, &key); + (void) AES_set_encrypt_key(kek, 128, &key); /* * 2) Calculate intermediate values. @@ -92,7 +90,7 @@ r = plain; (void) memcpy(r, cipher + 8, 8 * n); - AES_set_decrypt_key(kek, 128, &key); + (void) AES_set_decrypt_key(kek, 128, &key); /* * 2) Compute intermediate values. @@ -137,7 +135,7 @@ unsigned char *data, unsigned int data_len, unsigned char *mac) { unsigned int mac_len = 0; - HMAC(EVP_sha1(), key, key_len, data, data_len, mac, &mac_len); + (void) HMAC(EVP_sha1(), key, key_len, data, data_len, mac, &mac_len); } @@ -207,8 +205,8 @@ pbkdf2_sha1(char *passphrase, char *ssid, size_t ssid_len, int iterations, unsigned char *buf, size_t buflen) { - PKCS5_PBKDF2_HMAC_SHA1(passphrase, -1, (unsigned char *)ssid, ssid_len, - iterations, buflen, buf); + (void) PKCS5_PBKDF2_HMAC_SHA1(passphrase, -1, (unsigned char *)ssid, + ssid_len, iterations, buflen, buf); } void @@ -268,5 +266,5 @@ size_t data_len, uint8_t *mac) { unsigned int mac_len = 0; - HMAC(EVP_md5(), key, key_len, data, data_len, mac, &mac_len); + (void) HMAC(EVP_md5(), key, key_len, data, data_len, mac, &mac_len); }
--- a/usr/src/pkgdefs/SUNWrum/postinstall Tue Nov 10 20:21:01 2009 -0800 +++ b/usr/src/pkgdefs/SUNWrum/postinstall Wed Nov 11 12:29:07 2009 +0800 @@ -21,14 +21,14 @@ # # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # Driver info DRV=rum DRVALIAS='"usb7d1,3c03" "usbb05,1723" "usb13b1,20" "usb7d1,3c04" - "usb15a9,4" "usb148f,2573"' + "usb15a9,4" "usb148f,2573" "usb1044,800a"' BASEDIR=${BASEDIR:-/}
--- a/usr/src/pkgdefs/SUNWwpar/depend Tue Nov 10 20:21:01 2009 -0800 +++ b/usr/src/pkgdefs/SUNWwpar/depend Wed Nov 11 12:29:07 2009 +0800 @@ -49,4 +49,3 @@ P SUNWcsl Core Solaris Libraries P SUNWcslr Core Solaris Libraries (Root) P SUNWcsd Core Solaris Devices -R SUNWwpau Wireless WPA Supplicant, (Usr)
--- a/usr/src/pkgdefs/SUNWwpau/depend Tue Nov 10 20:21:01 2009 -0800 +++ b/usr/src/pkgdefs/SUNWwpau/depend Wed Nov 11 12:29:07 2009 +0800 @@ -49,4 +49,5 @@ P SUNWcsl Core Solaris Libraries P SUNWcslr Core Solaris Libraries (Root) P SUNWcsd Core Solaris Devices +P SUNWopensslr OpenSSL (Root) P SUNWwpar Wireless WPA Supplicant, (Root)