svn commit: lorikeet r570 - in trunk/heimdal/lib: des hx509
lha at samba.org
lha at samba.org
Sat Oct 7 13:03:48 GMT 2006
Author: lha
Date: 2006-10-07 13:03:48 +0000 (Sat, 07 Oct 2006)
New Revision: 570
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=570
Log:
merge build fixes from heimdal cvs 20061008
Modified:
trunk/heimdal/lib/des/evp.c
trunk/heimdal/lib/des/evp.h
trunk/heimdal/lib/hx509/cert.c
Changeset:
Modified: trunk/heimdal/lib/des/evp.c
===================================================================
--- trunk/heimdal/lib/des/evp.c 2006-10-07 09:17:24 UTC (rev 569)
+++ trunk/heimdal/lib/des/evp.c 2006-10-07 13:03:48 UTC (rev 570)
@@ -878,3 +878,24 @@
return EVP_CIPHER_key_length(type);
}
+/*
+ *
+ */
+
+void
+OPENSSL_add_all_algorithms(void)
+{
+ return;
+}
+
+void
+OPENSSL_add_all_algorithms_conf(void)
+{
+ return;
+}
+
+void
+OPENSSL_add_all_algorithms_noconf(void)
+{
+ return;
+}
Modified: trunk/heimdal/lib/des/evp.h
===================================================================
--- trunk/heimdal/lib/des/evp.h 2006-10-07 09:17:24 UTC (rev 569)
+++ trunk/heimdal/lib/des/evp.h 2006-10-07 13:03:48 UTC (rev 570)
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*/
-/* $Id: evp.h,v 1.8 2006/04/21 15:00:54 lha Exp $ */
+/* $Id: evp.h,v 1.10 2006/10/07 12:13:46 lha Exp $ */
#ifndef HEIM_EVP_H
#define HEIM_EVP_H 1
@@ -89,6 +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
/*
*
@@ -241,4 +244,12 @@
unsigned int, void *, 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 */
Modified: trunk/heimdal/lib/hx509/cert.c
===================================================================
--- trunk/heimdal/lib/hx509/cert.c 2006-10-07 09:17:24 UTC (rev 569)
+++ trunk/heimdal/lib/hx509/cert.c 2006-10-07 13:03:48 UTC (rev 570)
@@ -32,7 +32,7 @@
*/
#include "hx_locl.h"
-RCSID("$Id: cert.c,v 1.58 2006/09/15 05:59:35 lha Exp $");
+RCSID("$Id: cert.c,v 1.59 2006/10/07 12:07:41 lha Exp $");
#include "crypto-headers.h"
struct hx509_verify_ctx_data {
@@ -107,10 +107,12 @@
_hx509_ks_dir_register(*context);
ENGINE_add_conf_module();
+ OpenSSL_add_all_algorithms();
(*context)->ocsp_time_diff = HX509_DEFAULT_OCSP_TIME_DIFF;
initialize_hx_error_table_r(&(*context)->et_list);
+ initialize_asn1_error_table_r(&(*context)->et_list);
return 0;
}
More information about the samba-cvs
mailing list