summaryrefslogtreecommitdiffstats
path: root/lib/libssl/d1_lib.c
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2014-05-24 16:06:28 +0000
committerjsing <jsing@openbsd.org>2014-05-24 16:06:28 +0000
commit03e4e561cfb71e1a89df41c64ba5d69c7e75650a (patch)
tree4b89bccc6d0ab36289b73432e82ef37e05b9736c /lib/libssl/d1_lib.c
parentRemove the _shadow_ indirection, which is unnecessary in a world without (diff)
downloadwireguard-openbsd-03e4e561cfb71e1a89df41c64ba5d69c7e75650a.tar.xz
wireguard-openbsd-03e4e561cfb71e1a89df41c64ba5d69c7e75650a.zip
Use C99 initialisers for SSL3_ENC_METHOD structs.
ok miod@
Diffstat (limited to 'lib/libssl/d1_lib.c')
-rw-r--r--lib/libssl/d1_lib.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/lib/libssl/d1_lib.c b/lib/libssl/d1_lib.c
index a2500ee0bf9..199653624c4 100644
--- a/lib/libssl/d1_lib.c
+++ b/lib/libssl/d1_lib.c
@@ -72,18 +72,20 @@ const char dtls1_version_str[]="DTLSv1" OPENSSL_VERSION_PTEXT;
int dtls1_listen(SSL *s, struct sockaddr *client);
SSL3_ENC_METHOD DTLSv1_enc_data = {
- dtls1_enc,
- tls1_mac,
- tls1_setup_key_block,
- tls1_generate_master_secret,
- tls1_change_cipher_state,
- tls1_final_finish_mac,
- TLS1_FINISH_MAC_LENGTH,
- tls1_cert_verify_mac,
- TLS_MD_CLIENT_FINISH_CONST, TLS_MD_CLIENT_FINISH_CONST_SIZE,
- TLS_MD_SERVER_FINISH_CONST, TLS_MD_SERVER_FINISH_CONST_SIZE,
- tls1_alert_code,
- tls1_export_keying_material,
+ .enc = dtls1_enc,
+ .mac = tls1_mac,
+ .setup_key_block = tls1_setup_key_block,
+ .generate_master_secret = tls1_generate_master_secret,
+ .change_cipher_state = tls1_change_cipher_state,
+ .final_finish_mac = tls1_final_finish_mac,
+ .finish_mac_length = TLS1_FINISH_MAC_LENGTH,
+ .cert_verify_mac = tls1_cert_verify_mac,
+ .client_finished_label = TLS_MD_CLIENT_FINISH_CONST,
+ .client_finished_label_len = TLS_MD_CLIENT_FINISH_CONST_SIZE,
+ .server_finished_label = TLS_MD_SERVER_FINISH_CONST,
+ .server_finished_label_len = TLS_MD_SERVER_FINISH_CONST_SIZE,
+ .alert_value = tls1_alert_code,
+ .export_keying_material = tls1_export_keying_material,
};
long