[Date Prev][Date Next] [Chronological] [Thread] [Top]

Re: (ITS#5696) Patch - support Mozilla NSS for crypto operations



h.b.furuseth@usit.uio.no wrote:
> The latest liblutil/passwd.c breaks with ./configure --enable-lmpasswd
> and OpenSSL:
>
> passwd.c:660: error: expected declaration specifiers or '...' before '(' token
> passwd.c:660: error: expected declaration specifiers or '...' before '&' token
> passwd.c:661: error: conflicting types for 'DES_set_key'
> /usr/include/openssl/des.h:222: error: previous declaration of 'DES_set_key'
>
> Preprocessor output for passwd.c shows that this in passwd.c:
> 	static void
> 	des_set_key( des_key *key, unsigned char *keyData) { ... }
> conflicts with this macro from /usr/include/openssl/des_old.h:
> 	#define des_set_key(k,ks) DES_set_key((k),&(ks))
> which when expanded tries to conflict with this prototype from
> /usr/include/openssl/des.h:
> 	int DES_set_key(const_DES_cblock *key,DES_key_schedule *schedule);
>
Fixed in HEAD. We should probably update from the old (des_*) to new (DES_*) 
as well. Already did this for the identical code in smbk5pwd.c...

-- 
   -- Howard Chu
   CTO, Symas Corp.           http://www.symas.com
   Director, Highland Sun     http://highlandsun.com/hyc/
   Chief Architect, OpenLDAP  http://www.openldap.org/project/