Provide tls1_transcript_unfreeze() to avoid the need for manual flags

mangling.

ok tb@

2 files changed, 10 insertions, 3 deletions

diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 8548304d3c..fc2528db16 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.260 2020/02/01 11:38:35 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.261 2020/02/05 16:47:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1313,6 +1313,7 @@ void tls1_transcript_reset(SSL *s);
 int tls1_transcript_append(SSL *s, const unsigned char *buf, size_t len);
 int tls1_transcript_data(SSL *s, const unsigned char **data, size_t *len);
 void tls1_transcript_freeze(SSL *s);
+void tls1_transcript_unfreeze(SSL *s);
 int tls1_transcript_record(SSL *s, const unsigned char *buf, size_t len);
 
 void tls1_cleanup_key_block(SSL *s);
diff --git a/src/lib/libssl/ssl_transcript.c b/src/lib/libssl/ssl_transcript.c
index e94eb8de80..b93004cd17 100644
--- a/src/lib/libssl/ssl_transcript.c
+++ b/src/lib/libssl/ssl_transcript.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_transcript.c,v 1.1 2019/02/09 15:30:52 jsing Exp $ */
+/* $OpenBSD: ssl_transcript.c,v 1.2 2020/02/05 16:47:34 jsing Exp $ */
 /*
  * Copyright (c) 2017 Joel Sing <jsing@openbsd.org>
  *
@@ -142,7 +142,7 @@ tls1_transcript_reset(SSL *s)
          */ 
         (void)BUF_MEM_grow_clean(S3I(s)->handshake_transcript, 0);
 
-        s->s3->flags &= ~TLS1_FLAGS_FREEZE_TRANSCRIPT;
+        tls1_transcript_unfreeze(s);
 }
 
 int
@@ -188,6 +188,12 @@ tls1_transcript_freeze(SSL *s)
         s->s3->flags |= TLS1_FLAGS_FREEZE_TRANSCRIPT;
 }
 
+void
+tls1_transcript_unfreeze(SSL *s)
+{
+        s->s3->flags &= ~TLS1_FLAGS_FREEZE_TRANSCRIPT;
+}
+
 int
 tls1_transcript_record(SSL *s, const unsigned char *buf, size_t len)
 {