Sun Dec 13 18:29:00 2015 UTC ()
PR/50536: David Binderman: fix incorrect sizeof


(christos)
diff -r1.1 -r1.2 src/sys/dev/pci/n8/common/api/n8_key_works.c
cvs diff -r1.1 -r1.2 src/sys/dev/pci/n8/common/api/Attic/n8_key_works.c (expand / switch to unified diff)

--- src/sys/dev/pci/n8/common/api/Attic/n8_key_works.c 2008/10/30 12:02:14 1.1
+++ src/sys/dev/pci/n8/common/api/Attic/n8_key_works.c 2015/12/13 18:29:00 1.2
@@ -22,27 +22,27 @@ @@ -22,27 +22,27 @@
22 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 22 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
23 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 23 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
24 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 24 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
25 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 25 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
26 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 26 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
27 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 27 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
28 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 28 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
32 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 32 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */ 33 */
34 34
35static char const n8_id[] = "$Id: n8_key_works.c,v 1.1 2008/10/30 12:02:14 darran Exp $"; 35static char const n8_id[] = "$Id: n8_key_works.c,v 1.2 2015/12/13 18:29:00 christos Exp $";
36/*****************************************************************************/ 36/*****************************************************************************/
37/** @file n8_key_works.c 37/** @file n8_key_works.c
38 * @brief Contains key operations 38 * @brief Contains key operations
39 * 39 *
40 *****************************************************************************/ 40 *****************************************************************************/
41 41
42/***************************************************************************** 42/*****************************************************************************
43 * Revision history: 43 * Revision history:
44 * 12/11/02 brr Include n8_OS_intf to pick up needed types. 44 * 12/11/02 brr Include n8_OS_intf to pick up needed types.
45 * 09/20/01 bac Changed Key_cblock to key_cblock_t to follow coding stds. 45 * 09/20/01 bac Changed Key_cblock to key_cblock_t to follow coding stds.
46 * 07/02/01 mel Fixed comments. 46 * 07/02/01 mel Fixed comments.
47 * 06/24/01 bac Changes to bring up to coding standards. 47 * 06/24/01 bac Changes to bring up to coding standards.
48 * 05/29/01 mel Original version. 48 * 05/29/01 mel Original version.
@@ -129,27 +129,27 @@ static key_cblock_t weak_keys[NUM_WEAK_ @@ -129,27 +129,27 @@ static key_cblock_t weak_keys[NUM_WEAK_
129 * 129 *
130 * @par Errors: 130 * @par Errors:
131 * None. 131 * None.
132 *****************************************************************************/ 132 *****************************************************************************/
133N8_Boolean_t checkKeyForWeakness (key_cblock_t *key_p) 133N8_Boolean_t checkKeyForWeakness (key_cblock_t *key_p)
134{ 134{
135 int i; 135 int i;
136 N8_Boolean_t ret = N8_FALSE; 136 N8_Boolean_t ret = N8_FALSE;
137 137
138 DBG(("checkKeyForWeakness\n")); 138 DBG(("checkKeyForWeakness\n"));
139 139
140 for (i=0; i < NUM_WEAK_KEY; i++) 140 for (i=0; i < NUM_WEAK_KEY; i++)
141 { 141 {
142 if (memcmp(weak_keys[i], key_p, sizeof(key_p)) == 0) 142 if (memcmp(weak_keys[i], key_p, sizeof(*key_p)) == 0)
143 { 143 {
144 ret = N8_TRUE; 144 ret = N8_TRUE;
145 break; 145 break;
146 } 146 }
147 } 147 }
148 return ret; 148 return ret;
149} /* checkKeyForWeakness */ 149} /* checkKeyForWeakness */
150 150
151 151
152/***************************************************************************** 152/*****************************************************************************
153 * checkKeyParity 153 * checkKeyParity
154 *****************************************************************************/ 154 *****************************************************************************/
155/** @ingroup keyworks 155/** @ingroup keyworks