summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_both.c
diff options
context:
space:
mode:
authorjsing <>2021-08-30 19:25:43 +0000
committerjsing <>2021-08-30 19:25:43 +0000
commita376b9cd8ffd396f270e597131a83af4f639bd93 (patch)
tree8e3bea79ab1dea102b95252a7e2c36c06522e41d /src/lib/libssl/ssl_both.c
parentcedbde20c0ecfb870c00ce4fe4401f89a9397b6d (diff)
downloadopenbsd-a376b9cd8ffd396f270e597131a83af4f639bd93.tar.gz
openbsd-a376b9cd8ffd396f270e597131a83af4f639bd93.tar.bz2
openbsd-a376b9cd8ffd396f270e597131a83af4f639bd93.zip
Clean up and simplify info and msg callbacks.
The info and msg callbacks result in duplication - both for code that refers to the function pointers and for the call sites. Avoid this by providing typedefs for the function pointers and pulling the calling sequences into their own functions. ok inoguchi@ tb@
Diffstat (limited to 'src/lib/libssl/ssl_both.c')
-rw-r--r--src/lib/libssl/ssl_both.c22
1 files changed, 8 insertions, 14 deletions
diff --git a/src/lib/libssl/ssl_both.c b/src/lib/libssl/ssl_both.c
index 03c5a2f1e9..e4834f23dc 100644
--- a/src/lib/libssl/ssl_both.c
+++ b/src/lib/libssl/ssl_both.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_both.c,v 1.33 2021/07/01 17:53:39 jsing Exp $ */ 1/* $OpenBSD: ssl_both.c,v 1.34 2021/08/30 19:25:43 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 *
@@ -150,10 +150,8 @@ ssl3_do_write(SSL *s, int type)
150 (unsigned char *)&s->internal->init_buf->data[s->internal->init_off], ret); 150 (unsigned char *)&s->internal->init_buf->data[s->internal->init_off], ret);
151 151
152 if (ret == s->internal->init_num) { 152 if (ret == s->internal->init_num) {
153 if (s->internal->msg_callback) 153 ssl_msg_callback(s, 1, type, s->internal->init_buf->data,
154 s->internal->msg_callback(1, s->version, type, s->internal->init_buf->data, 154 (size_t)(s->internal->init_off + s->internal->init_num));
155 (size_t)(s->internal->init_off + s->internal->init_num), s,
156 s->internal->msg_callback_arg);
157 return (1); 155 return (1);
158 } 156 }
159 157
@@ -456,10 +454,8 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
456 s->internal->init_num = 0; 454 s->internal->init_num = 0;
457 skip_message = 1; 455 skip_message = 1;
458 456
459 if (s->internal->msg_callback) 457 ssl_msg_callback(s, 0,
460 s->internal->msg_callback(0, s->version, 458 SSL3_RT_HANDSHAKE, p, 4);
461 SSL3_RT_HANDSHAKE, p, 4, s,
462 s->internal->msg_callback_arg);
463 } 459 }
464 } 460 }
465 } while (skip_message); 461 } while (skip_message);
@@ -516,11 +512,9 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
516 tls1_transcript_record(s, (unsigned char *)s->internal->init_buf->data, 512 tls1_transcript_record(s, (unsigned char *)s->internal->init_buf->data,
517 s->internal->init_num + 4); 513 s->internal->init_num + 4);
518 514
519 if (s->internal->msg_callback) 515 ssl_msg_callback(s, 0, SSL3_RT_HANDSHAKE,
520 s->internal->msg_callback(0, s->version, 516 s->internal->init_buf->data,
521 SSL3_RT_HANDSHAKE, s->internal->init_buf->data, 517 (size_t)s->internal->init_num + 4);
522 (size_t)s->internal->init_num + 4, s,
523 s->internal->msg_callback_arg);
524 } 518 }
525 519
526 *ok = 1; 520 *ok = 1;