diff options
author | jsing <> | 2014-05-24 16:06:28 +0000 |
---|---|---|
committer | jsing <> | 2014-05-24 16:06:28 +0000 |
commit | f8d66c98078c32bb4ba6a1c634de09f97f438e28 (patch) | |
tree | 8481e7a43fecd73b7b06d84460a78f0bd65b4f91 /src/lib/libssl/d1_lib.c | |
parent | f58af64a13c833e01a6ff4fce609b64645f00c7b (diff) | |
download | openbsd-f8d66c98078c32bb4ba6a1c634de09f97f438e28.tar.gz openbsd-f8d66c98078c32bb4ba6a1c634de09f97f438e28.tar.bz2 openbsd-f8d66c98078c32bb4ba6a1c634de09f97f438e28.zip |
Use C99 initialisers for SSL3_ENC_METHOD structs.
ok miod@
Diffstat (limited to 'src/lib/libssl/d1_lib.c')
-rw-r--r-- | src/lib/libssl/d1_lib.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/lib/libssl/d1_lib.c b/src/lib/libssl/d1_lib.c index a2500ee0bf..199653624c 100644 --- a/src/lib/libssl/d1_lib.c +++ b/src/lib/libssl/d1_lib.c | |||
@@ -72,18 +72,20 @@ const char dtls1_version_str[]="DTLSv1" OPENSSL_VERSION_PTEXT; | |||
72 | int dtls1_listen(SSL *s, struct sockaddr *client); | 72 | int dtls1_listen(SSL *s, struct sockaddr *client); |
73 | 73 | ||
74 | SSL3_ENC_METHOD DTLSv1_enc_data = { | 74 | SSL3_ENC_METHOD DTLSv1_enc_data = { |
75 | dtls1_enc, | 75 | .enc = dtls1_enc, |
76 | tls1_mac, | 76 | .mac = tls1_mac, |
77 | tls1_setup_key_block, | 77 | .setup_key_block = tls1_setup_key_block, |
78 | tls1_generate_master_secret, | 78 | .generate_master_secret = tls1_generate_master_secret, |
79 | tls1_change_cipher_state, | 79 | .change_cipher_state = tls1_change_cipher_state, |
80 | tls1_final_finish_mac, | 80 | .final_finish_mac = tls1_final_finish_mac, |
81 | TLS1_FINISH_MAC_LENGTH, | 81 | .finish_mac_length = TLS1_FINISH_MAC_LENGTH, |
82 | tls1_cert_verify_mac, | 82 | .cert_verify_mac = tls1_cert_verify_mac, |
83 | TLS_MD_CLIENT_FINISH_CONST, TLS_MD_CLIENT_FINISH_CONST_SIZE, | 83 | .client_finished_label = TLS_MD_CLIENT_FINISH_CONST, |
84 | TLS_MD_SERVER_FINISH_CONST, TLS_MD_SERVER_FINISH_CONST_SIZE, | 84 | .client_finished_label_len = TLS_MD_CLIENT_FINISH_CONST_SIZE, |
85 | tls1_alert_code, | 85 | .server_finished_label = TLS_MD_SERVER_FINISH_CONST, |
86 | tls1_export_keying_material, | 86 | .server_finished_label_len = TLS_MD_SERVER_FINISH_CONST_SIZE, |
87 | .alert_value = tls1_alert_code, | ||
88 | .export_keying_material = tls1_export_keying_material, | ||
87 | }; | 89 | }; |
88 | 90 | ||
89 | long | 91 | long |