Update to latest pdkim

[users/jgh/exim.git] / src / src / pdkim / sha2.h

diff --git a/src/src/pdkim/sha2.h b/src/src/pdkim/sha2.h
index 06676d5a0d7fcd845da227319f9616aee1005000..347e41b2ea57687680a71c806598ee3b639c3ab4 100644 (file)
--- a/src/src/pdkim/sha2.h
+++ b/src/src/pdkim/sha2.h
@@ -1,4 +1,3 @@
-/* $Cambridge: exim/src/src/pdkim/sha2.h,v 1.1.2.1 2009/02/24 13:13:47 tom Exp $ */
 /**
  * \file sha2.h
  *
@@ -20,13 +19,21 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+
+/* $Cambridge: exim/src/src/pdkim/sha2.h,v 1.1.2.3 2009/04/09 07:49:11 tom Exp $ */
+
 #ifndef POLARSSL_SHA2_H
 #define POLARSSL_SHA2_H
 
 /**
  * \brief          SHA-256 context structure
  */
-typedef struct
+#ifndef HAVE_SHA2_CONTEXT
+#define HAVE_SHA2_CONTEXT
+typedef struct sha2_context sha2_context;
+#endif
+
+struct sha2_context
 {
     unsigned long total[2];     /*!< number of bytes processed  */
     unsigned long state[8];     /*!< intermediate digest state  */
@@ -35,8 +42,7 @@ typedef struct
     unsigned char ipad[64];     /*!< HMAC: inner padding        */
     unsigned char opad[64];     /*!< HMAC: outer padding        */
     int is224;                  /*!< 0 => SHA-256, else SHA-224 */
-}
-sha2_context;
+};
 
 #ifdef __cplusplus
 extern "C" {