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/t1_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/t1_lib.c')
-rw-r--r-- | src/lib/libssl/t1_lib.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c index 63537888ae..0ea9ce752d 100644 --- a/src/lib/libssl/t1_lib.c +++ b/src/lib/libssl/t1_lib.c | |||
@@ -126,18 +126,20 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *tick, int ticklen, | |||
126 | #endif | 126 | #endif |
127 | 127 | ||
128 | SSL3_ENC_METHOD TLSv1_enc_data = { | 128 | SSL3_ENC_METHOD TLSv1_enc_data = { |
129 | tls1_enc, | 129 | .enc = tls1_enc, |
130 | tls1_mac, | 130 | .mac = tls1_mac, |
131 | tls1_setup_key_block, | 131 | .setup_key_block = tls1_setup_key_block, |
132 | tls1_generate_master_secret, | 132 | .generate_master_secret = tls1_generate_master_secret, |
133 | tls1_change_cipher_state, | 133 | .change_cipher_state = tls1_change_cipher_state, |
134 | tls1_final_finish_mac, | 134 | .final_finish_mac = tls1_final_finish_mac, |
135 | TLS1_FINISH_MAC_LENGTH, | 135 | .finish_mac_length = TLS1_FINISH_MAC_LENGTH, |
136 | tls1_cert_verify_mac, | 136 | .cert_verify_mac = tls1_cert_verify_mac, |
137 | TLS_MD_CLIENT_FINISH_CONST, TLS_MD_CLIENT_FINISH_CONST_SIZE, | 137 | .client_finished_label = TLS_MD_CLIENT_FINISH_CONST, |
138 | TLS_MD_SERVER_FINISH_CONST, TLS_MD_SERVER_FINISH_CONST_SIZE, | 138 | .client_finished_label_len = TLS_MD_CLIENT_FINISH_CONST_SIZE, |
139 | tls1_alert_code, | 139 | .server_finished_label = TLS_MD_SERVER_FINISH_CONST, |
140 | tls1_export_keying_material, | 140 | .server_finished_label_len = TLS_MD_SERVER_FINISH_CONST_SIZE, |
141 | .alert_value = tls1_alert_code, | ||
142 | .export_keying_material = tls1_export_keying_material, | ||
141 | }; | 143 | }; |
142 | 144 | ||
143 | long | 145 | long |