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

switch to use EVP interface instead of old MDX_ style interface

Browse Source
This commit is contained in:
Love Hornquist Astrand
2009-08-16 18:28:40 +02:00
parent 9b138fdec4
commit c45ecc94bf
1 changed files with 106 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

192
lib/otp/otp_md.c
View File

@@ -31,10 +31,8 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
RCSID("$Id$");
#endif
#include "otp_locl.h" #include "otp_locl.h"
#include "otp_md.h" #include "otp_md.h"
@@ -61,32 +59,31 @@ compressmd (OtpKey key, unsigned char *md, size_t len)
} }
} }
#ifdef HAVE_OLD_HASH_NAMES /*
static void * For histerical reasons, in the OTP definition it's said that
otp_md4_final (void *res, struct md4 *m) * the result from SHA must be stored in little-endian order. See
{ * draft-ietf-otp-01.txt.
MD4_Final(res, m); */
}
#undef MD4_Final
#define MD4_Final otp_md4_final
static void static void
otp_md5_final (void *res, struct md5 *m) little_endian(unsigned char *res, size_t len)
{ {
MD5_Final(res, m); unsigned char t;
size_t i;
for (i = 0; i < len; i += 4) {
t = res[i + 0]; res[i + 0] = res[i + 3]; res[i + 3] = t;
t = res[i + 1]; res[i + 1] = res[i + 2]; res[i + 2] = t;
}
} }
#undef MD5_Final
#define MD5_Final otp_md5_final
#endif
static int static int
otp_md_init (OtpKey key, otp_md_init (OtpKey key,
const char *pwd, const char *pwd,
const char *seed, const char *seed,
void (*init)(void *), const EVP_MD *md,
void (*update)(void *, const void *, size_t), int le,
void (*final)(void *, void *), EVP_MD_CTX *arg,
void *arg,
unsigned char *res, unsigned char *res,
size_t ressz) size_t ressz)
{ {
@@ -100,9 +97,14 @@ otp_md_init (OtpKey key,
strlcpy (p, seed, len + 1); strlcpy (p, seed, len + 1);
strlwr (p); strlwr (p);
strlcat (p, pwd, len + 1); strlcat (p, pwd, len + 1);
(*init)(arg);
(*update)(arg, p, len); EVP_DigestInit_ex(arg, md, NULL);
(*final)(res, arg); EVP_DigestUpdate(arg, p, len);
EVP_DigestFinal_ex(arg, res, NULL);
if (le)
little_endian(res, ressz);
free (p); free (p);
compressmd (key, res, ressz); compressmd (key, res, ressz);
return 0; return 0;
@@ -110,16 +112,19 @@ otp_md_init (OtpKey key,
static int static int
otp_md_next (OtpKey key, otp_md_next (OtpKey key,
void (*init)(void *), const EVP_MD *md,
void (*update)(void *, const void *, size_t), int le,
void (*final)(void *, void *), EVP_MD_CTX *arg,
void *arg,
unsigned char *res, unsigned char *res,
size_t ressz) size_t ressz)
{ {
(*init)(arg); EVP_DigestInit_ex(arg, md, NULL);
(*update)(arg, key, OTPKEYSIZE); EVP_DigestUpdate(arg, key, OTPKEYSIZE);
(*final)(res, arg); EVP_DigestFinal_ex(arg, res, NULL);
if (le)
little_endian(res, ressz);
compressmd (key, res, ressz); compressmd (key, res, ressz);
return 0; return 0;
} }
@@ -127,16 +132,19 @@ otp_md_next (OtpKey key,
static int static int
otp_md_hash (const char *data, otp_md_hash (const char *data,
size_t len, size_t len,
void (*init)(void *), const EVP_MD *md,
void (*update)(void *, const void *, size_t), int le,
void (*final)(void *, void *), EVP_MD_CTX *arg,
void *arg,
unsigned char *res, unsigned char *res,
size_t ressz) size_t ressz)
{ {
(*init)(arg); EVP_DigestInit_ex(arg, md, NULL);
(*update)(arg, data, len); EVP_DigestUpdate(arg, data, len);
(*final)(res, arg); EVP_DigestFinal_ex(arg, res, NULL);
if (le)
little_endian(res, ressz);
return 0; return 0;
} }
@@ -144,13 +152,11 @@ int
otp_md4_init (OtpKey key, const char *pwd, const char *seed) otp_md4_init (OtpKey key, const char *pwd, const char *seed)
{ {
unsigned char res[16]; unsigned char res[16];
MD4_CTX md4; EVP_MD_CTX ctx;
return otp_md_init (key, pwd, seed, EVP_MD_CTX_init(&ctx);
(void (*)(void *))MD4_Init,
(void (*)(void *, const void *, size_t))MD4_Update, return otp_md_init (key, pwd, seed, EVP_md4(), 0, &ctx, res, sizeof(res));
(void (*)(void *, void *))MD4_Final,
&md4, res, sizeof(res));
} }
int int
@@ -158,26 +164,22 @@ otp_md4_hash (const char *data,
size_t len, size_t len,
unsigned char *res) unsigned char *res)
{ {
MD4_CTX md4; EVP_MD_CTX ctx;
return otp_md_hash (data, len, EVP_MD_CTX_init(&ctx);
(void (*)(void *))MD4_Init,
(void (*)(void *, const void *, size_t))MD4_Update, return otp_md_hash (data, len, EVP_md4(), 0, &ctx, res, 16);
(void (*)(void *, void *))MD4_Final,
&md4, res, 16);
} }
int int
otp_md4_next (OtpKey key) otp_md4_next (OtpKey key)
{ {
unsigned char res[16]; unsigned char res[16];
MD4_CTX md4; EVP_MD_CTX ctx;
return otp_md_next (key, EVP_MD_CTX_init(&ctx);
(void (*)(void *))MD4_Init,
(void (*)(void *, const void *, size_t))MD4_Update, return otp_md_next (key, EVP_md4(), 0, &ctx, res, sizeof(res));
(void (*)(void *, void *))MD4_Final,
&md4, res, sizeof(res));
} }
@@ -185,13 +187,11 @@ int
otp_md5_init (OtpKey key, const char *pwd, const char *seed) otp_md5_init (OtpKey key, const char *pwd, const char *seed)
{ {
unsigned char res[16]; unsigned char res[16];
MD5_CTX md5; EVP_MD_CTX ctx;
return otp_md_init (key, pwd, seed, EVP_MD_CTX_init(&ctx);
(void (*)(void *))MD5_Init,
(void (*)(void *, const void *, size_t))MD5_Update, return otp_md_init (key, pwd, seed, EVP_md5(), 0, &ctx, res, sizeof(res));
(void (*)(void *, void *))MD5_Final,
&md5, res, sizeof(res));
} }
int int
@@ -199,61 +199,33 @@ otp_md5_hash (const char *data,
size_t len, size_t len,
unsigned char *res) unsigned char *res)
{ {
MD5_CTX md5; EVP_MD_CTX ctx;
return otp_md_hash (data, len, EVP_MD_CTX_init(&ctx);
(void (*)(void *))MD5_Init,
(void (*)(void *, const void *, size_t))MD5_Update, return otp_md_hash (data, len, EVP_md5(), 0, &ctx, res, 16);
(void (*)(void *, void *))MD5_Final,
&md5, res, 16);
} }
int int
otp_md5_next (OtpKey key) otp_md5_next (OtpKey key)
{ {
unsigned char res[16]; unsigned char res[16];
MD5_CTX md5; EVP_MD_CTX ctx;
return otp_md_next (key, EVP_MD_CTX_init(&ctx);
(void (*)(void *))MD5_Init,
(void (*)(void *, const void *, size_t))MD5_Update,
(void (*)(void *, void *))MD5_Final,
&md5, res, sizeof(res));
}
/* return otp_md_next (key, EVP_md5(), 0, &ctx, res, sizeof(res));
* For histerical reasons, in the OTP definition it's said that the
* result from SHA must be stored in little-endian order. See
* draft-ietf-otp-01.txt.
*/
static void
SHA1_Final_little_endian (void *res, SHA_CTX *m)
{
unsigned char tmp[20];
unsigned char *p = res;
int j;
SHA1_Final (tmp, m);
for (j = 0; j < 20; j += 4) {
p[j] = tmp[j+3];
p[j+1] = tmp[j+2];
p[j+2] = tmp[j+1];
p[j+3] = tmp[j];
}
} }
int int
otp_sha_init (OtpKey key, const char *pwd, const char *seed) otp_sha_init (OtpKey key, const char *pwd, const char *seed)
{ {
unsigned char res[20]; unsigned char res[20];
SHA_CTX sha1; EVP_MD_CTX ctx;
return otp_md_init (key, pwd, seed, EVP_MD_CTX_init(&ctx);
(void (*)(void *))SHA1_Init,
(void (*)(void *, const void *, size_t))SHA1_Update, return otp_md_init (key, pwd, seed, EVP_sha1(), 1, &ctx, res, sizeof(res));
(void (*)(void *, void *))SHA1_Final_little_endian,
&sha1, res, sizeof(res));
} }
int int
@@ -261,24 +233,20 @@ otp_sha_hash (const char *data,
size_t len, size_t len,
unsigned char *res) unsigned char *res)
{ {
SHA_CTX sha1; EVP_MD_CTX ctx;
return otp_md_hash (data, len, EVP_MD_CTX_init(&ctx);
(void (*)(void *))SHA1_Init,
(void (*)(void *, const void *, size_t))SHA1_Update, return otp_md_hash (data, len, EVP_sha1(), 1, &ctx, res, 20);
(void (*)(void *, void *))SHA1_Final_little_endian,
&sha1, res, 20);
} }
int int
otp_sha_next (OtpKey key) otp_sha_next (OtpKey key)
{ {
unsigned char res[20]; unsigned char res[20];
SHA_CTX sha1; EVP_MD_CTX ctx;
return otp_md_next (key, EVP_MD_CTX_init(&ctx);
(void (*)(void *))SHA1_Init,
(void (*)(void *, const void *, size_t))SHA1_Update, return otp_md_next (key, EVP_sha1(), 1, &ctx, res, sizeof(res));
(void (*)(void *, void *))SHA1_Final_little_endian,
&sha1, res, sizeof(res));
} }