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

Does function typecasts instead of void * type-casts.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18592 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-10-19 11:17:31 +00:00
parent f8bf18b7cc
commit 3cd9ba21de
1 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
lib/des/evp.c
View File

@@ -17,14 +17,19 @@
#include <md4.h> #include <md4.h>
#include <md5.h> #include <md5.h>
typedef int (*evp_md_init)(EVP_MD_CTX *);
typedef int (*evp_md_update)(EVP_MD_CTX *,const void *, size_t);
typedef int (*evp_md_final)(void *, EVP_MD_CTX *);
typedef int (*evp_md_cleanup)(EVP_MD_CTX *);
struct hc_evp_md { struct hc_evp_md {
int hash_size; int hash_size;
int block_size; int block_size;
int ctx_size; int ctx_size;
int (*init)(EVP_MD_CTX *); evp_md_init init;
int (*update)(EVP_MD_CTX *,const void *, size_t ); evp_md_update update;
int (*final)(void *, EVP_MD_CTX *); evp_md_final final;
int (*cleanup)(EVP_MD_CTX *); evp_md_cleanup cleanup;
}; };
/* /*
@@ -151,19 +156,18 @@ EVP_Digest(const void *data, size_t dsize, void *hash, unsigned int *hsize,
* *
*/ */
static const struct hc_evp_md sha256 = {
32,
64,
sizeof(SHA256_CTX),
(void *)SHA256_Init,
(void *)SHA256_Update,
(void *)SHA256_Final,
NULL
};
const EVP_MD * const EVP_MD *
EVP_sha256(void) EVP_sha256(void)
{ {
static const struct hc_evp_md sha256 = {
32,
64,
sizeof(SHA256_CTX),
(evp_md_init)SHA256_Init,
(evp_md_update)SHA256_Update,
(evp_md_final)SHA256_Final,
NULL
};
return &sha256; return &sha256;
} }
@@ -171,9 +175,9 @@ static const struct hc_evp_md sha1 = {
20, 20,
64, 64,
sizeof(SHA_CTX), sizeof(SHA_CTX),
(void *)SHA1_Init, (evp_md_init)SHA1_Init,
(void *)SHA1_Update, (evp_md_update)SHA1_Update,
(void *)SHA1_Final, (evp_md_final)SHA1_Final,
NULL NULL
}; };
@@ -196,9 +200,9 @@ EVP_md5(void)
16, 16,
64, 64,
sizeof(MD5_CTX), sizeof(MD5_CTX),
(void *)MD5_Init, (evp_md_init)MD5_Init,
(void *)MD5_Update, (evp_md_update)MD5_Update,
(void *)MD5_Final, (evp_md_final)MD5_Final,
NULL NULL
}; };
return &md5; return &md5;
@@ -211,9 +215,9 @@ EVP_md4(void)
16, 16,
64, 64,
sizeof(MD4_CTX), sizeof(MD4_CTX),
(void *)MD4_Init, (evp_md_init)MD4_Init,
(void *)MD4_Update, (evp_md_update)MD4_Update,
(void *)MD4_Final, (evp_md_final)MD4_Final,
NULL NULL
}; };
return &md4; return &md4;
@@ -226,9 +230,9 @@ EVP_md2(void)
16, 16,
16, 16,
sizeof(MD2_CTX), sizeof(MD2_CTX),
(void *)MD2_Init, (evp_md_init)MD2_Init,
(void *)MD2_Update, (evp_md_update)MD2_Update,
(void *)MD2_Final, (evp_md_final)MD2_Final,
NULL NULL
}; };
return &md2; return &md2;
@@ -258,9 +262,9 @@ EVP_md_null(void)
0, 0,
0, 0,
0, 0,
(void *)null_Init, (evp_md_init)null_Init,
(void *)null_Update, (evp_md_update)null_Update,
(void *)null_Final, (evp_md_final)null_Final,
NULL NULL
}; };
return &null; return &null;