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

Move uuid_gen_mac_addr() from uuid.c into src/wps

Browse source 
This removes the only src/crypto dependency from src/utils files.
This commit is contained in:
Jouni Malinen 2009-11-29 13:15:32 +02:00
parent 197ef6abef
commit 120158cc8b
4 changed files with 31 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/utils/uuid.c
View file

@ -15,8 +15,6 @@
#include "includes.h"
#include "common.h"
#include "crypto.h"
#include "sha1.h"
#include "uuid.h"
int uuid_str2bin(const char *str, u8 *bin)
@ -77,31 +75,3 @@ int is_nil_uuid(const u8 *uuid)
return 0;
return 1;
}
void uuid_gen_mac_addr(const u8 *mac_addr, u8 *uuid)
{
const u8 *addr[2];
size_t len[2];
u8 hash[SHA1_MAC_LEN];
u8 nsid[16] = {
0x52, 0x64, 0x80, 0xf8,
0xc9, 0x9b,
0x4b, 0xe5,
0xa6, 0x55,
0x58, 0xed, 0x5f, 0x5d, 0x60, 0x84
};
addr[0] = nsid;
len[0] = sizeof(nsid);
addr[1] = mac_addr;
len[1] = 6;
sha1_vector(2, addr, len, hash);
os_memcpy(uuid, hash, 16);
/* Version: 5 = named-based version using SHA-1 */
uuid[6] = (5 << 4) | (uuid[6] & 0x0f);
/* Variant specified in RFC 4122 */
uuid[8] = 0x80 | (uuid[8] & 0x3f);
}

1
src/utils/uuid.h
View file

@ -20,6 +20,5 @@
int uuid_str2bin(const char *str, u8 *bin);
int uuid_bin2str(const u8 *bin, char *str, size_t max_len);
int is_nil_uuid(const u8 *uuid);
void uuid_gen_mac_addr(const u8 *mac_addr, u8 *uuid);
#endif /* UUID_H */