ITS#619: TLS PRNG initialization code

[openldap] / include / lutil_sha1.h

diff --git a/include/lutil_sha1.h b/include/lutil_sha1.h
index 631f7c07b8d5a52f8ec49614ed3379d64aede69a..6f1e410f416473f89efc347a9562bc7da93bc9c8 100644 (file)
--- a/include/lutil_sha1.h
+++ b/include/lutil_sha1.h
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -24,6 +24,7 @@ LDAP_BEGIN_DECL
  * SHA-1 in C
  * By Steve Reid <steve@edmweb.com>
  */
+#define LUTIL_SHA1_BYTES 20
 
 /* This code assumes char are 8-bits and uint32 are 32-bits */
 typedef ac_uint4 uint32;
@@ -34,40 +35,31 @@ typedef struct {
     unsigned char buffer[64];
 } lutil_SHA1_CTX;
   
-#ifdef __MINGW32__
-#   undef LDAP_F_PRE
-#   ifdef LIBLUTIL_DECL
-#      define LDAP_F_PRE       extern __declspec(LIBLUTIL_DECL)
-#   else
-#      define LDAP_F_PRE       extern
-#   endif
-#endif
-
-LDAP_F( void )
+LDAP_LUTIL_F( void )
 lutil_SHA1Transform
        LDAP_P((uint32 state[5], const unsigned char buffer[64]));
 
-LDAP_F( void  )
+LDAP_LUTIL_F( void  )
 lutil_SHA1Init
        LDAP_P((lutil_SHA1_CTX *context));
 
-LDAP_F( void  )
+LDAP_LUTIL_F( void  )
 lutil_SHA1Update
        LDAP_P((lutil_SHA1_CTX *context, const unsigned char *data, uint32 len));
 
-LDAP_F( void  )
+LDAP_LUTIL_F( void  )
 lutil_SHA1Final
        LDAP_P((unsigned char digest[20], lutil_SHA1_CTX *context));
 
-LDAP_F( char * )
+LDAP_LUTIL_F( char * )
 lutil_SHA1End
        LDAP_P((lutil_SHA1_CTX *, char *));
 
-LDAP_F( char * )
+LDAP_LUTIL_F( char * )
 lutil_SHA1File
        LDAP_P((char *, char *));
 
-LDAP_F( char * )
+LDAP_LUTIL_F( char * )
 lutil_SHA1Data
        LDAP_P((const unsigned char *, size_t, char *));