Latest update, add TLS 1.3 session time configuration.
This commit is contained in:
+20
-17
@@ -35,35 +35,38 @@ void bio_cleanup(void);
|
||||
int bwrite_conv(BIO *bio, const char *data, size_t datal, size_t *written);
|
||||
int bread_conv(BIO *bio, char *data, size_t datal, size_t *read);
|
||||
|
||||
# define BIO_CTRL_SET_KTLS_SEND 72
|
||||
# define BIO_CTRL_SET_KTLS_SEND_CTRL_MSG 74
|
||||
# define BIO_CTRL_CLEAR_KTLS_CTRL_MSG 75
|
||||
/* Changes to these internal BIOs must also update include/openssl/bio.h */
|
||||
# define BIO_CTRL_SET_KTLS 72
|
||||
# define BIO_CTRL_SET_KTLS_TX_SEND_CTRL_MSG 74
|
||||
# define BIO_CTRL_CLEAR_KTLS_TX_CTRL_MSG 75
|
||||
|
||||
/*
|
||||
* This is used with socket BIOs:
|
||||
* BIO_FLAGS_KTLS means we are using ktls with this BIO.
|
||||
* BIO_FLAGS_KTLS_CTRL_MSG means we are about to send a ctrl message next.
|
||||
* BIO_FLAGS_KTLS_TX means we are using ktls with this BIO for sending.
|
||||
* BIO_FLAGS_KTLS_TX_CTRL_MSG means we are about to send a ctrl message next.
|
||||
* BIO_FLAGS_KTLS_RX means we are using ktls with this BIO for receiving.
|
||||
*/
|
||||
# define BIO_FLAGS_KTLS 0x800
|
||||
# define BIO_FLAGS_KTLS_CTRL_MSG 0x1000
|
||||
# define BIO_FLAGS_KTLS_TX 0x800
|
||||
# define BIO_FLAGS_KTLS_TX_CTRL_MSG 0x1000
|
||||
# define BIO_FLAGS_KTLS_RX 0x2000
|
||||
|
||||
/* KTLS related controls and flags */
|
||||
# define BIO_set_ktls_flag(b) \
|
||||
BIO_set_flags(b, BIO_FLAGS_KTLS)
|
||||
# define BIO_should_ktls_flag(b) \
|
||||
BIO_test_flags(b, BIO_FLAGS_KTLS)
|
||||
# define BIO_set_ktls_flag(b, is_tx) \
|
||||
BIO_set_flags(b, (is_tx) ? BIO_FLAGS_KTLS_TX : BIO_FLAGS_KTLS_RX)
|
||||
# define BIO_should_ktls_flag(b, is_tx) \
|
||||
BIO_test_flags(b, (is_tx) ? BIO_FLAGS_KTLS_TX : BIO_FLAGS_KTLS_RX)
|
||||
# define BIO_set_ktls_ctrl_msg_flag(b) \
|
||||
BIO_set_flags(b, BIO_FLAGS_KTLS_CTRL_MSG)
|
||||
BIO_set_flags(b, BIO_FLAGS_KTLS_TX_CTRL_MSG)
|
||||
# define BIO_should_ktls_ctrl_msg_flag(b) \
|
||||
BIO_test_flags(b, (BIO_FLAGS_KTLS_CTRL_MSG))
|
||||
BIO_test_flags(b, BIO_FLAGS_KTLS_TX_CTRL_MSG)
|
||||
# define BIO_clear_ktls_ctrl_msg_flag(b) \
|
||||
BIO_clear_flags(b, (BIO_FLAGS_KTLS_CTRL_MSG))
|
||||
BIO_clear_flags(b, BIO_FLAGS_KTLS_TX_CTRL_MSG)
|
||||
|
||||
# define BIO_set_ktls(b, keyblob, is_tx) \
|
||||
BIO_ctrl(b, BIO_CTRL_SET_KTLS_SEND, is_tx, keyblob)
|
||||
BIO_ctrl(b, BIO_CTRL_SET_KTLS, is_tx, keyblob)
|
||||
# define BIO_set_ktls_ctrl_msg(b, record_type) \
|
||||
BIO_ctrl(b, BIO_CTRL_SET_KTLS_SEND_CTRL_MSG, record_type, NULL)
|
||||
BIO_ctrl(b, BIO_CTRL_SET_KTLS_TX_SEND_CTRL_MSG, record_type, NULL)
|
||||
# define BIO_clear_ktls_ctrl_msg(b) \
|
||||
BIO_ctrl(b, BIO_CTRL_CLEAR_KTLS_CTRL_MSG, 0, NULL)
|
||||
BIO_ctrl(b, BIO_CTRL_CLEAR_KTLS_TX_CTRL_MSG, 0, NULL)
|
||||
|
||||
#endif
|
||||
@@ -38,8 +38,8 @@ typedef struct ossl_method_construct_method_st {
|
||||
int (*put)(OPENSSL_CTX *libctx, void *store, const char *propdef,
|
||||
void *method, void *data);
|
||||
/* Construct a new method */
|
||||
void *(*construct)(const OSSL_DISPATCH *fns, OSSL_PROVIDER *prov,
|
||||
void *data);
|
||||
void *(*construct)(const char *algorithm_name, const OSSL_DISPATCH *fns,
|
||||
OSSL_PROVIDER *prov, void *data);
|
||||
/* Destruct a method */
|
||||
void (*destruct)(void *method, void *data);
|
||||
} OSSL_METHOD_CONSTRUCT_METHOD;
|
||||
|
||||
@@ -17,11 +17,9 @@
|
||||
|
||||
# include <openssl/opensslconf.h>
|
||||
|
||||
# ifndef OPENSSL_NO_DSO
|
||||
|
||||
# ifdef __cplusplus
|
||||
# ifdef __cplusplus
|
||||
extern "C"
|
||||
# endif
|
||||
# endif
|
||||
int ERR_load_DSO_strings(void);
|
||||
|
||||
/*
|
||||
@@ -83,5 +81,4 @@ int ERR_load_DSO_strings(void);
|
||||
# define DSO_R_UNLOAD_FAILED 107
|
||||
# define DSO_R_UNSUPPORTED 108
|
||||
|
||||
# endif
|
||||
#endif
|
||||
+94
-13
@@ -21,10 +21,11 @@
|
||||
|
||||
# ifndef PEDANTIC
|
||||
# warning "KTLS requires Kernel Headers >= 4.13.0"
|
||||
# warning "Skipping Compilation of KTLS data path"
|
||||
# warning "Skipping Compilation of KTLS"
|
||||
# endif
|
||||
|
||||
# define TLS_TX 1
|
||||
# define TLS_RX 2
|
||||
|
||||
# define TLS_CIPHER_AES_GCM_128 51
|
||||
# define TLS_CIPHER_AES_GCM_128_IV_SIZE 8
|
||||
@@ -67,11 +68,19 @@ static ossl_inline int ktls_send_ctrl_message(int fd, unsigned char record_type,
|
||||
return -1;
|
||||
}
|
||||
|
||||
static ossl_inline int ktls_read_record(int fd, void *data, size_t length)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
# else /* KERNEL_VERSION */
|
||||
|
||||
# include <netinet/tcp.h>
|
||||
# include <linux/tls.h>
|
||||
# include <linux/socket.h>
|
||||
# include "openssl/ssl3.h"
|
||||
# include "openssl/tls1.h"
|
||||
# include "openssl/evp.h"
|
||||
|
||||
# ifndef SOL_TLS
|
||||
# define SOL_TLS 282
|
||||
@@ -96,16 +105,16 @@ static ossl_inline int ktls_enable(int fd)
|
||||
* The TLS_TX socket option changes the send/sendmsg handlers of the TCP socket.
|
||||
* If successful, then data sent using this socket will be encrypted and
|
||||
* encapsulated in TLS records using the crypto_info provided here.
|
||||
* The TLS_RX socket option changes the recv/recvmsg handlers of the TCP socket.
|
||||
* If successful, then data received using this socket will be decrypted,
|
||||
* authenticated and decapsulated using the crypto_info provided here.
|
||||
*/
|
||||
static ossl_inline int ktls_start(int fd,
|
||||
struct tls12_crypto_info_aes_gcm_128
|
||||
*crypto_info, size_t len, int is_tx)
|
||||
{
|
||||
if (is_tx)
|
||||
return setsockopt(fd, SOL_TLS, TLS_TX, crypto_info,
|
||||
sizeof(*crypto_info)) ? 0 : 1;
|
||||
else
|
||||
return 0;
|
||||
return setsockopt(fd, SOL_TLS, is_tx ? TLS_TX : TLS_RX,
|
||||
crypto_info, sizeof(*crypto_info)) ? 0 : 1;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -121,12 +130,15 @@ static ossl_inline int ktls_send_ctrl_message(int fd, unsigned char record_type,
|
||||
struct msghdr msg;
|
||||
int cmsg_len = sizeof(record_type);
|
||||
struct cmsghdr *cmsg;
|
||||
char buf[CMSG_SPACE(cmsg_len)];
|
||||
union {
|
||||
struct cmsghdr hdr;
|
||||
char buf[CMSG_SPACE(sizeof(unsigned char))];
|
||||
} cmsgbuf;
|
||||
struct iovec msg_iov; /* Vector of data to send/receive into */
|
||||
|
||||
memset(&msg, 0, sizeof(msg));
|
||||
msg.msg_control = buf;
|
||||
msg.msg_controllen = sizeof(buf);
|
||||
msg.msg_control = cmsgbuf.buf;
|
||||
msg.msg_controllen = sizeof(cmsgbuf.buf);
|
||||
cmsg = CMSG_FIRSTHDR(&msg);
|
||||
cmsg->cmsg_level = SOL_TLS;
|
||||
cmsg->cmsg_type = TLS_SET_RECORD_TYPE;
|
||||
@@ -142,7 +154,76 @@ static ossl_inline int ktls_send_ctrl_message(int fd, unsigned char record_type,
|
||||
return sendmsg(fd, &msg, 0);
|
||||
}
|
||||
|
||||
# endif /* KERNEL_VERSION */
|
||||
# endif /* OPENSSL_SYS_LINUX */
|
||||
# endif /* HEADER_INTERNAL_KTLS */
|
||||
#endif /* OPENSSL_NO_KTLS */
|
||||
# define K_MIN1_RX 17
|
||||
# if LINUX_VERSION_CODE < KERNEL_VERSION(K_MAJ, K_MIN1_RX, K_MIN2)
|
||||
|
||||
# ifndef PEDANTIC
|
||||
# warning "KTLS requires Kernel Headers >= 4.17.0 for receiving"
|
||||
# warning "Skipping Compilation of KTLS receive data path"
|
||||
# endif
|
||||
|
||||
static ossl_inline int ktls_read_record(int fd, void *data, size_t length)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
# else
|
||||
|
||||
/*
|
||||
* Receive a TLS record using the crypto_info provided in ktls_start.
|
||||
* The kernel strips the TLS record header, IV and authentication tag,
|
||||
* returning only the plaintext data or an error on failure.
|
||||
* We add the TLS record header here to satisfy routines in rec_layer_s3.c
|
||||
*/
|
||||
static ossl_inline int ktls_read_record(int fd, void *data, size_t length)
|
||||
{
|
||||
struct msghdr msg;
|
||||
struct cmsghdr *cmsg;
|
||||
union {
|
||||
struct cmsghdr hdr;
|
||||
char buf[CMSG_SPACE(sizeof(unsigned char))];
|
||||
} cmsgbuf;
|
||||
struct iovec msg_iov;
|
||||
int ret;
|
||||
unsigned char *p = data;
|
||||
const size_t prepend_length = SSL3_RT_HEADER_LENGTH;
|
||||
|
||||
if (length < prepend_length + EVP_GCM_TLS_TAG_LEN) {
|
||||
errno = EINVAL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
memset(&msg, 0, sizeof(msg));
|
||||
msg.msg_control = cmsgbuf.buf;
|
||||
msg.msg_controllen = sizeof(cmsgbuf.buf);
|
||||
|
||||
msg_iov.iov_base = p + prepend_length;
|
||||
msg_iov.iov_len = length - prepend_length - EVP_GCM_TLS_TAG_LEN;
|
||||
msg.msg_iov = &msg_iov;
|
||||
msg.msg_iovlen = 1;
|
||||
|
||||
ret = recvmsg(fd, &msg, 0);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
if (msg.msg_controllen > 0) {
|
||||
cmsg = CMSG_FIRSTHDR(&msg);
|
||||
if (cmsg->cmsg_type == TLS_GET_RECORD_TYPE) {
|
||||
p[0] = *((unsigned char *)CMSG_DATA(cmsg));
|
||||
p[1] = TLS1_2_VERSION_MAJOR;
|
||||
p[2] = TLS1_2_VERSION_MINOR;
|
||||
/* returned length is limited to msg_iov.iov_len above */
|
||||
p[3] = (ret >> 8) & 0xff;
|
||||
p[4] = ret & 0xff;
|
||||
ret += prepend_length;
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
# endif
|
||||
# endif
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
@@ -33,8 +33,10 @@ int ossl_provider_upref(OSSL_PROVIDER *prov);
|
||||
void ossl_provider_free(OSSL_PROVIDER *prov);
|
||||
|
||||
/* Setters */
|
||||
int ossl_provider_add_module_location(OSSL_PROVIDER *prov, const char *loc);
|
||||
int ossl_provider_set_fallback(OSSL_PROVIDER *prov);
|
||||
int ossl_provider_set_module_path(OSSL_PROVIDER *prov, const char *module_path);
|
||||
int ossl_provider_add_parameter(OSSL_PROVIDER *prov, const char *name,
|
||||
const char *value);
|
||||
|
||||
/*
|
||||
* Activate the Provider
|
||||
@@ -64,6 +66,9 @@ const OSSL_ALGORITHM *ossl_provider_query_operation(const OSSL_PROVIDER *prov,
|
||||
int operation_id,
|
||||
int *no_cache);
|
||||
|
||||
/* Configuration */
|
||||
void ossl_provider_add_conf_module(void);
|
||||
|
||||
# ifdef __cplusplus
|
||||
}
|
||||
# endif
|
||||
|
||||
@@ -106,7 +106,7 @@ static __inline int CRYPTO_DOWN_REF(volatile int *val, int *ret, void *lock)
|
||||
# if _WIN32_WCE >= 0x600
|
||||
extern long __cdecl _InterlockedExchangeAdd(long volatile*, long);
|
||||
# else
|
||||
// under Windows CE we still have old-style Interlocked* functions
|
||||
/* under Windows CE we still have old-style Interlocked* functions */
|
||||
extern long __cdecl InterlockedExchangeAdd(long volatile*, long);
|
||||
# define _InterlockedExchangeAdd InterlockedExchangeAdd
|
||||
# endif
|
||||
|
||||
@@ -67,6 +67,7 @@ void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out,
|
||||
void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,
|
||||
size_t length, const AES_KEY *key,
|
||||
unsigned char *ivec, int *num);
|
||||
# if !OPENSSL_API_3
|
||||
/* NB: the IV is _two_ blocks long */
|
||||
void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
|
||||
size_t length, const AES_KEY *key,
|
||||
@@ -76,6 +77,7 @@ void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
|
||||
size_t length, const AES_KEY *key,
|
||||
const AES_KEY *key2, const unsigned char *ivec,
|
||||
const int enc);
|
||||
# endif
|
||||
|
||||
int AES_wrap_key(AES_KEY *key, const unsigned char *iv,
|
||||
unsigned char *out,
|
||||
|
||||
@@ -145,15 +145,20 @@ extern "C" {
|
||||
|
||||
# define BIO_CTRL_DGRAM_SET_PEEK_MODE 71
|
||||
|
||||
/* internal BIO see include/internal/bio.h:
|
||||
/*
|
||||
* internal BIO see include/internal/bio.h:
|
||||
* # define BIO_CTRL_SET_KTLS_SEND 72
|
||||
* # define BIO_CTRL_SET_KTLS_SEND_CTRL_MSG 74
|
||||
* # define BIO_CTRL_CLEAR_KTLS_CTRL_MSG 75
|
||||
* # define BIO_CTRL_CLEAR_KTLS_CTRL_MSG 75
|
||||
*/
|
||||
|
||||
# define BIO_CTRL_GET_KTLS_SEND 73
|
||||
# define BIO_CTRL_GET_KTLS_RECV 76
|
||||
|
||||
# define BIO_get_ktls_send(b) \
|
||||
BIO_ctrl(b, BIO_CTRL_GET_KTLS_SEND, 0, NULL)
|
||||
# define BIO_get_ktls_recv(b) \
|
||||
BIO_ctrl(b, BIO_CTRL_GET_KTLS_RECV, 0, NULL)
|
||||
|
||||
/* modifiers */
|
||||
# define BIO_FP_READ 0x02
|
||||
|
||||
@@ -84,6 +84,7 @@ OSSL_CORE_MAKE_FUNC(const OSSL_ALGORITHM *,provider_query_operation,
|
||||
# define OSSL_FUNC_DIGEST_FREECTX 6
|
||||
# define OSSL_FUNC_DIGEST_DUPCTX 7
|
||||
# define OSSL_FUNC_DIGEST_SIZE 8
|
||||
# define OSSL_FUNC_DIGEST_BLOCK_SIZE 9
|
||||
|
||||
OSSL_CORE_MAKE_FUNC(void *, OP_digest_newctx, (void))
|
||||
OSSL_CORE_MAKE_FUNC(int, OP_digest_init, (void *vctx))
|
||||
@@ -98,6 +99,7 @@ OSSL_CORE_MAKE_FUNC(void, OP_digest_cleanctx, (void *vctx))
|
||||
OSSL_CORE_MAKE_FUNC(void, OP_digest_freectx, (void *vctx))
|
||||
OSSL_CORE_MAKE_FUNC(void *, OP_digest_dupctx, (void *vctx))
|
||||
OSSL_CORE_MAKE_FUNC(size_t, OP_digest_size, (void))
|
||||
OSSL_CORE_MAKE_FUNC(size_t, OP_digest_block_size, (void))
|
||||
|
||||
# ifdef __cplusplus
|
||||
}
|
||||
|
||||
@@ -45,11 +45,15 @@ int ERR_load_CRYPTO_strings(void);
|
||||
# define CRYPTO_F_OPENSSL_SK_DUP 128
|
||||
# define CRYPTO_F_OSSL_PROVIDER_ADD_BUILTIN 132
|
||||
# define CRYPTO_F_OSSL_PROVIDER_ACTIVATE 130
|
||||
# define CRYPTO_F_OSSL_PROVIDER_ADD_PARAMETER 139
|
||||
# define CRYPTO_F_OSSL_PROVIDER_NEW 131
|
||||
# define CRYPTO_F_OSSL_PROVIDER_SET_MODULE_PATH 140
|
||||
# define CRYPTO_F_PKEY_HMAC_INIT 123
|
||||
# define CRYPTO_F_PKEY_POLY1305_INIT 124
|
||||
# define CRYPTO_F_PKEY_SIPHASH_INIT 125
|
||||
# define CRYPTO_F_PROVIDER_ACTIVATE 134
|
||||
# define CRYPTO_F_PROVIDER_CONF_INIT 137
|
||||
# define CRYPTO_F_PROVIDER_CONF_LOAD 138
|
||||
# define CRYPTO_F_PROVIDER_NEW 135
|
||||
# define CRYPTO_F_PROVIDER_STORE_NEW 136
|
||||
# define CRYPTO_F_SK_RESERVE 129
|
||||
@@ -61,5 +65,6 @@ int ERR_load_CRYPTO_strings(void);
|
||||
# define CRYPTO_R_ILLEGAL_HEX_DIGIT 102
|
||||
# define CRYPTO_R_ODD_NUMBER_OF_DIGITS 103
|
||||
# define CRYPTO_R_PROVIDER_ALREADY_EXISTS 104
|
||||
# define CRYPTO_R_PROVIDER_SECTION_ERROR 105
|
||||
|
||||
#endif
|
||||
@@ -422,6 +422,7 @@ size_t EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems);
|
||||
|
||||
const char *EC_curve_nid2nist(int nid);
|
||||
int EC_curve_nist2nid(const char *name);
|
||||
int EC_GROUP_check_named_curve(const EC_GROUP *group, int nist_only);
|
||||
|
||||
/********************************************************************/
|
||||
/* EC_POINT functions */
|
||||
|
||||
@@ -69,6 +69,8 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
int EVP_set_default_properties(OPENSSL_CTX *libctx, const char *propq);
|
||||
|
||||
# define EVP_PKEY_MO_SIGN 0x0001
|
||||
# define EVP_PKEY_MO_VERIFY 0x0002
|
||||
# define EVP_PKEY_MO_ENCRYPT 0x0004
|
||||
|
||||
@@ -24,12 +24,16 @@ int ERR_load_EVP_strings(void);
|
||||
* EVP function codes.
|
||||
*/
|
||||
# define EVP_F_AESNI_INIT_KEY 165
|
||||
# define EVP_F_AESNI_XTS_INIT_KEY 233
|
||||
# define EVP_F_AES_GCM_CTRL 196
|
||||
# define EVP_F_AES_GCM_TLS_CIPHER 207
|
||||
# define EVP_F_AES_INIT_KEY 133
|
||||
# define EVP_F_AES_OCB_CIPHER 169
|
||||
# define EVP_F_AES_T4_INIT_KEY 178
|
||||
# define EVP_F_AES_T4_XTS_INIT_KEY 234
|
||||
# define EVP_F_AES_WRAP_CIPHER 170
|
||||
# define EVP_F_AES_XTS_CIPHER 229
|
||||
# define EVP_F_AES_XTS_INIT_KEY 235
|
||||
# define EVP_F_ALG_MODULE_INIT 177
|
||||
# define EVP_F_ARIA_CCM_INIT_KEY 175
|
||||
# define EVP_F_ARIA_GCM_CTRL 197
|
||||
@@ -69,6 +73,7 @@ int ERR_load_EVP_strings(void);
|
||||
# define EVP_F_EVP_MAC_CTX_COPY 211
|
||||
# define EVP_F_EVP_MAC_CTX_NEW 213
|
||||
# define EVP_F_EVP_MAC_INIT 212
|
||||
# define EVP_F_EVP_MD_BLOCK_SIZE 232
|
||||
# define EVP_F_EVP_MD_CTX_COPY_EX 110
|
||||
# define EVP_F_EVP_MD_SIZE 162
|
||||
# define EVP_F_EVP_OPENINIT 102
|
||||
@@ -123,6 +128,7 @@ int ERR_load_EVP_strings(void);
|
||||
# define EVP_F_EVP_PKEY_VERIFY_INIT 143
|
||||
# define EVP_F_EVP_PKEY_VERIFY_RECOVER 144
|
||||
# define EVP_F_EVP_PKEY_VERIFY_RECOVER_INIT 145
|
||||
# define EVP_F_EVP_SET_DEFAULT_PROPERTIES 236
|
||||
# define EVP_F_EVP_SIGNFINAL 107
|
||||
# define EVP_F_EVP_VERIFYFINAL 108
|
||||
# define EVP_F_GMAC_CTRL 215
|
||||
@@ -225,5 +231,7 @@ int ERR_load_EVP_strings(void);
|
||||
# define EVP_R_UPDATE_ERROR 189
|
||||
# define EVP_R_WRAP_MODE_NOT_ALLOWED 170
|
||||
# define EVP_R_WRONG_FINAL_BLOCK_LENGTH 109
|
||||
# define EVP_R_XTS_DATA_UNIT_IS_TOO_LARGE 191
|
||||
# define EVP_R_XTS_DUPLICATED_KEYS 192
|
||||
|
||||
#endif
|
||||
@@ -132,11 +132,12 @@ OSSL_PARAM OSSL_PARAM_construct_double(const char *key, double *buf,
|
||||
OSSL_PARAM OSSL_PARAM_construct_utf8_string(const char *key, char *buf,
|
||||
size_t bsize, size_t *rsize);
|
||||
OSSL_PARAM OSSL_PARAM_construct_utf8_ptr(const char *key, char **buf,
|
||||
size_t *rsize);
|
||||
size_t bsize, size_t *rsize);
|
||||
OSSL_PARAM OSSL_PARAM_construct_octet_string(const char *key, void *buf,
|
||||
size_t bsize, size_t *rsize);
|
||||
OSSL_PARAM OSSL_PARAM_construct_octet_ptr(const char *key, void **buf,
|
||||
size_t *rsize);
|
||||
size_t bsize, size_t *rsize);
|
||||
OSSL_PARAM OSSL_PARAM_construct_end(void);
|
||||
|
||||
int OSSL_PARAM_get_int(const OSSL_PARAM *p, int *val);
|
||||
int OSSL_PARAM_get_uint(const OSSL_PARAM *p, unsigned int *val);
|
||||
|
||||
@@ -24,6 +24,7 @@ int ERR_load_RAND_strings(void);
|
||||
* RAND function codes.
|
||||
*/
|
||||
# define RAND_F_DRBG_BYTES 101
|
||||
# define RAND_F_DRBG_CTR_INIT 125
|
||||
# define RAND_F_DRBG_GET_ENTROPY 105
|
||||
# define RAND_F_DRBG_SETUP 117
|
||||
# define RAND_F_GET_ENTROPY 106
|
||||
@@ -56,6 +57,7 @@ int ERR_load_RAND_strings(void);
|
||||
# define RAND_R_ALREADY_INSTANTIATED 103
|
||||
# define RAND_R_ARGUMENT_OUT_OF_RANGE 105
|
||||
# define RAND_R_CANNOT_OPEN_FILE 121
|
||||
# define RAND_R_DERIVATION_FUNCTION_MANDATORY_FOR_FIPS 137
|
||||
# define RAND_R_DRBG_ALREADY_INITIALIZED 129
|
||||
# define RAND_R_DRBG_NOT_INITIALISED 104
|
||||
# define RAND_R_ENTROPY_INPUT_TOO_LONG 106
|
||||
|
||||
@@ -501,7 +501,7 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
|
||||
*/
|
||||
# define SSL_MODE_ASYNC 0x00000100U
|
||||
/*
|
||||
* Use the kernel TLS transmission data-path.
|
||||
* Don't use the kernel TLS data-path for sending.
|
||||
*/
|
||||
# define SSL_MODE_NO_KTLS_TX 0x00000200U
|
||||
/*
|
||||
@@ -516,6 +516,10 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
|
||||
* - OpenSSL 1.1.1 and 1.1.1a
|
||||
*/
|
||||
# define SSL_MODE_DTLS_SCTP_LABEL_LENGTH_BUG 0x00000400U
|
||||
/*
|
||||
* Don't use the kernel TLS data-path for receiving.
|
||||
*/
|
||||
# define SSL_MODE_NO_KTLS_RX 0x00000800U
|
||||
|
||||
/* Cert related flags */
|
||||
/*
|
||||
@@ -1506,6 +1510,7 @@ __owur SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth);
|
||||
int SSL_CTX_up_ref(SSL_CTX *ctx);
|
||||
void SSL_CTX_free(SSL_CTX *);
|
||||
__owur long SSL_CTX_set_timeout(SSL_CTX *ctx, long t);
|
||||
__owur long SSL_CTX_set_timeout_tls13(SSL_CTX *ctx, long t);
|
||||
__owur long SSL_CTX_get_timeout(const SSL_CTX *ctx);
|
||||
__owur X509_STORE *SSL_CTX_get_cert_store(const SSL_CTX *);
|
||||
void SSL_CTX_set_cert_store(SSL_CTX *, X509_STORE *);
|
||||
|
||||
@@ -41,7 +41,7 @@ extern "C" {
|
||||
# define OSSL_TRACE_CATEGORY_INIT 2
|
||||
# define OSSL_TRACE_CATEGORY_TLS 3
|
||||
# define OSSL_TRACE_CATEGORY_TLS_CIPHER 4
|
||||
# define OSSL_TRACE_CATEGORY_ENGINE_CONF 5
|
||||
# define OSSL_TRACE_CATEGORY_CONF 5
|
||||
# define OSSL_TRACE_CATEGORY_ENGINE_TABLE 6
|
||||
# define OSSL_TRACE_CATEGORY_ENGINE_REF_COUNT 7
|
||||
# define OSSL_TRACE_CATEGORY_PKCS5V2 8
|
||||
|
||||
@@ -567,7 +567,7 @@ void X509_get0_signature(const ASN1_BIT_STRING **psig,
|
||||
int X509_get_signature_nid(const X509 *x);
|
||||
|
||||
# ifndef OPENSSL_NO_SM2
|
||||
void X509_set_sm2_id(X509 *x, ASN1_OCTET_STRING *sm2_id);
|
||||
void X509_set0_sm2_id(X509 *x, ASN1_OCTET_STRING *sm2_id);
|
||||
ASN1_OCTET_STRING *X509_get0_sm2_id(X509 *x);
|
||||
# endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user