Bye bye S3I.

S3I has served us well, however now that libssl is fully opaque it is time
to say goodbye. Aside from removing the calloc/free/memset, the rest is
mechanical sed.

ok inoguchi@ tb@

1 files changed, 9 insertions, 9 deletions

diff --git a/lib/libssl/tls12_lib.c b/lib/libssl/tls12_lib.c
index f30f3a7b463..773ba30bd07 100644
--- a/lib/libssl/tls12_lib.c
+++ b/lib/libssl/tls12_lib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tls12_lib.c,v 1.3 2021/05/02 15:57:29 jsing Exp $ */
+/*	$OpenBSD: tls12_lib.c,v 1.4 2022/02/05 14:54:10 jsing Exp $ */
 /*
  * Copyright (c) 2021 Joel Sing <jsing@openbsd.org>
  *
@@ -71,12 +71,12 @@ tls12_derive_finished(SSL *s)
 {
 	if (!s->server) {
 		return tls12_client_finished_verify_data(s,
-		    S3I(s)->hs.finished, sizeof(S3I(s)->hs.finished),
-		    &S3I(s)->hs.finished_len);
+		    s->s3->hs.finished, sizeof(s->s3->hs.finished),
+		    &s->s3->hs.finished_len);
 	} else {
 		return tls12_server_finished_verify_data(s,
-		    S3I(s)->hs.finished, sizeof(S3I(s)->hs.finished),
-		    &S3I(s)->hs.finished_len);
+		    s->s3->hs.finished, sizeof(s->s3->hs.finished),
+		    &s->s3->hs.finished_len);
 	}
 }
 
@@ -85,12 +85,12 @@ tls12_derive_peer_finished(SSL *s)
 {
 	if (s->server) {
 		return tls12_client_finished_verify_data(s,
-		    S3I(s)->hs.peer_finished, sizeof(S3I(s)->hs.peer_finished),
-		    &S3I(s)->hs.peer_finished_len);
+		    s->s3->hs.peer_finished, sizeof(s->s3->hs.peer_finished),
+		    &s->s3->hs.peer_finished_len);
 	} else {
 		return tls12_server_finished_verify_data(s,
-		    S3I(s)->hs.peer_finished, sizeof(S3I(s)->hs.peer_finished),
-		    &S3I(s)->hs.peer_finished_len);
+		    s->s3->hs.peer_finished, sizeof(s->s3->hs.peer_finished),
+		    &s->s3->hs.peer_finished_len);
 	}
 }