jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

TLS: Maintain SHA256-based hash values for TLS v1.2

Browse source 
Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2011-11-27 21:48:34 +02:00
parent ca84eed7ad
commit 20b4cdcd41
2 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/tls/tlsv1_common.c
View file

@ -204,6 +204,19 @@ int tls_verify_hash_init(struct tls_verify_hash *verify)
tls_verify_hash_free(verify); tls_verify_hash_free(verify);
return -1; return -1;
} }
#ifdef CONFIG_TLSV12
verify->sha256_client = crypto_hash_init(CRYPTO_HASH_ALG_SHA256, NULL,
0);
verify->sha256_server = crypto_hash_init(CRYPTO_HASH_ALG_SHA256, NULL,
0);
verify->sha256_cert = crypto_hash_init(CRYPTO_HASH_ALG_SHA256, NULL,
0);
if (verify->sha256_client == NULL || verify->sha256_server == NULL ||
verify->sha256_cert == NULL) {
tls_verify_hash_free(verify);
return -1;
}
#endif /* CONFIG_TLSV12 */
return 0; return 0;
} }
@ -223,6 +236,14 @@ void tls_verify_hash_add(struct tls_verify_hash *verify, const u8 *buf,
crypto_hash_update(verify->md5_cert, buf, len); crypto_hash_update(verify->md5_cert, buf, len);
crypto_hash_update(verify->sha1_cert, buf, len); crypto_hash_update(verify->sha1_cert, buf, len);
} }
#ifdef CONFIG_TLSV12
if (verify->sha256_client)
crypto_hash_update(verify->sha256_client, buf, len);
if (verify->sha256_server)
crypto_hash_update(verify->sha256_server, buf, len);
if (verify->sha256_cert)
crypto_hash_update(verify->sha256_cert, buf, len);
#endif /* CONFIG_TLSV12 */
} }
@ -240,6 +261,14 @@ void tls_verify_hash_free(struct tls_verify_hash *verify)
verify->sha1_client = NULL; verify->sha1_client = NULL;
verify->sha1_server = NULL; verify->sha1_server = NULL;
verify->sha1_cert = NULL; verify->sha1_cert = NULL;
#ifdef CONFIG_TLSV12
crypto_hash_finish(verify->sha256_client, NULL, NULL);
crypto_hash_finish(verify->sha256_server, NULL, NULL);
crypto_hash_finish(verify->sha256_cert, NULL, NULL);
verify->sha256_client = NULL;
verify->sha256_server = NULL;
verify->sha256_cert = NULL;
#endif /* CONFIG_TLSV12 */
} }

3
src/tls/tlsv1_common.h
View file

@ -208,10 +208,13 @@ struct tls_cipher_data {
struct tls_verify_hash { struct tls_verify_hash {
struct crypto_hash *md5_client; struct crypto_hash *md5_client;
struct crypto_hash *sha1_client; struct crypto_hash *sha1_client;
struct crypto_hash *sha256_client;
struct crypto_hash *md5_server; struct crypto_hash *md5_server;
struct crypto_hash *sha1_server; struct crypto_hash *sha1_server;
struct crypto_hash *sha256_server;
struct crypto_hash *md5_cert; struct crypto_hash *md5_cert;
struct crypto_hash *sha1_cert; struct crypto_hash *sha1_cert;
struct crypto_hash *sha256_cert;
}; };