Discuss http://www.shoup.net/papers/oaep.ps.Z

[openssl.git] / crypto / sha / sha.h

diff --git a/crypto/sha/sha.h b/crypto/sha/sha.h
index 4cf0ea02254ef0dfc2dde1b38f40f19b257a06fc..77f6d9695e77bd9220f4c04f18b2c6c4dcc57f34 100644 (file)
--- a/crypto/sha/sha.h
+++ b/crypto/sha/sha.h
@@ -63,45 +63,55 @@
 extern "C" {
 #endif
 
 extern "C" {
 #endif
 

-#define SHA_CBLOCK     64
+#if defined(NO_SHA) || (defined(NO_SHA0) && defined(NO_SHA1))
+#error SHA is disabled.
+#endif
+
+/*
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * ! SHA_LONG has to be at least 32 bits wide. If it's wider, then !
+ * ! SHA_LONG_LOG2 has to be defined along.                        !
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ */
+
+#if defined(WIN16) || defined(__LP32__)
+#define SHA_LONG unsigned long
+#elif defined(_CRAY) || defined(__ILP64__)
+#define SHA_LONG unsigned long
+#define SHA_LONG_LOG2 3
+#else
+#define SHA_LONG unsigned int
+#endif
+

 #define SHA_LBLOCK     16
 #define SHA_LBLOCK     16

-#define SHA_BLOCK      16
-#define SHA_LAST_BLOCK  56
-#define SHA_LENGTH_BLOCK 8
+#define SHA_CBLOCK     (SHA_LBLOCK*4)  /* SHA treats input data as a
+                                        * contiguous array of 32 bit
+                                        * wide big-endian values. */
+#define SHA_LAST_BLOCK  (SHA_CBLOCK-8)

 #define SHA_DIGEST_LENGTH 20
 
 typedef struct SHAstate_st
        {
 #define SHA_DIGEST_LENGTH 20
 
 typedef struct SHAstate_st
        {

-       unsigned long h0,h1,h2,h3,h4;
-       unsigned long Nl,Nh;
-       unsigned long data[SHA_LBLOCK];
+       SHA_LONG h0,h1,h2,h3,h4;
+       SHA_LONG Nl,Nh;
+       SHA_LONG data[SHA_LBLOCK];

        int num;
        } SHA_CTX;
 
        int num;
        } SHA_CTX;
 

-#ifndef NOPROTO
+#ifndef NO_SHA0

 void SHA_Init(SHA_CTX *c);
 void SHA_Init(SHA_CTX *c);

-void SHA_Update(SHA_CTX *c, unsigned char *data, unsigned long len);
+void SHA_Update(SHA_CTX *c, const void *data, unsigned long len);

 void SHA_Final(unsigned char *md, SHA_CTX *c);
 void SHA_Final(unsigned char *md, SHA_CTX *c);

-unsigned char *SHA(unsigned char *d, unsigned long n,unsigned char *md);
-void SHA_Transform(SHA_CTX *c, unsigned char *data);
+unsigned char *SHA(const unsigned char *d, unsigned long n,unsigned char *md);
+void SHA_Transform(SHA_CTX *c, const unsigned char *data);
+#endif
+#ifndef NO_SHA1

 void SHA1_Init(SHA_CTX *c);
 void SHA1_Init(SHA_CTX *c);

-void SHA1_Update(SHA_CTX *c, unsigned char *data, unsigned long len);
+void SHA1_Update(SHA_CTX *c, const void *data, unsigned long len);

 void SHA1_Final(unsigned char *md, SHA_CTX *c);
 void SHA1_Final(unsigned char *md, SHA_CTX *c);

-unsigned char *SHA1(unsigned char *d, unsigned long n,unsigned char *md);
-void SHA1_Transform(SHA_CTX *c, unsigned char *data);
-#else
-void SHA_Init();
-void SHA_Update();
-void SHA_Final();
-unsigned char *SHA();
-void SHA_Transform();
-void SHA1_Init();
-void SHA1_Update();
-void SHA1_Final();
-unsigned char *SHA1();
-void SHA1_Transform();
+unsigned char *SHA1(const unsigned char *d, unsigned long n,unsigned char *md);
+void SHA1_Transform(SHA_CTX *c, const unsigned char *data);

 #endif
 #endif

-

 #ifdef  __cplusplus
 }
 #endif
 #ifdef  __cplusplus
 }
 #endif