oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Move up evp.h to please OpenSSL, from Douglas E. Engert.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17466 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-05-06 06:46:27 +00:00
parent 890f83e05f
commit 1939e91746
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cf/crypto.m4
View File

@@ -11,6 +11,7 @@ m4_define([test_headers], [
#ifdef HAVE_SYS_TYPES_H #ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif
#include <openssl/evp.h>
#include <openssl/md4.h> #include <openssl/md4.h>
#include <openssl/md5.h> #include <openssl/md5.h>
#include <openssl/sha.h> #include <openssl/sha.h>
@@ -20,10 +21,10 @@ m4_define([test_headers], [
#include <openssl/engine.h> #include <openssl/engine.h>
#include <openssl/ui.h> #include <openssl/ui.h>
#include <openssl/rand.h> #include <openssl/rand.h>
#include <openssl/evp.h>
#include <openssl/hmac.h> #include <openssl/hmac.h>
#include <openssl/pkcs12.h> #include <openssl/pkcs12.h>
#else #else
#include <hcrypto/evp.h>
#include <hcrypto/md4.h> #include <hcrypto/md4.h>
#include <hcrypto/md5.h> #include <hcrypto/md5.h>
#include <hcrypto/sha.h> #include <hcrypto/sha.h>
@@ -31,7 +32,6 @@ m4_define([test_headers], [
#include <hcrypto/rc4.h> #include <hcrypto/rc4.h>
#include <hcrypto/aes.h> #include <hcrypto/aes.h>
#include <hcrypto/engine.h> #include <hcrypto/engine.h>
#include <hcrypto/evp.h>
#include <hcrypto/hmac.h> #include <hcrypto/hmac.h>
#include <hcrypto/pkcs12.h> #include <hcrypto/pkcs12.h>
#endif #endif

4
include/make_crypto.c
View File

@@ -63,6 +63,7 @@ main(int argc, char **argv)
fputs("#ifndef OPENSSL_DES_LIBDES_COMPATIBILITY\n", f); fputs("#ifndef OPENSSL_DES_LIBDES_COMPATIBILITY\n", f);
fputs("#define OPENSSL_DES_LIBDES_COMPATIBILITY\n", f); fputs("#define OPENSSL_DES_LIBDES_COMPATIBILITY\n", f);
fputs("#endif\n", f); fputs("#endif\n", f);
fputs("#include <openssl/evp.h>\n", f);
fputs("#include <openssl/des.h>\n", f); fputs("#include <openssl/des.h>\n", f);
fputs("#include <openssl/rc4.h>\n", f); fputs("#include <openssl/rc4.h>\n", f);
fputs("#include <openssl/rc2.h>\n", f); fputs("#include <openssl/rc2.h>\n", f);
@@ -72,7 +73,6 @@ main(int argc, char **argv)
fputs("#include <openssl/sha.h>\n", f); fputs("#include <openssl/sha.h>\n", f);
fputs("#include <openssl/aes.h>\n", f); fputs("#include <openssl/aes.h>\n", f);
fputs("#include <openssl/ui.h>\n", f); fputs("#include <openssl/ui.h>\n", f);
fputs("#include <openssl/evp.h>\n", f);
fputs("#include <openssl/rand.h>\n", f); fputs("#include <openssl/rand.h>\n", f);
fputs("#include <openssl/engine.h>\n", f); fputs("#include <openssl/engine.h>\n", f);
fputs("#include <openssl/pkcs12.h>\n", f); fputs("#include <openssl/pkcs12.h>\n", f);
@@ -85,6 +85,7 @@ main(int argc, char **argv)
fputs("#ifdef KRB5\n", f); fputs("#ifdef KRB5\n", f);
fputs("#include <krb5-types.h>\n", f); fputs("#include <krb5-types.h>\n", f);
fputs("#endif\n", f); fputs("#endif\n", f);
fputs("#include <hcrypto/evp.h>\n", f);
fputs("#include <hcrypto/des.h>\n", f); fputs("#include <hcrypto/des.h>\n", f);
fputs("#include <hcrypto/md2.h>\n", f); fputs("#include <hcrypto/md2.h>\n", f);
fputs("#include <hcrypto/md4.h>\n", f); fputs("#include <hcrypto/md4.h>\n", f);
@@ -94,7 +95,6 @@ main(int argc, char **argv)
fputs("#include <hcrypto/rc2.h>\n", f); fputs("#include <hcrypto/rc2.h>\n", f);
fputs("#include <hcrypto/aes.h>\n", f); fputs("#include <hcrypto/aes.h>\n", f);
fputs("#include <hcrypto/ui.h>\n", f); fputs("#include <hcrypto/ui.h>\n", f);
fputs("#include <hcrypto/evp.h>\n", f);
fputs("#include <hcrypto/rand.h>\n", f); fputs("#include <hcrypto/rand.h>\n", f);
fputs("#include <hcrypto/engine.h>\n", f); fputs("#include <hcrypto/engine.h>\n", f);
fputs("#include <hcrypto/pkcs12.h>\n", f); fputs("#include <hcrypto/pkcs12.h>\n", f);