chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make-secnet-sites: Tainted: Provide some commented-out debug
[secnet.git]
/
sha1.c
diff --git
a/sha1.c
b/sha1.c
index 4cc63b5c57f0e9b44f4c3b52c6d63fe92c5f0773..f442e08c91033c805e4c2987810021d507c40525 100644
(file)
--- a/
sha1.c
+++ b/
sha1.c
@@
-78,6
+78,7
@@
A million repetitions of "a"
/* #define SHA1HANDSOFF */
#include "secnet.h"
/* #define SHA1HANDSOFF */
#include "secnet.h"
+#include "util.h"
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <string.h>
@@
-287,14
+288,11
@@
unsigned char finalcount[8];
/*************************************************************/
/* Everything below here is the interface to secnet */
/*************************************************************/
/* Everything below here is the interface to secnet */
-static void
*sha1_init(void
)
+static void
sha1_init(void *sst
)
{
{
- SHA1_CTX *ctx;
+ SHA1_CTX *ctx
=sst
;
- NEW(ctx);
SHA1Init(ctx);
SHA1Init(ctx);
-
- return ctx;
}
static void sha1_update(void *sst, const void *buf, int32_t len)
}
static void sha1_update(void *sst, const void *buf, int32_t len)
@@
-309,7
+307,6
@@
static void sha1_final(void *sst, uint8_t *digest)
SHA1_CTX *ctx=sst;
SHA1Final(digest,ctx);
SHA1_CTX *ctx=sst;
SHA1Final(digest,ctx);
- free(ctx);
}
struct sha1 {
}
struct sha1 {
@@
-320,7
+317,6
@@
struct sha1 {
void sha1_module(dict_t *dict)
{
struct sha1 *st;
void sha1_module(dict_t *dict)
{
struct sha1 *st;
- void *ctx;
cstring_t testinput="abcdbcdecdefdefgefghfghigh"
"ijhijkijkljklmklmnlmnomnopnopq";
uint8_t expected[20]=
cstring_t testinput="abcdbcdecdefdefgefghfghigh"
"ijhijkijkljklmklmnlmnomnopnopq";
uint8_t expected[20]=
@@
-337,16
+333,15
@@
void sha1_module(dict_t *dict)
st->cl.type=CL_HASH;
st->cl.apply=NULL;
st->cl.interface=&st->ops;
st->cl.type=CL_HASH;
st->cl.apply=NULL;
st->cl.interface=&st->ops;
- st->ops.len=20;
+ st->ops.hlen=20;
+ st->ops.slen=sizeof(SHA1_CTX);
st->ops.init=sha1_init;
st->ops.update=sha1_update;
st->ops.final=sha1_final;
dict_add(dict,"sha1",new_closure(&st->cl));
st->ops.init=sha1_init;
st->ops.update=sha1_update;
st->ops.final=sha1_final;
dict_add(dict,"sha1",new_closure(&st->cl));
- ctx=sha1_init();
- sha1_update(ctx,testinput,strlen(testinput));
- sha1_final(ctx,digest);
+ hash_hash(&st->ops,testinput,strlen(testinput),digest);
for (i=0; i<20; i++) {
if (digest[i]!=expected[i]) {
fatal("sha1 module failed self-test");
for (i=0; i<20; i++) {
if (digest[i]!=expected[i]) {
fatal("sha1 module failed self-test");