diff options
author | jsing <> | 2017-10-08 16:24:02 +0000 |
---|---|---|
committer | jsing <> | 2017-10-08 16:24:02 +0000 |
commit | 759dd02e3ff981ea9d2869cfe079c8f201eba19d (patch) | |
tree | 3353b68b503515d359d87d0e023b6b9bc1e1453c /src/lib/libssl/ssl_locl.h | |
parent | a5b4d2c04b558a0cdaf1eaacb3f83fcc27e23de7 (diff) | |
download | openbsd-759dd02e3ff981ea9d2869cfe079c8f201eba19d.tar.gz openbsd-759dd02e3ff981ea9d2869cfe079c8f201eba19d.tar.bz2 openbsd-759dd02e3ff981ea9d2869cfe079c8f201eba19d.zip |
Convert ssl3_send_change_cipher_spec() to use CBB and make it handle DTLS,
which allows us to drop dtls1_send_change_cipher_spec() entirely.
ok inoguchi@
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 17a4a0d4f6..2fec36fba9 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.193 2017/08/28 16:37:04 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.194 2017/10/08 16:24:02 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1147,6 +1147,7 @@ int ssl3_handshake_msg_start_cbb(SSL *s, CBB *handshake, CBB *body, | |||
1147 | uint8_t msg_type); | 1147 | uint8_t msg_type); |
1148 | int ssl3_handshake_msg_finish_cbb(SSL *s, CBB *handshake); | 1148 | int ssl3_handshake_msg_finish_cbb(SSL *s, CBB *handshake); |
1149 | int ssl3_handshake_write(SSL *s); | 1149 | int ssl3_handshake_write(SSL *s); |
1150 | int ssl3_record_write(SSL *s, int type); | ||
1150 | 1151 | ||
1151 | void tls1_record_sequence_increment(unsigned char *seq); | 1152 | void tls1_record_sequence_increment(unsigned char *seq); |
1152 | int ssl3_do_change_cipher_spec(SSL *ssl); | 1153 | int ssl3_do_change_cipher_spec(SSL *ssl); |
@@ -1166,12 +1167,13 @@ int ssl3_write_pending(SSL *s, int type, const unsigned char *buf, | |||
1166 | unsigned int len); | 1167 | unsigned int len); |
1167 | void dtls1_set_message_header(SSL *s, unsigned char mt, unsigned long len, | 1168 | void dtls1_set_message_header(SSL *s, unsigned char mt, unsigned long len, |
1168 | unsigned long frag_off, unsigned long frag_len); | 1169 | unsigned long frag_off, unsigned long frag_len); |
1170 | void dtls1_set_message_header_int(SSL *s, unsigned char mt, | ||
1171 | unsigned long len, unsigned short seq_num, unsigned long frag_off, | ||
1172 | unsigned long frag_len); | ||
1169 | 1173 | ||
1170 | int dtls1_write_app_data_bytes(SSL *s, int type, const void *buf, int len); | 1174 | int dtls1_write_app_data_bytes(SSL *s, int type, const void *buf, int len); |
1171 | int dtls1_write_bytes(SSL *s, int type, const void *buf, int len); | 1175 | int dtls1_write_bytes(SSL *s, int type, const void *buf, int len); |
1172 | 1176 | ||
1173 | int dtls1_send_change_cipher_spec(SSL *s, int a, int b); | ||
1174 | unsigned long dtls1_output_cert_chain(SSL *s, X509 *x); | ||
1175 | int dtls1_read_failed(SSL *s, int code); | 1177 | int dtls1_read_failed(SSL *s, int code); |
1176 | int dtls1_buffer_message(SSL *s, int ccs); | 1178 | int dtls1_buffer_message(SSL *s, int ccs); |
1177 | int dtls1_retransmit_message(SSL *s, unsigned short seq, | 1179 | int dtls1_retransmit_message(SSL *s, unsigned short seq, |