DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

GnuTLS: Use a helper function for hash functions

Browse source 
Use a shared helper function instead of implementing practically same
sequence separately for each hash function.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2017-12-27 23:13:51 +02:00
parent adafbe9e2e
commit cc3e7bfc3c
1 changed files with 13 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/crypto/crypto_gnutls.c
View file

@ -12,24 +12,31 @@
#include "common.h" #include "common.h"
#include "crypto.h" #include "crypto.h"
int md4_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac) static int gnutls_digest_vector(int algo, size_t num_elem,
const u8 *addr[], const size_t *len, u8 *mac)
{ {
gcry_md_hd_t hd; gcry_md_hd_t hd;
unsigned char *p; unsigned char *p;
size_t i; size_t i;
if (gcry_md_open(&hd, GCRY_MD_MD4, 0) != GPG_ERR_NO_ERROR) if (gcry_md_open(&hd, algo, 0) != GPG_ERR_NO_ERROR)
return -1; return -1;
for (i = 0; i < num_elem; i++) for (i = 0; i < num_elem; i++)
gcry_md_write(hd, addr[i], len[i]); gcry_md_write(hd, addr[i], len[i]);
p = gcry_md_read(hd, GCRY_MD_MD4); p = gcry_md_read(hd, algo);
if (p) if (p)
memcpy(mac, p, gcry_md_get_algo_dlen(GCRY_MD_MD4)); memcpy(mac, p, gcry_md_get_algo_dlen(algo));
gcry_md_close(hd); gcry_md_close(hd);
return 0; return 0;
} }
int md4_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
{
return gnutls_digest_vector(GCRY_MD_MD4, num_elem, addr, len, mac);
}
int des_encrypt(const u8 *clear, const u8 *key, u8 *cypher) int des_encrypt(const u8 *clear, const u8 *key, u8 *cypher)
{ {
gcry_cipher_hd_t hd; gcry_cipher_hd_t hd;
@ -55,37 +62,13 @@ int des_encrypt(const u8 *clear, const u8 *key, u8 *cypher)
int md5_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac) int md5_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
{ {
gcry_md_hd_t hd; return gnutls_digest_vector(GCRY_MD_MD5, num_elem, addr, len, mac);
unsigned char *p;
size_t i;
if (gcry_md_open(&hd, GCRY_MD_MD5, 0) != GPG_ERR_NO_ERROR)
return -1;
for (i = 0; i < num_elem; i++)
gcry_md_write(hd, addr[i], len[i]);
p = gcry_md_read(hd, GCRY_MD_MD5);
if (p)
memcpy(mac, p, gcry_md_get_algo_dlen(GCRY_MD_MD5));
gcry_md_close(hd);
return 0;
} }
int sha1_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac) int sha1_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
{ {
gcry_md_hd_t hd; return gnutls_digest_vector(GCRY_MD_SHA1, num_elem, addr, len, mac);
unsigned char *p;
size_t i;
if (gcry_md_open(&hd, GCRY_MD_SHA1, 0) != GPG_ERR_NO_ERROR)
return -1;
for (i = 0; i < num_elem; i++)
gcry_md_write(hd, addr[i], len[i]);
p = gcry_md_read(hd, GCRY_MD_SHA1);
if (p)
memcpy(mac, p, gcry_md_get_algo_dlen(GCRY_MD_SHA1));
gcry_md_close(hd);
return 0;
} }