diff options
| author | raja-ashok <rashok.svks@gmail.com> | 2019-07-06 21:57:53 +0530 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-08-09 09:36:54 +0100 |
| commit | c8edb04fac976e653ee441fae66842b4a33ad5b6 (patch) | |
| tree | ad8378e905b2ade22db9d908ddf847f93313e144 /crypto/bio/bss_dgram.c | |
| parent | 861335001b99cfd665030c50ad37a663536a5c0f (diff) | |
Restrict usage of bio_dgram_sctp_data only to DGRAM SCTP methods
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9216)
Diffstat (limited to 'crypto/bio/bss_dgram.c')
| -rw-r--r-- | crypto/bio/bss_dgram.c | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c index 941429a398..c52b0f047f 100644 --- a/crypto/bio/bss_dgram.c +++ b/crypto/bio/bss_dgram.c @@ -53,6 +53,8 @@ static int dgram_sctp_puts(BIO *h, const char *str); static long dgram_sctp_ctrl(BIO *h, int cmd, long arg1, void *arg2); static int dgram_sctp_new(BIO *h); static int dgram_sctp_free(BIO *data); +static int dgram_sctp_wait_for_dry(BIO *b); +static int dgram_sctp_msg_waiting(BIO *b); # ifdef SCTP_AUTHENTICATION_EVENT static void dgram_sctp_handle_auth_free_key_event(BIO *b, union sctp_notification *snp); @@ -124,7 +126,7 @@ typedef struct bio_dgram_sctp_data_st { struct bio_dgram_sctp_sndinfo sndinfo; struct bio_dgram_sctp_rcvinfo rcvinfo; struct bio_dgram_sctp_prinfo prinfo; - void (*handle_notifications) (BIO *bio, void *context, void *buf); + BIO_dgram_sctp_notification_handler_fn handle_notifications; void *notification_context; int in_handshake; int ccs_rcvd; @@ -1562,6 +1564,10 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr) else data->save_shutdown = 0; break; + case BIO_CTRL_DGRAM_SCTP_WAIT_FOR_DRY: + return dgram_sctp_wait_for_dry(b); + case BIO_CTRL_DGRAM_SCTP_MSG_WAITING: + return dgram_sctp_msg_waiting(b); default: /* @@ -1574,11 +1580,8 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr) } int BIO_dgram_sctp_notification_cb(BIO *b, - void (*handle_notifications) (BIO *bio, - void - *context, - void *buf), - void *context) + BIO_dgram_sctp_notification_handler_fn handle_notifications, + void *context) { bio_dgram_sctp_data *data = (bio_dgram_sctp_data *) b->ptr; @@ -1606,6 +1609,11 @@ int BIO_dgram_sctp_notification_cb(BIO *b, */ int BIO_dgram_sctp_wait_for_dry(BIO *b) { + return (int)BIO_ctrl(b, BIO_CTRL_DGRAM_SCTP_WAIT_FOR_DRY, 0, NULL); +} + +static int dgram_sctp_wait_for_dry(BIO *b) +{ int is_dry = 0; int sockflags = 0; int n, ret; @@ -1764,6 +1772,11 @@ int BIO_dgram_sctp_wait_for_dry(BIO *b) int BIO_dgram_sctp_msg_waiting(BIO *b) { + return (int)BIO_ctrl(b, BIO_CTRL_DGRAM_SCTP_MSG_WAITING, 0, NULL); +} + +static int dgram_sctp_msg_waiting(BIO *b) +{ int n, sockflags; union sctp_notification snp; struct msghdr msg; |