projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better to not have blanks in .cvsignore files
[openssl.git]
/
crypto
/
crypto.c
diff --git
a/crypto/crypto.c
b/crypto/crypto.c
index 7f89c5a608b96f5d19caa9071709f3772376e7d9..2387933b5e8274c37c92fa76e07f65b969f29007 100644
(file)
--- a/
crypto/crypto.c
+++ b/
crypto/crypto.c
@@
-115,25
+115,25
@@
#define USE_SOCKETS
#include "../e_os.h"
#define USE_SOCKETS
#include "../e_os.h"
-#include
"buffer.h"
-#include
"bio.h"
-#include
"stack.h"
-#include
"lhash.h"
+#include
<openssl/buffer.h>
+#include
<openssl/bio.h>
+#include
<openssl/stack.h>
+#include
<openssl/lhash.h>
-#include
"err.h"
+#include
<openssl/err.h>
-#include
"bn.h"
-#include
"evp.h"
+#include
<openssl/bn.h>
+#include
<openssl/evp.h>
-#include
"rand.h"
-#include
"conf.h"
-#include
"txt_db.h"
+#include
<openssl/rand.h>
+#include
<openssl/conf.h>
+#include
<openssl/txt_db.h>
-#include
"x509.h"
-#include
"pkcs7.h"
-#include
"pem.h"
-#include
"asn1.h"
-#include
"objects.h"
+#include
<openssl/x509.h>
+#include
<openssl/pkcs7.h>
+#include
<openssl/pem.h>
+#include
<openssl/asn1.h>
+#include
<openssl/objects.h>
#ifdef CRYPTO_LIB_SUBSET
#include "cryptlib.c"
#ifdef CRYPTO_LIB_SUBSET
#include "cryptlib.c"
@@
-361,7
+361,7
@@
#include "evp/e_ecb_r2.c"
#include "evp/e_ofb_r2.c"
#endif
#include "evp/e_ecb_r2.c"
#include "evp/e_ofb_r2.c"
#endif
-#ifndef NO_B
LOWFISH
+#ifndef NO_B
F
#include "evp/e_cbc_bf.c"
#include "evp/e_cfb_bf.c"
#include "evp/e_ecb_bf.c"
#include "evp/e_cbc_bf.c"
#include "evp/e_cfb_bf.c"
#include "evp/e_ecb_bf.c"
@@
-403,7
+403,7
@@
#endif
#ifdef CRYPTO_BLOWFISH_SUBSET
#endif
#ifdef CRYPTO_BLOWFISH_SUBSET
-#ifndef NO_B
LOWFISH
+#ifndef NO_B
F
#include "bf/bf_cfb64.c"
#include "bf/bf_ecb.c"
#ifndef BF_ASM
#include "bf/bf_cfb64.c"
#include "bf/bf_ecb.c"
#ifndef BF_ASM
@@
-505,6
+505,7
@@
#endif
#endif
#endif
#endif
+#ifndef NO_SHA
#ifdef CRYPTO_SHA1_SUBSET
#ifndef NO_SHA1
#include "sha/sha1_one.c"
#ifdef CRYPTO_SHA1_SUBSET
#ifndef NO_SHA1
#include "sha/sha1_one.c"
@@
-515,14
+516,15
@@
#endif
#ifdef CRYPTO_SHA_SUBSET
#endif
#ifdef CRYPTO_SHA_SUBSET
-#ifndef NO_SHA
+#ifndef NO_SHA
0
#include "evp/m_dss.c"
#include "sha/sha_dgst.c"
#include "sha/sha_one.c"
#include "evp/m_sha.c"
#endif
#endif
#include "evp/m_dss.c"
#include "sha/sha_dgst.c"
#include "sha/sha_one.c"
#include "evp/m_sha.c"
#endif
#endif
-
+#endif
+
#ifdef CRYPTO_STACK_SUBSET
#include "stack/stack.c"
#endif
#ifdef CRYPTO_STACK_SUBSET
#include "stack/stack.c"
#endif