projects
/
mech_eap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated through tag hostap_2_5 from git://w1.fi/hostap.git
[mech_eap.git]
/
libeap
/
src
/
crypto
/
md5.c
diff --git
a/libeap/src/crypto/md5.c
b/libeap/src/crypto/md5.c
index
7f14e9b
..
f64dfd3
100644
(file)
--- a/
libeap/src/crypto/md5.c
+++ b/
libeap/src/crypto/md5.c
@@
-2,14
+2,8
@@
* MD5 hash implementation and interface functions
* Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
* MD5 hash implementation and interface functions
* Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
*/
#include "includes.h"
*/
#include "includes.h"
@@
-36,6
+30,7
@@
int hmac_md5_vector(const u8 *key, size_t key_len, size_t num_elem,
u8 tk[16];
const u8 *_addr[6];
size_t i, _len[6];
u8 tk[16];
const u8 *_addr[6];
size_t i, _len[6];
+ int res;
if (num_elem > 5) {
/*
if (num_elem > 5) {
/*
@@
-91,7
+86,10
@@
int hmac_md5_vector(const u8 *key, size_t key_len, size_t num_elem,
_len[0] = 64;
_addr[1] = mac;
_len[1] = MD5_MAC_LEN;
_len[0] = 64;
_addr[1] = mac;
_len[1] = MD5_MAC_LEN;
- return md5_vector(2, _addr, _len, mac);
+ res = md5_vector(2, _addr, _len, mac);
+ os_memset(k_pad, 0, sizeof(k_pad));
+ os_memset(tk, 0, sizeof(tk));
+ return res;
}
}