From f8d66c98078c32bb4ba6a1c634de09f97f438e28 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 24 May 2014 16:06:28 +0000
Subject: Use C99 initialisers for SSL3_ENC_METHOD structs.

ok miod@
---
 src/lib/libssl/s3_lib.c | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'src/lib/libssl/s3_lib.c')

diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index f14cbd0c99..1a0bb5195d 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -2254,20 +2254,22 @@ SSL_CIPHER ssl3_ciphers[] = {
 };
 
 SSL3_ENC_METHOD SSLv3_enc_data = {
-	ssl3_enc,
-	n_ssl3_mac,
-	ssl3_setup_key_block,
-	ssl3_generate_master_secret,
-	ssl3_change_cipher_state,
-	ssl3_final_finish_mac,
-	MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH,
-	ssl3_cert_verify_mac,
-	SSL3_MD_CLIENT_FINISHED_CONST, 4,
-	SSL3_MD_SERVER_FINISHED_CONST, 4,
-	ssl3_alert_code,
-	(int (*)(SSL *, unsigned char *, size_t, const char *,
-	size_t, const unsigned char *, size_t,
-	int use_context))ssl_undefined_function,
+	.enc = ssl3_enc,
+	.mac = n_ssl3_mac,
+	.setup_key_block = ssl3_setup_key_block,
+	.generate_master_secret = ssl3_generate_master_secret,
+	.change_cipher_state = ssl3_change_cipher_state,
+	.final_finish_mac = ssl3_final_finish_mac,
+	.finish_mac_length = MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH,
+	.cert_verify_mac = ssl3_cert_verify_mac,
+	.client_finished_label = SSL3_MD_CLIENT_FINISHED_CONST,
+	.client_finished_label_len = 4,
+	.server_finished_label = SSL3_MD_SERVER_FINISHED_CONST,
+	.server_finished_label_len = 4,
+	.alert_value = ssl3_alert_code,
+	.export_keying_material = (int (*)(SSL *, unsigned char *, size_t,
+	    const char *, size_t, const unsigned char *, size_t,
+	    int use_context))ssl_undefined_function,
 };
 
 long
-- 
cgit v1.2.3-55-g6feb