const poising

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8667 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-07-12 00:26:44 +00:00
parent 63d826a6eb
commit 88f664127c
4 changed files with 30 additions and 30 deletions

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.
* *

View File

@@ -61,7 +61,7 @@ typedef struct {
char *name; char *name;
int hashsize; int hashsize;
int (*hash)(const char *s, size_t len, unsigned char *res); int (*hash)(const char *s, size_t len, unsigned char *res);
int (*init)(OtpKey key, char *pwd, char *seed); int (*init)(OtpKey key, const char *pwd, const char *seed);
int (*next)(OtpKey key); int (*next)(OtpKey key);
} OtpAlgorithm; } OtpAlgorithm;

View File

@@ -65,10 +65,10 @@ compressmd (OtpKey key, unsigned char *md, size_t len)
static int static int
otp_md_init (OtpKey key, otp_md_init (OtpKey key,
char *pwd, const char *pwd,
char *seed, const char *seed,
void (*init)(void *), void (*init)(void *),
void (*update)(void *, void *, size_t), void (*update)(void *, const void *, size_t),
void (*final)(void *, void *), void (*final)(void *, void *),
void *arg, void *arg,
unsigned char *res, unsigned char *res,
@@ -95,7 +95,7 @@ otp_md_init (OtpKey key,
static int 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 *, const void *, size_t),
void (*final)(void *, void *), void (*final)(void *, void *),
void *arg, void *arg,
unsigned char *res, unsigned char *res,
@@ -109,10 +109,10 @@ otp_md_next (OtpKey key,
} }
static int static int
otp_md_hash (char *data, otp_md_hash (const char *data,
size_t len, size_t len,
void (*init)(void *), void (*init)(void *),
void (*update)(void *, void *, size_t), void (*update)(void *, const void *, size_t),
void (*final)(void *, void *), void (*final)(void *, void *),
void *arg, void *arg,
unsigned char *res, unsigned char *res,
@@ -125,20 +125,20 @@ otp_md_hash (char *data,
} }
int int
otp_md4_init (OtpKey key, char *pwd, char *seed) otp_md4_init (OtpKey key, const char *pwd, const char *seed)
{ {
unsigned char res[16]; unsigned char res[16];
MD4_CTX md4; MD4_CTX md4;
return otp_md_init (key, pwd, seed, return otp_md_init (key, pwd, seed,
(void (*)(void *))MD4Init, (void (*)(void *))MD4Init,
(void (*)(void *, void *, size_t))MD4Update, (void (*)(void *, const void *, size_t))MD4Update,
(void (*)(void *, void *))MD4Final, (void (*)(void *, void *))MD4Final,
&md4, res, sizeof(res)); &md4, res, sizeof(res));
} }
int int
otp_md4_hash (char *data, otp_md4_hash (const char *data,
size_t len, size_t len,
unsigned char *res) unsigned char *res)
{ {
@@ -146,7 +146,7 @@ otp_md4_hash (char *data,
return otp_md_hash (data, len, return otp_md_hash (data, len,
(void (*)(void *))MD4Init, (void (*)(void *))MD4Init,
(void (*)(void *, void *, size_t))MD4Update, (void (*)(void *, const void *, size_t))MD4Update,
(void (*)(void *, void *))MD4Final, (void (*)(void *, void *))MD4Final,
&md4, res, 16); &md4, res, 16);
} }
@@ -159,27 +159,27 @@ otp_md4_next (OtpKey key)
return otp_md_next (key, return otp_md_next (key,
(void (*)(void *))MD4Init, (void (*)(void *))MD4Init,
(void (*)(void *, void *, size_t))MD4Update, (void (*)(void *, const void *, size_t))MD4Update,
(void (*)(void *, void *))MD4Final, (void (*)(void *, void *))MD4Final,
&md4, res, sizeof(res)); &md4, res, sizeof(res));
} }
int int
otp_md5_init (OtpKey key, char *pwd, char *seed) otp_md5_init (OtpKey key, const char *pwd, const char *seed)
{ {
unsigned char res[16]; unsigned char res[16];
MD5_CTX md5; MD5_CTX md5;
return otp_md_init (key, pwd, seed, return otp_md_init (key, pwd, seed,
(void (*)(void *))MD5Init, (void (*)(void *))MD5Init,
(void (*)(void *, void *, size_t))MD5Update, (void (*)(void *, const void *, size_t))MD5Update,
(void (*)(void *, void *))MD5Final, (void (*)(void *, void *))MD5Final,
&md5, res, sizeof(res)); &md5, res, sizeof(res));
} }
int int
otp_md5_hash (char *data, otp_md5_hash (const char *data,
size_t len, size_t len,
unsigned char *res) unsigned char *res)
{ {
@@ -187,7 +187,7 @@ otp_md5_hash (char *data,
return otp_md_hash (data, len, return otp_md_hash (data, len,
(void (*)(void *))MD5Init, (void (*)(void *))MD5Init,
(void (*)(void *, void *, size_t))MD5Update, (void (*)(void *, const void *, size_t))MD5Update,
(void (*)(void *, void *))MD5Final, (void (*)(void *, void *))MD5Final,
&md5, res, 16); &md5, res, 16);
} }
@@ -200,7 +200,7 @@ otp_md5_next (OtpKey key)
return otp_md_next (key, return otp_md_next (key,
(void (*)(void *))MD5Init, (void (*)(void *))MD5Init,
(void (*)(void *, void *, size_t))MD5Update, (void (*)(void *, const void *, size_t))MD5Update,
(void (*)(void *, void *))MD5Final, (void (*)(void *, void *))MD5Final,
&md5, res, sizeof(res)); &md5, res, sizeof(res));
} }
@@ -228,20 +228,20 @@ SHA1Final_little_endian (void *res, struct sha1 *m)
} }
int int
otp_sha_init (OtpKey key, char *pwd, char *seed) otp_sha_init (OtpKey key, const char *pwd, const char *seed)
{ {
unsigned char res[20]; unsigned char res[20];
struct sha1 sha1; struct sha1 sha1;
return otp_md_init (key, pwd, seed, return otp_md_init (key, pwd, seed,
(void (*)(void *))SHA1Init, (void (*)(void *))SHA1Init,
(void (*)(void *, void *, size_t))SHA1Update, (void (*)(void *, const void *, size_t))SHA1Update,
(void (*)(void *, void *))SHA1Final_little_endian, (void (*)(void *, void *))SHA1Final_little_endian,
&sha1, res, sizeof(res)); &sha1, res, sizeof(res));
} }
int int
otp_sha_hash (char *data, otp_sha_hash (const char *data,
size_t len, size_t len,
unsigned char *res) unsigned char *res)
{ {
@@ -249,7 +249,7 @@ otp_sha_hash (char *data,
return otp_md_hash (data, len, return otp_md_hash (data, len,
(void (*)(void *))SHA1Init, (void (*)(void *))SHA1Init,
(void (*)(void *, void *, size_t))SHA1Update, (void (*)(void *, const void *, size_t))SHA1Update,
(void (*)(void *, void *))SHA1Final_little_endian, (void (*)(void *, void *))SHA1Final_little_endian,
&sha1, res, 20); &sha1, res, 20);
} }
@@ -262,7 +262,7 @@ otp_sha_next (OtpKey key)
return otp_md_next (key, return otp_md_next (key,
(void (*)(void *))SHA1Init, (void (*)(void *))SHA1Init,
(void (*)(void *, void *, size_t))SHA1Update, (void (*)(void *, const void *, size_t))SHA1Update,
(void (*)(void *, void *))SHA1Final_little_endian, (void (*)(void *, void *))SHA1Final_little_endian,
&sha1, res, sizeof(res)); &sha1, res, sizeof(res));
} }

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.
* *
@@ -33,14 +33,14 @@
/* $Id$ */ /* $Id$ */
int otp_md4_init (OtpKey key, char *pwd, char *seed); int otp_md4_init (OtpKey key, const char *pwd, const char *seed);
int otp_md4_hash (char *, size_t, unsigned char *res); int otp_md4_hash (const char *, size_t, unsigned char *res);
int otp_md4_next (OtpKey key); int otp_md4_next (OtpKey key);
int otp_md5_init (OtpKey key, char *pwd, char *seed); int otp_md5_init (OtpKey key, const char *pwd, const char *seed);
int otp_md5_hash (char *, size_t, unsigned char *res); int otp_md5_hash (const char *, size_t, unsigned char *res);
int otp_md5_next (OtpKey key); int otp_md5_next (OtpKey key);
int otp_sha_init (OtpKey key, char *pwd, char *seed); int otp_sha_init (OtpKey key, const char *pwd, const char *seed);
int otp_sha_hash (char *, size_t, unsigned char *res); int otp_sha_hash (const char *, size_t, unsigned char *res);
int otp_sha_next (OtpKey key); int otp_sha_next (OtpKey key);