diff options
| author | Hugo Landau <hlandau@openssl.org> | 2022-05-09 14:24:33 +0100 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2022-09-01 18:03:10 +1000 |
| commit | 664e096cf94b1a2f72b3c562dd93db7e13b235f4 (patch) | |
| tree | 183f11e10fc8ae21db007f0e45f5cd0effba9737 /include | |
| parent | 3f42f41ad19c631287386fd8d58f9e02466c5e3f (diff) | |
BIO_dgram support for BIO_sendmmsg/BIO_recvmmsg
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18270)
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/bioerr.h | 2 | ||||
| -rw-r--r-- | include/internal/sockets.h | 7 | ||||
| -rw-r--r-- | include/openssl/bioerr.h | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/include/crypto/bioerr.h b/include/crypto/bioerr.h index a0c06099f7..e38b981ab5 100644 --- a/include/crypto/bioerr.h +++ b/include/crypto/bioerr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/include/internal/sockets.h b/include/internal/sockets.h index bc1de716df..d1bd283009 100644 --- a/include/internal/sockets.h +++ b/include/internal/sockets.h @@ -60,6 +60,13 @@ struct servent *PASCAL getservbyname(const char *, const char *); # endif # else +# if defined(__APPLE__) + /* + * This must be defined before including <netinet/in6.h> to get + * IPV6_RECVPKTINFO + */ +# define __APPLE_USE_RFC_3542 +# endif # ifndef NO_SYS_PARAM_H # include <sys/param.h> diff --git a/include/openssl/bioerr.h b/include/openssl/bioerr.h index c707d545fa..72b0b1ffa5 100644 --- a/include/openssl/bioerr.h +++ b/include/openssl/bioerr.h @@ -37,6 +37,7 @@ # define BIO_R_IN_USE 123 # define BIO_R_LENGTH_TOO_LONG 102 # define BIO_R_LISTEN_V6_ONLY 136 +# define BIO_R_LOCAL_ADDR_NOT_AVAILABLE 111 # define BIO_R_LOOKUP_RETURNED_NOTHING 142 # define BIO_R_MALFORMED_HOST_OR_SERVICE 130 # define BIO_R_NBIO_CONNECT_ERROR 110 @@ -44,7 +45,6 @@ # define BIO_R_NO_HOSTNAME_OR_SERVICE_SPECIFIED 144 # define BIO_R_NO_PORT_DEFINED 113 # define BIO_R_NO_SUCH_FILE 128 -# define BIO_R_NULL_PARAMETER 115 /* unused */ # define BIO_R_TFO_DISABLED 106 # define BIO_R_TFO_NO_KERNEL_SUPPORT 108 # define BIO_R_TRANSFER_ERROR 104 @@ -64,7 +64,7 @@ # define BIO_R_UNSUPPORTED_PROTOCOL_FAMILY 131 # define BIO_R_WRITE_TO_READ_ONLY_BIO 126 # define BIO_R_WSASTARTUP 122 -# define BIO_R_LOCAL_ADDR_NOT_AVAILABLE 148 # define BIO_R_NON_FATAL 149 +# define BIO_R_PORT_MISMATCH 150 #endif |