diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/cmd-inet/usr.lib/wpad/wpa_enc.c | 16 | ||||
| -rw-r--r-- | usr/src/pkgdefs/SUNWrum/postinstall | 4 | ||||
| -rw-r--r-- | usr/src/pkgdefs/SUNWwpar/depend | 1 | ||||
| -rw-r--r-- | usr/src/pkgdefs/SUNWwpau/depend | 1 |
4 files changed, 10 insertions, 12 deletions
diff --git a/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa_enc.c b/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa_enc.c index f4e634b4a8..e8cef4422d 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa_enc.c +++ b/usr/src/cmd/cmd-inet/usr.lib/wpad/wpa_enc.c @@ -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 @@ aes_wrap(uint8_t *kek, int n, uint8_t *plain, uint8_t *cipher) (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 @@ aes_unwrap(uint8_t *kek, int n, uint8_t *cipher, uint8_t *plain) 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 @@ hmac_sha1(unsigned char *key, unsigned int key_len, 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 @@ void 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 @@ hmac_md5(uint8_t *key, size_t key_len, uint8_t *data, 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); } diff --git a/usr/src/pkgdefs/SUNWrum/postinstall b/usr/src/pkgdefs/SUNWrum/postinstall index 6ff7a8be0b..c0111a3b74 100644 --- a/usr/src/pkgdefs/SUNWrum/postinstall +++ b/usr/src/pkgdefs/SUNWrum/postinstall @@ -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:-/} diff --git a/usr/src/pkgdefs/SUNWwpar/depend b/usr/src/pkgdefs/SUNWwpar/depend index 40e6a5c81f..fbbbece7dc 100644 --- a/usr/src/pkgdefs/SUNWwpar/depend +++ b/usr/src/pkgdefs/SUNWwpar/depend @@ -49,4 +49,3 @@ P SUNWcsu Core Solaris, (Usr) P SUNWcsl Core Solaris Libraries P SUNWcslr Core Solaris Libraries (Root) P SUNWcsd Core Solaris Devices -R SUNWwpau Wireless WPA Supplicant, (Usr) diff --git a/usr/src/pkgdefs/SUNWwpau/depend b/usr/src/pkgdefs/SUNWwpau/depend index a6b5f37208..5ec8720a0a 100644 --- a/usr/src/pkgdefs/SUNWwpau/depend +++ b/usr/src/pkgdefs/SUNWwpau/depend @@ -49,4 +49,5 @@ P SUNWcsu Core Solaris, (Usr) 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) |