From cd52acec8587f6530a4434ea78159ce5b4b34bb2 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 27 Nov 2011 21:27:01 +0200 Subject: Rename tls_prf() to tls_prf_sha1_md5() Prepare for multiple TLS PRF functions by renaming the SHA1+MD5 based TLS PRF function to more specific name and add tls_prf() within the internal TLS implementation as a wrapper for this for now. Signed-hostap: Jouni Malinen --- src/tls/tlsv1_common.c | 9 +++++++++ src/tls/tlsv1_common.h | 2 ++ 2 files changed, 11 insertions(+) (limited to 'src/tls') diff --git a/src/tls/tlsv1_common.c b/src/tls/tlsv1_common.c index 67b56df..326ff70 100644 --- a/src/tls/tlsv1_common.c +++ b/src/tls/tlsv1_common.c @@ -15,6 +15,7 @@ #include "includes.h" #include "common.h" +#include "crypto/sha1.h" #include "x509v3.h" #include "tlsv1_common.h" @@ -265,3 +266,11 @@ const char * tls_version_str(u16 ver) return "?"; } + + +int tls_prf(const u8 *secret, size_t secret_len, const char *label, + const u8 *seed, size_t seed_len, u8 *out, size_t outlen) +{ + return tls_prf_sha1_md5(secret, secret_len, label, seed, seed_len, out, + outlen); +} diff --git a/src/tls/tlsv1_common.h b/src/tls/tlsv1_common.h index 0c4f7df..d13dacd 100644 --- a/src/tls/tlsv1_common.h +++ b/src/tls/tlsv1_common.h @@ -220,5 +220,7 @@ void tls_verify_hash_add(struct tls_verify_hash *verify, const u8 *buf, void tls_verify_hash_free(struct tls_verify_hash *verify); int tls_version_ok(u16 ver); const char * tls_version_str(u16 ver); +int tls_prf(const u8 *secret, size_t secret_len, const char *label, + const u8 *seed, size_t seed_len, u8 *out, size_t outlen); #endif /* TLSV1_COMMON_H */ -- cgit v1.1