diff options
| author | Jouni Malinen <j@w1.fi> | 2011-11-27 21:27:01 +0200 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2011-11-27 21:27:01 +0200 |
| commit | cd52acec8587f6530a4434ea78159ce5b4b34bb2 (patch) | |
| tree | 7d930921a74dedcf07ea1b006617f6a2ae3db083 /src/crypto | |
| parent | ebe4e8f814456bc74534d7c99e1dd6b184b79858 (diff) | |
| download | external_wpa_supplicant_8_ti-cd52acec8587f6530a4434ea78159ce5b4b34bb2.zip external_wpa_supplicant_8_ti-cd52acec8587f6530a4434ea78159ce5b4b34bb2.tar.gz external_wpa_supplicant_8_ti-cd52acec8587f6530a4434ea78159ce5b4b34bb2.tar.bz2 | |
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 <j@w1.fi>
Diffstat (limited to 'src/crypto')
| -rw-r--r-- | src/crypto/sha1-tlsprf.c | 6 | ||||
| -rw-r--r-- | src/crypto/sha1.h | 6 | ||||
| -rw-r--r-- | src/crypto/tls.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/crypto/sha1-tlsprf.c b/src/crypto/sha1-tlsprf.c index 04f614c..f98fd65 100644 --- a/src/crypto/sha1-tlsprf.c +++ b/src/crypto/sha1-tlsprf.c @@ -20,7 +20,7 @@ /** - * tls_prf - Pseudo-Random Function for TLS (TLS-PRF, RFC 2246) + * tls_prf_sha1_md5 - Pseudo-Random Function for TLS (TLS-PRF, RFC 2246) * @secret: Key for PRF * @secret_len: Length of the key in bytes * @label: A unique label for each purpose of the PRF @@ -33,8 +33,8 @@ * This function is used to derive new, cryptographically separate keys from a * given key in TLS. This PRF is defined in RFC 2246, Chapter 5. */ -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) +int tls_prf_sha1_md5(const u8 *secret, size_t secret_len, const char *label, + const u8 *seed, size_t seed_len, u8 *out, size_t outlen) { size_t L_S1, L_S2, i; const u8 *S1, *S2; diff --git a/src/crypto/sha1.h b/src/crypto/sha1.h index c1a6233..f0c1a5f 100644 --- a/src/crypto/sha1.h +++ b/src/crypto/sha1.h @@ -25,9 +25,9 @@ int sha1_prf(const u8 *key, size_t key_len, const char *label, const u8 *data, size_t data_len, u8 *buf, size_t buf_len); int sha1_t_prf(const u8 *key, size_t key_len, const char *label, const u8 *seed, size_t seed_len, u8 *buf, size_t buf_len); -int __must_check tls_prf(const u8 *secret, size_t secret_len, - const char *label, const u8 *seed, size_t seed_len, - u8 *out, size_t outlen); +int __must_check tls_prf_sha1_md5(const u8 *secret, size_t secret_len, + const char *label, const u8 *seed, + size_t seed_len, u8 *out, size_t outlen); int pbkdf2_sha1(const char *passphrase, const char *ssid, size_t ssid_len, int iterations, u8 *buf, size_t buflen); #endif /* SHA1_H */ diff --git a/src/crypto/tls.h b/src/crypto/tls.h index 0761266..d9d88cb 100644 --- a/src/crypto/tls.h +++ b/src/crypto/tls.h @@ -305,7 +305,7 @@ int __must_check tls_connection_get_keys(void *tls_ctx, * not exported from the TLS library, tls_connection_prf() is required so that * further keying material can be derived from the master secret. If not * implemented, the function will still need to be defined, but it can just - * return -1. Example implementation of this function is in tls_prf() function + * return -1. Example implementation of this function is in tls_prf_sha1_md5() * when it is called with seed set to client_random|server_random (or * server_random|client_random). */ |