1 files changed, 11 insertions, 5 deletions

diff --git a/src/lib/libssl/tls13_record.h b/src/lib/libssl/tls13_record.h
index ca7a63f99c..72350d5d49 100644
--- a/src/lib/libssl/tls13_record.h
+++ b/src/lib/libssl/tls13_record.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls13_record.h,v 1.1 2019/01/19 02:53:54 jsing Exp $ */
+/* $OpenBSD: tls13_record.h,v 1.2 2019/01/20 09:12:05 jsing Exp $ */
 /*
  * Copyright (c) 2019 Joel Sing <jsing@openbsd.org>
  *
@@ -24,7 +24,7 @@
 __BEGIN_HIDDEN_DECLS
 
 /*
- * TLSv1.3 - RFC 8446 section 5.
+ * TLSv1.3 Record Protocol - RFC 8446 section 5.
  *
  * The maximum plaintext is 2^14, however for inner plaintext an additional
  * byte is allowed for the content type. A maximum AEAD overhead of 255-bytes
@@ -36,17 +36,23 @@ __BEGIN_HIDDEN_DECLS
 #define TLS13_RECORD_MAX_PLAINTEXT_LEN          16384
 #define TLS13_RECORD_MAX_INNER_PLAINTEXT_LEN \
         (TLS13_RECORD_MAX_PLAINTEXT_LEN + 1)
-#define TLS13_RECORD_MAX_CIPHERTEXT \
+#define TLS13_RECORD_MAX_CIPHERTEXT_LEN \
         (TLS13_RECORD_MAX_INNER_PLAINTEXT_LEN + TLS13_RECORD_MAX_AEAD_OVERHEAD)
 #define TLS13_RECORD_MAX_LEN \
-        (TLS13_RECORD_HEADER_LEN + TLS13_RECORD_MAX_CIPHERTEXT)
+        (TLS13_RECORD_HEADER_LEN + TLS13_RECORD_MAX_CIPHERTEXT_LEN)
+
+/*
+ * TLSv1.3 Per-Record Nonces and Sequence Numbers - RFC 8446 section 5.3.
+ */
+#define TLS13_RECORD_SEQ_NUM_LEN 8
 
 struct tls13_record *tls13_record_new(void);
 void tls13_record_free(struct tls13_record *_rec);
+int tls13_record_header(struct tls13_record *_rec, CBS *_cbs);
 uint8_t tls13_record_content_type(struct tls13_record *_rec);
 int tls13_record_content(struct tls13_record *_rec, CBS *_cbs);
 void tls13_record_data(struct tls13_record *_rec, CBS *_cbs);
-void tls13_record_set_data(struct tls13_record *_rec, uint8_t *_data,
+int tls13_record_set_data(struct tls13_record *_rec, uint8_t *_data,
     size_t _data_len);
 ssize_t tls13_record_recv(struct tls13_record *_rec, tls13_read_cb _wire_read,
     void *_wire_arg);