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

diff --git a/pppd/sha1.h b/pppd/sha1.h
index 83f64df..2325133 100644
--- 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
@@ -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 */