From 49ecee098d062b92fcf095e05e15779c32899646 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 24 Jan 2017 16:00:54 +0100 Subject: tls: add 2nd cipher_id, TLS_RSA_WITH_AES_128_CBC_SHA, so far it doesn't work Good news that TLS_RSA_WITH_AES_256_CBC_SHA256 still works with new code ;) This change adds inevitable extension to have different sized hashes and AES key sizes. In libbb, md5_end() and shaX_end() are extended to return result size instead of void - this helps *a lot* in tls (the cost is ~5 bytes per _end() function). Signed-off-by: Denys Vlasenko --- libbb/hash_md5prime.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libbb/hash_md5prime.c') diff --git a/libbb/hash_md5prime.c b/libbb/hash_md5prime.c index e089a15f5..4b58d37ff 100644 --- a/libbb/hash_md5prime.c +++ b/libbb/hash_md5prime.c @@ -437,7 +437,7 @@ void FAST_FUNC md5_hash(const void *buffer, size_t inputLen, md5_ctx_t *context) * MD5 finalization. Ends an MD5 message-digest operation, * writing the message digest. */ -void FAST_FUNC md5_end(void *digest, md5_ctx_t *context) +unsigned FAST_FUNC md5_end(void *digest, md5_ctx_t *context) { unsigned idx, padLen; unsigned char bits[8]; @@ -457,4 +457,5 @@ void FAST_FUNC md5_end(void *digest, md5_ctx_t *context) /* Store state in digest */ memcpy32_cpu2le(digest, context->state, 16); + return 16; } -- cgit v1.2.3