X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsha1.h;h=83f64df25843ac6f8bbd1bfe686a00c09ff8716a;hp=86f982d13cd3ed544db664227b0ccf919a725589;hb=3e451dfe42426b51e6ce1d66a3e04de43e055568;hpb=d741a3b912f17d84dc8dc87474e0b989c775de50 diff --git a/pppd/sha1.h b/pppd/sha1.h index 86f982d..83f64df 100644 --- a/pppd/sha1.h +++ b/pppd/sha1.h @@ -8,9 +8,17 @@ #ifndef __SHA1_INCLUDE_ +#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; @@ -21,10 +29,3 @@ extern void SHA1_Final(unsigned char[SHA1_SIGNATURE_SIZE], SHA1_CTX *); #define __SHA1_INCLUDE_ #endif /* __SHA1_INCLUDE_ */ -#ifndef SHA1_SIGNATURE_SIZE -#ifdef SHA_DIGESTSIZE -#define SHA1_SIGNATURE_SIZE SHA_DIGESTSIZE -#else -#define SHA1_SIGNATURE_SIZE 20 -#endif -#endif