The use of <net/ppp_defs.h> isn't guranteed to exist on Linux (e.g. uclibc, buildroot...

[ppp.git] / pppd / sha1.h

diff --git a/pppd/sha1.h b/pppd/sha1.h
index f1d26618b6be6b19433cd3679ddcfe3541af91cc..2325133251177e098a1bd2ad95ac125d42d87ba4 100644 (file)
--- a/pppd/sha1.h
+++ b/pppd/sha1.h
@@ -1,12 +1,17 @@
 /* sha1.h */
 
-/* If OpenSSL is in use, then use that version of SHA-1 */
-#ifdef OPENSSL
-#include <t_sha.h>
-#define __SHA1_INCLUDE_
-#endif
+#ifndef PPP_SHA1_H
+#define PPP_SHA1_H
+
+#include "pppdconf.h"
+
+#ifndef USE_SHA
+#include <openssl/sha.h>
 
-#ifndef __SHA1_INCLUDE_
+#define SHA1_CTX SHA_CTX
+#define SHA1_SIGNATURE_SIZE SHA_DIGEST_LENGTH
+
+#else
 
 #ifndef SHA1_SIGNATURE_SIZE
 #ifdef SHA_DIGESTSIZE
@@ -17,8 +22,8 @@
 #endif
 
 typedef struct {
-    unsigned long state[5];
-    unsigned long count[2];
+    u_int32_t state[5];
+    u_int32_t count[2];
     unsigned char buffer[64];
 } SHA1_CTX;
 
@@ -26,6 +31,5 @@ extern void SHA1_Init(SHA1_CTX *);
 extern void SHA1_Update(SHA1_CTX *, const unsigned char *, unsigned int);
 extern void SHA1_Final(unsigned char[SHA1_SIGNATURE_SIZE], SHA1_CTX *);
 
-#define __SHA1_INCLUDE_
-#endif /* __SHA1_INCLUDE_ */
-
+#endif /* USE_SHA */
+#endif /* PPP_SHA1_H */