oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

start using the pseudo-standard APIs for the hash functions

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7816 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-01-25 23:03:39 +00:00
parent 2cc99ee904
commit 8354432978
1 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
lib/otp/otp_md.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1995, 1996, 1997 Kungliga Tekniska H<>gskolan * Copyright (c) 1995 - 2000 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -69,7 +69,7 @@ otp_md_init (OtpKey key,
char *seed, char *seed,
void (*init)(void *), void (*init)(void *),
void (*update)(void *, void *, size_t), void (*update)(void *, void *, size_t),
void (*finito)(void *, void *), void (*final)(void *, void *),
void *arg, void *arg,
unsigned char *res, unsigned char *res,
size_t ressz) size_t ressz)
@@ -86,7 +86,7 @@ otp_md_init (OtpKey key,
strcat (p, pwd); strcat (p, pwd);
(*init)(arg); (*init)(arg);
(*update)(arg, p, len); (*update)(arg, p, len);
(*finito)(arg, res); (*final)(res, arg);
free (p); free (p);
compressmd (key, res, ressz); compressmd (key, res, ressz);
return 0; return 0;
@@ -96,14 +96,14 @@ static int
otp_md_next (OtpKey key, otp_md_next (OtpKey key,
void (*init)(void *), void (*init)(void *),
void (*update)(void *, void *, size_t), void (*update)(void *, void *, size_t),
void (*finito)(void *, void *), void (*final)(void *, void *),
void *arg, void *arg,
unsigned char *res, unsigned char *res,
size_t ressz) size_t ressz)
{ {
(*init)(arg); (*init)(arg);
(*update)(arg, key, OTPKEYSIZE); (*update)(arg, key, OTPKEYSIZE);
(*finito)(arg, res); (*final)(res, arg);
compressmd (key, res, ressz); compressmd (key, res, ressz);
return 0; return 0;
} }
@@ -113,14 +113,14 @@ otp_md_hash (char *data,
size_t len, size_t len,
void (*init)(void *), void (*init)(void *),
void (*update)(void *, void *, size_t), void (*update)(void *, void *, size_t),
void (*finito)(void *, void *), void (*final)(void *, void *),
void *arg, void *arg,
unsigned char *res, unsigned char *res,
size_t ressz) size_t ressz)
{ {
(*init)(arg); (*init)(arg);
(*update)(arg, data, len); (*update)(arg, data, len);
(*finito)(arg, res); (*final)(res, arg);
return 0; return 0;
} }
@@ -128,12 +128,12 @@ int
otp_md4_init (OtpKey key, char *pwd, char *seed) otp_md4_init (OtpKey key, char *pwd, char *seed)
{ {
unsigned char res[16]; unsigned char res[16];
struct md4 md4; MD4_CTX md4;
return otp_md_init (key, pwd, seed, return otp_md_init (key, pwd, seed,
(void (*)(void *))md4_init, (void (*)(void *))MD4Init,
(void (*)(void *, void *, size_t))md4_update, (void (*)(void *, void *, size_t))MD4Update,
(void (*)(void *, void *))md4_finito, (void (*)(void *, void *))MD4Final,
&md4, res, sizeof(res)); &md4, res, sizeof(res));
} }
@@ -142,12 +142,12 @@ otp_md4_hash (char *data,
size_t len, size_t len,
unsigned char *res) unsigned char *res)
{ {
struct md4 md4; MD4_CTX md4;
return otp_md_hash (data, len, return otp_md_hash (data, len,
(void (*)(void *))md4_init, (void (*)(void *))MD4Init,
(void (*)(void *, void *, size_t))md4_update, (void (*)(void *, void *, size_t))MD4Update,
(void (*)(void *, void *))md4_finito, (void (*)(void *, void *))MD4Finito,
&md4, res, 16); &md4, res, 16);
} }
@@ -155,12 +155,12 @@ int
otp_md4_next (OtpKey key) otp_md4_next (OtpKey key)
{ {
unsigned char res[16]; unsigned char res[16];
struct md4 md4; MD4_CTX md4;
return otp_md_next (key, return otp_md_next (key,
(void (*)(void *))md4_init, (void (*)(void *))MD4Init,
(void (*)(void *, void *, size_t))md4_update, (void (*)(void *, void *, size_t))MD4Update,
(void (*)(void *, void *))md4_finito, (void (*)(void *, void *))MD4FInal,
&md4, res, sizeof(res)); &md4, res, sizeof(res));
} }
@@ -169,12 +169,12 @@ int
otp_md5_init (OtpKey key, char *pwd, char *seed) otp_md5_init (OtpKey key, char *pwd, char *seed)
{ {
unsigned char res[16]; unsigned char res[16];
struct md5 md5; MD5_CTX md5;
return otp_md_init (key, pwd, seed, return otp_md_init (key, pwd, seed,
(void (*)(void *))md5_init, (void (*)(void *))MD5Init,
(void (*)(void *, void *, size_t))md5_update, (void (*)(void *, void *, size_t))MD5Update,
(void (*)(void *, void *))md5_finito, (void (*)(void *, void *))MD5Final,
&md5, res, sizeof(res)); &md5, res, sizeof(res));
} }
@@ -183,12 +183,12 @@ otp_md5_hash (char *data,
size_t len, size_t len,
unsigned char *res) unsigned char *res)
{ {
struct md5 md5; MD5_CTX md5;
return otp_md_hash (data, len, return otp_md_hash (data, len,
(void (*)(void *))md5_init, (void (*)(void *))MD5Init,
(void (*)(void *, void *, size_t))md5_update, (void (*)(void *, void *, size_t))MD5Update,
(void (*)(void *, void *))md5_finito, (void (*)(void *, void *))MD5Final,
&md5, res, 16); &md5, res, 16);
} }
@@ -196,12 +196,12 @@ int
otp_md5_next (OtpKey key) otp_md5_next (OtpKey key)
{ {
unsigned char res[16]; unsigned char res[16];
struct md5 md5; MD5_CTX md5;
return otp_md_next (key, return otp_md_next (key,
(void (*)(void *))md5_init, (void (*)(void *))MD5Init,
(void (*)(void *, void *, size_t))md5_update, (void (*)(void *, void *, size_t))MD5Update,
(void (*)(void *, void *))md5_finito, (void (*)(void *, void *))MD5Final,
&md5, res, sizeof(res)); &md5, res, sizeof(res));
} }