summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_locl.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r--src/lib/libssl/ssl_locl.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index c7ae289a3a..89fb83eb9a 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.137 2016/12/04 14:32:30 jsing Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.138 2016/12/06 13:17:52 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 *
@@ -160,6 +160,8 @@
160#include <openssl/ssl.h> 160#include <openssl/ssl.h>
161#include <openssl/stack.h> 161#include <openssl/stack.h>
162 162
163#include "bytestring.h"
164
163__BEGIN_HIDDEN_DECLS 165__BEGIN_HIDDEN_DECLS
164 166
165#define c2l(c,l) (l = ((unsigned long)(*((c)++))) , \ 167#define c2l(c,l) (l = ((unsigned long)(*((c)++))) , \
@@ -617,7 +619,7 @@ int ssl3_renegotiate_check(SSL *ssl);
617int ssl3_dispatch_alert(SSL *s); 619int ssl3_dispatch_alert(SSL *s);
618int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek); 620int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek);
619int ssl3_write_bytes(SSL *s, int type, const void *buf, int len); 621int ssl3_write_bytes(SSL *s, int type, const void *buf, int len);
620unsigned long ssl3_output_cert_chain(SSL *s, X509 *x); 622int ssl3_output_cert_chain(SSL *s, CBB *cbb, X509 *x);
621SSL_CIPHER *ssl3_choose_cipher(SSL *ssl, STACK_OF(SSL_CIPHER) *clnt, 623SSL_CIPHER *ssl3_choose_cipher(SSL *ssl, STACK_OF(SSL_CIPHER) *clnt,
622 STACK_OF(SSL_CIPHER) *srvr); 624 STACK_OF(SSL_CIPHER) *srvr);
623int ssl3_setup_buffers(SSL *s); 625int ssl3_setup_buffers(SSL *s);
@@ -644,6 +646,9 @@ int ssl3_pending(const SSL *s);
644int ssl3_handshake_msg_hdr_len(SSL *s); 646int ssl3_handshake_msg_hdr_len(SSL *s);
645unsigned char *ssl3_handshake_msg_start(SSL *s, uint8_t htype); 647unsigned char *ssl3_handshake_msg_start(SSL *s, uint8_t htype);
646void ssl3_handshake_msg_finish(SSL *s, unsigned int len); 648void ssl3_handshake_msg_finish(SSL *s, unsigned int len);
649int ssl3_handshake_msg_start_cbb(SSL *s, CBB *handshake, CBB *body,
650 uint8_t msg_type);
651int ssl3_handshake_msg_finish_cbb(SSL *s, CBB *handshake);
647int ssl3_handshake_write(SSL *s); 652int ssl3_handshake_write(SSL *s);
648 653
649void tls1_record_sequence_increment(unsigned char *seq); 654void tls1_record_sequence_increment(unsigned char *seq);