svn commit: lorikeet r573 - in trunk/heimdal/lib/des: .

[lha at samba.org]

Author: lha
Date: 2006-10-07 17:24:03 +0000 (Sat, 07 Oct 2006)
New Revision: 573

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=573

Log:
merge build fixes from heimdal cvs 20061008
Modified:
   trunk/heimdal/lib/des/evp.c
   trunk/heimdal/lib/des/evp.h


Changeset:
Modified: trunk/heimdal/lib/des/evp.c
===================================================================
--- trunk/heimdal/lib/des/evp.c	2006-10-07 14:55:46 UTC (rev 572)
+++ trunk/heimdal/lib/des/evp.c	2006-10-07 17:24:03 UTC (rev 573)
@@ -883,19 +883,19 @@
  */
 
 void
-OPENSSL_add_all_algorithms(void)
+OpenSSL_add_all_algorithms(void)
 {
     return;
 }
 
 void
-OPENSSL_add_all_algorithms_conf(void)
+OpenSSL_add_all_algorithms_conf(void)
 {
     return;
 }
 
 void
-OPENSSL_add_all_algorithms_noconf(void)
+OpenSSL_add_all_algorithms_noconf(void)
 {
     return;
 }

Modified: trunk/heimdal/lib/des/evp.h
===================================================================
--- trunk/heimdal/lib/des/evp.h	2006-10-07 14:55:46 UTC (rev 572)
+++ trunk/heimdal/lib/des/evp.h	2006-10-07 17:24:03 UTC (rev 573)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: evp.h,v 1.10 2006/10/07 12:13:46 lha Exp $ */
+/* $Id: evp.h,v 1.11 2006/10/07 17:21:24 lha Exp $ */
 
 #ifndef HEIM_EVP_H
 #define HEIM_EVP_H 1
@@ -89,9 +89,9 @@
 #define PKCS5_PBKDF2_HMAC_SHA1 hc_PKCS5_PBKDF2_HMAC_SHA1
 #define EVP_BytesToKey hc_EVP_BytesToKey
 #define EVP_get_cipherbyname hc_EVP_get_cipherbyname
-#define	OPENSSL_add_all_algorithms hc_OPENSSL_add_all_algorithms
-#define	OPENSSL_add_all_algorithms_conf hc_OPENSSL_add_all_algorithms_conf
-#define	OPENSSL_add_all_algorithms_noconf hc_OPENSSL_add_all_algorithms_noconf
+#define	OpenSSL_add_all_algorithms hc_OpenSSL_add_all_algorithms
+#define	OpenSSL_add_all_algorithms_conf hc_OpenSSL_add_all_algorithms_conf
+#define	OpenSSL_add_all_algorithms_noconf hc_OpenSSL_add_all_algorithms_noconf
 
 /*
  *
@@ -248,8 +248,8 @@
  *
  */
 
-void	OPENSSL_add_all_algorithms(void);
-void	OPENSSL_add_all_algorithms_conf(void);
-void	OPENSSL_add_all_algorithms_noconf(void);
+void	OpenSSL_add_all_algorithms(void);
+void	OpenSSL_add_all_algorithms_conf(void);
+void	OpenSSL_add_all_algorithms_noconf(void);
 
 #endif /* HEIM_EVP_H */