X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fsha1.h;h=2325133251177e098a1bd2ad95ac125d42d87ba4;hb=607d8eadccfd62c1fa84a36bd1440bd48b4e55ca;hp=dff8da88bd91a041f616e9fb34020c9958144099;hpb=b38527fb14af5ebe3d2559e2f861575c722a1ce9;p=ppp.git

diff --git a/pppd/sha1.h b/pppd/sha1.h
index dff8da8..2325133 100644
--- a/pppd/sha1.h
+++ b/pppd/sha1.h
@@ -1,18 +1,35 @@
 /* sha1.h */
 
-#ifndef __SHA1_INCLUDE_
+#ifndef PPP_SHA1_H
+#define PPP_SHA1_H
+
+#include "pppdconf.h"
+
+#ifndef USE_SHA
+#include <openssl/sha.h>
+
+#define SHA1_CTX SHA_CTX
+#define SHA1_SIGNATURE_SIZE SHA_DIGEST_LENGTH
+
+#else
+
+#ifndef SHA1_SIGNATURE_SIZE
+#ifdef SHA_DIGESTSIZE
+#define SHA1_SIGNATURE_SIZE SHA_DIGESTSIZE
+#else
+#define SHA1_SIGNATURE_SIZE 20
+#endif
+#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;
 
-#define SHA1_SIGNATURE_SIZE 20
-
 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 */