From: Howard Chu <hyc@openldap.org>
Date: Fri, 3 Jul 2009 22:19:52 +0000 (+0000)
Subject: ITS#5696 des_set_key -> des_set_key_and_parity
X-Git-Tag: ACLCHECK_0~454
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=159461bfc80f33dd9a87c224bf34753e8c05b436;p=openldap

ITS#5696 des_set_key -> des_set_key_and_parity
---

diff --git a/libraries/liblutil/passwd.c b/libraries/liblutil/passwd.c
index cb9f0e034a..dc45c1b509 100644
--- a/libraries/liblutil/passwd.c
+++ b/libraries/liblutil/passwd.c
@@ -657,7 +657,7 @@ static int chk_md5(
  * abstract away setting the parity.
  */
 static void
-des_set_key( des_key *key, unsigned char *keyData)
+des_set_key_and_parity( des_key *key, unsigned char *keyData)
 {
     memcpy(key, keyData, 8);
     des_set_odd_parity( key );
@@ -670,7 +670,7 @@ des_set_key( des_key *key, unsigned char *keyData)
  * implement MozNSS wrappers for the openSSL calls 
  */
 static void
-des_set_key( des_key *key, unsigned char *keyData)
+des_set_key_and_parity( des_key *key, unsigned char *keyData)
 {
     SECItem keyDataItem;
     PK11SlotInfo *slot;
@@ -825,7 +825,7 @@ static void lmPasswd_to_key(
 	k[6] = ((lpw[5] & 0x3F) << 2) | (lpw[6] >> 6);
 	k[7] = ((lpw[6] & 0x7F) << 1);
 		
-	des_set_key( key, k );
+	des_set_key_and_parity( key, k );
 }	
 
 static int chk_lanman(