git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tidying
[exim.git]
/
src
/
src
/
hash.c
diff --git
a/src/src/hash.c
b/src/src/hash.c
index 059e6d9bb028bda15fc97d265bca0a085b8f5577..f49add29c74ff0949fce90cf861f75327128c619 100644
(file)
--- a/
src/src/hash.c
+++ b/
src/src/hash.c
@@
-25,7
+25,7
@@
typedef struct sha1 {
sha1;
#endif /*STAND_ALONE*/
sha1;
#endif /*STAND_ALONE*/
-
+#include <assert.h>
/******************************************************************************/
#ifdef SHA_OPENSSL
/******************************************************************************/
#ifdef SHA_OPENSSL
@@
-50,6
+50,9
@@
switch (h->method)
{
case HASH_SHA1: SHA1_Update (&h->u.sha1, data, len); break;
case HASH_SHA256: SHA256_Update(&h->u.sha2, data, len); break;
{
case HASH_SHA1: SHA1_Update (&h->u.sha1, data, len); break;
case HASH_SHA256: SHA256_Update(&h->u.sha2, data, len); break;
+ /* should be blocked by init not handling these, but be explicit to
+ guard against accidents later (and hush up clang -Wswitch) */
+ default: assert(0);
}
}
}
}
@@
-62,6
+65,7
@@
switch (h->method)
{
case HASH_SHA1: SHA1_Final (b->data, &h->u.sha1); break;
case HASH_SHA256: SHA256_Final(b->data, &h->u.sha2); break;
{
case HASH_SHA1: SHA1_Final (b->data, &h->u.sha1); break;
case HASH_SHA256: SHA256_Final(b->data, &h->u.sha2); break;
+ default: assert(0);
}
}
}
}
@@
-772,7
+776,7
@@
int main(void)
sha1 base;
int j;
int i = 0x01020304;
sha1 base;
int j;
int i = 0x01020304;
-uschar *ctest =
(uschar *)
(&i);
+uschar *ctest =
US
(&i);
uschar buffer[256];
uschar digest[20];
uschar s[41];
uschar buffer[256];
uschar digest[20];
uschar s[41];