mirror of
https://github.com/openssl/openssl.git
synced 2026-01-18 17:11:31 +01:00
Redo source reformatting with the TypeNames added
This resulted in some source reformatting becoming a bit less trippy
This is the script I used to run clang-format appropriately enough:
#! /bin/bash
include_re=$(yq -r '.repos.[].hooks.[] | select(.id == "clang-format") | .files' < .pre-commit-config.yaml)
known_generated=( crypto/bn/bn_prime.h
crypto/objects/obj_dat.h
crypto/objects/obj_xref.h
include/openssl/obj_mac.h
crypto/conf/conf_def.h
crypto/asn1/charmap.h
'*_err.c'
'*err.h' )
exclusions=()
for g in "${known_generated[@]}"; do
# Convert pattern to a regex
g=${g//\./\\.}
g=${g//\*/.\*}
exclusions+=( "^${g}\$" )
done
# Join all exclusions into one regex
exclude_re=$(IFS='|'; echo "${exclusions[*]}")
(set -x; git ls-files | grep -E $include_re | grep -Ev $exclude_re | xargs clang-format -i)
Reviewed-by: Paul Yang <paulyang.inf@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/29383)
This commit is contained in:
committed by
Neil Horman
parent
aa9defaa1f
commit
63e912b758
@@ -27,9 +27,8 @@
|
||||
* See RFC 8554 Section 3.1.3: Strings of w-bit Elements
|
||||
* w: Is one of {1,2,4,8}
|
||||
*/
|
||||
static ossl_unused ossl_inline
|
||||
uint8_t
|
||||
lms_ots_coef(const unsigned char *S, uint16_t i, uint8_t w)
|
||||
static ossl_unused ossl_inline uint8_t
|
||||
lms_ots_coef(const unsigned char *S, uint16_t i, uint8_t w)
|
||||
{
|
||||
uint8_t bitmask = (1 << w) - 1;
|
||||
uint8_t shift = 8 - (w * (i % (8 / w)) + w);
|
||||
|
||||
@@ -62,7 +62,7 @@ extern "C" {
|
||||
} \
|
||||
static ossl_unused ossl_inline int \
|
||||
ossl_sa_##type##_set(SPARSE_ARRAY_OF(type) * sa, \
|
||||
ossl_uintmax_t n, ctype * val) \
|
||||
ossl_uintmax_t n, ctype *val) \
|
||||
{ \
|
||||
return ossl_sa_set((OPENSSL_SA *)sa, n, (void *)val); \
|
||||
} \
|
||||
|
||||
@@ -146,7 +146,7 @@ static ossl_inline uint64_t constant_time_lt_64(uint64_t a, uint64_t b)
|
||||
return constant_time_msb_64(a ^ ((a ^ b) | ((a - b) ^ b)));
|
||||
}
|
||||
|
||||
#ifdef BN_ULONG
|
||||
#ifdef BN_BYTES
|
||||
static ossl_inline BN_ULONG value_barrier_bn(BN_ULONG a)
|
||||
{
|
||||
#if !defined(OPENSSL_NO_ASM) && defined(__GNUC__)
|
||||
|
||||
@@ -54,9 +54,8 @@ typedef struct {
|
||||
OSSL_SAFE_MATH_UNSIGNED(time, uint64_t)
|
||||
|
||||
/* Convert a tick count into a time */
|
||||
static ossl_unused ossl_inline
|
||||
OSSL_TIME
|
||||
ossl_ticks2time(uint64_t ticks)
|
||||
static ossl_unused ossl_inline OSSL_TIME
|
||||
ossl_ticks2time(uint64_t ticks)
|
||||
{
|
||||
OSSL_TIME r;
|
||||
|
||||
@@ -65,9 +64,8 @@ static ossl_unused ossl_inline
|
||||
}
|
||||
|
||||
/* Convert a time to a tick count */
|
||||
static ossl_unused ossl_inline
|
||||
uint64_t
|
||||
ossl_time2ticks(OSSL_TIME t)
|
||||
static ossl_unused ossl_inline uint64_t
|
||||
ossl_time2ticks(OSSL_TIME t)
|
||||
{
|
||||
return t.t;
|
||||
}
|
||||
@@ -76,16 +74,14 @@ static ossl_unused ossl_inline
|
||||
OSSL_TIME ossl_time_now(void);
|
||||
|
||||
/* The beginning and end of the time range */
|
||||
static ossl_unused ossl_inline
|
||||
OSSL_TIME
|
||||
ossl_time_zero(void)
|
||||
static ossl_unused ossl_inline OSSL_TIME
|
||||
ossl_time_zero(void)
|
||||
{
|
||||
return ossl_ticks2time(0);
|
||||
}
|
||||
|
||||
static ossl_unused ossl_inline
|
||||
OSSL_TIME
|
||||
ossl_time_infinite(void)
|
||||
static ossl_unused ossl_inline OSSL_TIME
|
||||
ossl_time_infinite(void)
|
||||
{
|
||||
return ossl_ticks2time(~(uint64_t)0);
|
||||
}
|
||||
@@ -114,9 +110,8 @@ static ossl_unused ossl_inline struct timeval ossl_time_to_timeval(OSSL_TIME t)
|
||||
}
|
||||
|
||||
/* Convert timeval to time */
|
||||
static ossl_unused ossl_inline
|
||||
OSSL_TIME
|
||||
ossl_time_from_timeval(struct timeval tv)
|
||||
static ossl_unused ossl_inline OSSL_TIME
|
||||
ossl_time_from_timeval(struct timeval tv)
|
||||
{
|
||||
OSSL_TIME t;
|
||||
|
||||
@@ -137,9 +132,8 @@ static ossl_unused ossl_inline
|
||||
}
|
||||
|
||||
/* Convert time_t to OSSL_TIME */
|
||||
static ossl_unused ossl_inline
|
||||
OSSL_TIME
|
||||
ossl_time_from_time_t(time_t t)
|
||||
static ossl_unused ossl_inline OSSL_TIME
|
||||
ossl_time_from_time_t(time_t t)
|
||||
{
|
||||
OSSL_TIME ot;
|
||||
|
||||
@@ -170,9 +164,8 @@ static ossl_unused ossl_inline int ossl_time_is_infinite(OSSL_TIME t)
|
||||
return ossl_time_compare(t, ossl_time_infinite()) == 0;
|
||||
}
|
||||
|
||||
static ossl_unused ossl_inline
|
||||
OSSL_TIME
|
||||
ossl_time_add(OSSL_TIME a, OSSL_TIME b)
|
||||
static ossl_unused ossl_inline OSSL_TIME
|
||||
ossl_time_add(OSSL_TIME a, OSSL_TIME b)
|
||||
{
|
||||
OSSL_TIME r;
|
||||
int err = 0;
|
||||
@@ -181,9 +174,8 @@ static ossl_unused ossl_inline
|
||||
return err ? ossl_time_infinite() : r;
|
||||
}
|
||||
|
||||
static ossl_unused ossl_inline
|
||||
OSSL_TIME
|
||||
ossl_time_subtract(OSSL_TIME a, OSSL_TIME b)
|
||||
static ossl_unused ossl_inline OSSL_TIME
|
||||
ossl_time_subtract(OSSL_TIME a, OSSL_TIME b)
|
||||
{
|
||||
OSSL_TIME r;
|
||||
int err = 0;
|
||||
@@ -193,17 +185,15 @@ static ossl_unused ossl_inline
|
||||
}
|
||||
|
||||
/* Returns |a - b|. */
|
||||
static ossl_unused ossl_inline
|
||||
OSSL_TIME
|
||||
ossl_time_abs_difference(OSSL_TIME a, OSSL_TIME b)
|
||||
static ossl_unused ossl_inline OSSL_TIME
|
||||
ossl_time_abs_difference(OSSL_TIME a, OSSL_TIME b)
|
||||
{
|
||||
return a.t > b.t ? ossl_time_subtract(a, b)
|
||||
: ossl_time_subtract(b, a);
|
||||
}
|
||||
|
||||
static ossl_unused ossl_inline
|
||||
OSSL_TIME
|
||||
ossl_time_multiply(OSSL_TIME a, uint64_t b)
|
||||
static ossl_unused ossl_inline OSSL_TIME
|
||||
ossl_time_multiply(OSSL_TIME a, uint64_t b)
|
||||
{
|
||||
OSSL_TIME r;
|
||||
int err = 0;
|
||||
@@ -212,9 +202,8 @@ static ossl_unused ossl_inline
|
||||
return err ? ossl_time_infinite() : r;
|
||||
}
|
||||
|
||||
static ossl_unused ossl_inline
|
||||
OSSL_TIME
|
||||
ossl_time_divide(OSSL_TIME a, uint64_t b)
|
||||
static ossl_unused ossl_inline OSSL_TIME
|
||||
ossl_time_divide(OSSL_TIME a, uint64_t b)
|
||||
{
|
||||
OSSL_TIME r;
|
||||
int err = 0;
|
||||
@@ -223,9 +212,8 @@ static ossl_unused ossl_inline
|
||||
return err ? ossl_time_zero() : r;
|
||||
}
|
||||
|
||||
static ossl_unused ossl_inline
|
||||
OSSL_TIME
|
||||
ossl_time_muldiv(OSSL_TIME a, uint64_t b, uint64_t c)
|
||||
static ossl_unused ossl_inline OSSL_TIME
|
||||
ossl_time_muldiv(OSSL_TIME a, uint64_t b, uint64_t c)
|
||||
{
|
||||
OSSL_TIME r;
|
||||
int err = 0;
|
||||
@@ -235,17 +223,15 @@ static ossl_unused ossl_inline
|
||||
}
|
||||
|
||||
/* Return higher of the two given time values. */
|
||||
static ossl_unused ossl_inline
|
||||
OSSL_TIME
|
||||
ossl_time_max(OSSL_TIME a, OSSL_TIME b)
|
||||
static ossl_unused ossl_inline OSSL_TIME
|
||||
ossl_time_max(OSSL_TIME a, OSSL_TIME b)
|
||||
{
|
||||
return a.t > b.t ? a : b;
|
||||
}
|
||||
|
||||
/* Return the lower of the two given time values. */
|
||||
static ossl_unused ossl_inline
|
||||
OSSL_TIME
|
||||
ossl_time_min(OSSL_TIME a, OSSL_TIME b)
|
||||
static ossl_unused ossl_inline OSSL_TIME
|
||||
ossl_time_min(OSSL_TIME a, OSSL_TIME b)
|
||||
{
|
||||
return a.t < b.t ? a : b;
|
||||
}
|
||||
|
||||
@@ -162,16 +162,16 @@ OSSL_CORE_MAKE_FUNC(void,
|
||||
|
||||
OSSL_CORE_MAKE_FUNC(OSSL_CORE_BIO *, BIO_new_file, (const char *filename, const char *mode))
|
||||
OSSL_CORE_MAKE_FUNC(OSSL_CORE_BIO *, BIO_new_membuf, (const void *buf, int len))
|
||||
OSSL_CORE_MAKE_FUNC(int, BIO_read_ex, (OSSL_CORE_BIO * bio, void *data, size_t data_len, size_t *bytes_read))
|
||||
OSSL_CORE_MAKE_FUNC(int, BIO_write_ex, (OSSL_CORE_BIO * bio, const void *data, size_t data_len, size_t *written))
|
||||
OSSL_CORE_MAKE_FUNC(int, BIO_gets, (OSSL_CORE_BIO * bio, char *buf, int size))
|
||||
OSSL_CORE_MAKE_FUNC(int, BIO_puts, (OSSL_CORE_BIO * bio, const char *str))
|
||||
OSSL_CORE_MAKE_FUNC(int, BIO_up_ref, (OSSL_CORE_BIO * bio))
|
||||
OSSL_CORE_MAKE_FUNC(int, BIO_free, (OSSL_CORE_BIO * bio))
|
||||
OSSL_CORE_MAKE_FUNC(int, BIO_vprintf, (OSSL_CORE_BIO * bio, const char *format, va_list args))
|
||||
OSSL_CORE_MAKE_FUNC(int, BIO_read_ex, (OSSL_CORE_BIO *bio, void *data, size_t data_len, size_t *bytes_read))
|
||||
OSSL_CORE_MAKE_FUNC(int, BIO_write_ex, (OSSL_CORE_BIO *bio, const void *data, size_t data_len, size_t *written))
|
||||
OSSL_CORE_MAKE_FUNC(int, BIO_gets, (OSSL_CORE_BIO *bio, char *buf, int size))
|
||||
OSSL_CORE_MAKE_FUNC(int, BIO_puts, (OSSL_CORE_BIO *bio, const char *str))
|
||||
OSSL_CORE_MAKE_FUNC(int, BIO_up_ref, (OSSL_CORE_BIO *bio))
|
||||
OSSL_CORE_MAKE_FUNC(int, BIO_free, (OSSL_CORE_BIO *bio))
|
||||
OSSL_CORE_MAKE_FUNC(int, BIO_vprintf, (OSSL_CORE_BIO *bio, const char *format, va_list args))
|
||||
OSSL_CORE_MAKE_FUNC(int, BIO_vsnprintf,
|
||||
(char *buf, size_t n, const char *fmt, va_list args))
|
||||
OSSL_CORE_MAKE_FUNC(int, BIO_ctrl, (OSSL_CORE_BIO * bio, int cmd, long num, void *ptr))
|
||||
OSSL_CORE_MAKE_FUNC(int, BIO_ctrl, (OSSL_CORE_BIO *bio, int cmd, long num, void *ptr))
|
||||
|
||||
/* New seeding functions prototypes with the 101-104 series */
|
||||
#define OSSL_FUNC_CLEANUP_USER_ENTROPY 96
|
||||
@@ -180,9 +180,9 @@ OSSL_CORE_MAKE_FUNC(int, BIO_ctrl, (OSSL_CORE_BIO * bio, int cmd, long num, void
|
||||
#define OSSL_FUNC_GET_USER_NONCE 99
|
||||
|
||||
#define OSSL_FUNC_INDICATOR_CB 95
|
||||
OSSL_CORE_MAKE_FUNC(void, indicator_cb, (OPENSSL_CORE_CTX * ctx, OSSL_INDICATOR_CALLBACK **cb))
|
||||
OSSL_CORE_MAKE_FUNC(void, indicator_cb, (OPENSSL_CORE_CTX *ctx, OSSL_INDICATOR_CALLBACK **cb))
|
||||
#define OSSL_FUNC_SELF_TEST_CB 100
|
||||
OSSL_CORE_MAKE_FUNC(void, self_test_cb, (OPENSSL_CORE_CTX * ctx, OSSL_CALLBACK **cb, void **cbarg))
|
||||
OSSL_CORE_MAKE_FUNC(void, self_test_cb, (OPENSSL_CORE_CTX *ctx, OSSL_CALLBACK **cb, void **cbarg))
|
||||
|
||||
/* Functions to get seed material from the operating system */
|
||||
#define OSSL_FUNC_GET_ENTROPY 101
|
||||
@@ -257,26 +257,26 @@ OSSL_CORE_MAKE_FUNC(int, provider_random_bytes, (void *provctx, int which, void
|
||||
/* Libssl related functions */
|
||||
#define OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_SEND 2001
|
||||
OSSL_CORE_MAKE_FUNC(int, SSL_QUIC_TLS_crypto_send,
|
||||
(SSL * s, const unsigned char *buf, size_t buf_len,
|
||||
(SSL *s, const unsigned char *buf, size_t buf_len,
|
||||
size_t *consumed, void *arg))
|
||||
#define OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_RECV_RCD 2002
|
||||
OSSL_CORE_MAKE_FUNC(int, SSL_QUIC_TLS_crypto_recv_rcd,
|
||||
(SSL * s, const unsigned char **buf, size_t *bytes_read,
|
||||
(SSL *s, const unsigned char **buf, size_t *bytes_read,
|
||||
void *arg))
|
||||
#define OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_RELEASE_RCD 2003
|
||||
OSSL_CORE_MAKE_FUNC(int, SSL_QUIC_TLS_crypto_release_rcd,
|
||||
(SSL * s, size_t bytes_read, void *arg))
|
||||
(SSL *s, size_t bytes_read, void *arg))
|
||||
#define OSSL_FUNC_SSL_QUIC_TLS_YIELD_SECRET 2004
|
||||
OSSL_CORE_MAKE_FUNC(int, SSL_QUIC_TLS_yield_secret,
|
||||
(SSL * s, uint32_t prot_level, int direction,
|
||||
(SSL *s, uint32_t prot_level, int direction,
|
||||
const unsigned char *secret, size_t secret_len, void *arg))
|
||||
#define OSSL_FUNC_SSL_QUIC_TLS_GOT_TRANSPORT_PARAMS 2005
|
||||
OSSL_CORE_MAKE_FUNC(int, SSL_QUIC_TLS_got_transport_params,
|
||||
(SSL * s, const unsigned char *params, size_t params_len,
|
||||
(SSL *s, const unsigned char *params, size_t params_len,
|
||||
void *arg))
|
||||
#define OSSL_FUNC_SSL_QUIC_TLS_ALERT 2006
|
||||
OSSL_CORE_MAKE_FUNC(int, SSL_QUIC_TLS_alert,
|
||||
(SSL * s, unsigned char alert_code, void *arg))
|
||||
(SSL *s, unsigned char alert_code, void *arg))
|
||||
|
||||
/* Operations */
|
||||
|
||||
|
||||
@@ -399,21 +399,21 @@ ENGINE_FUNC_NOARGS(ENGINE *, ENGINE_get_last, NULL)
|
||||
/* Iterate to the next/previous "ENGINE" type (NULL = end of the list). */
|
||||
#ifndef OPENSSL_NO_DEPRECATED_3_0
|
||||
/* OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_next(ENGINE *e); */
|
||||
ENGINE_FUNC(ENGINE *, ENGINE_get_next, (ENGINE * e), NULL)
|
||||
ENGINE_FUNC(ENGINE *, ENGINE_get_next, (ENGINE *e), NULL)
|
||||
|
||||
/* OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_prev(ENGINE *e); */
|
||||
ENGINE_FUNC(ENGINE *, ENGINE_get_prev, (ENGINE * e), NULL)
|
||||
ENGINE_FUNC(ENGINE *, ENGINE_get_prev, (ENGINE *e), NULL)
|
||||
|
||||
#endif
|
||||
/* Add another "ENGINE" type into the array. */
|
||||
#ifndef OPENSSL_NO_DEPRECATED_3_0
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_add(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_add, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_add, (ENGINE *e), 0)
|
||||
#endif
|
||||
/* Remove an existing "ENGINE" type from the array. */
|
||||
#ifndef OPENSSL_NO_DEPRECATED_3_0
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_remove(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_remove, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_remove, (ENGINE *e), 0)
|
||||
#endif
|
||||
/* Retrieve an engine from the list by its unique "id" value. */
|
||||
#ifndef OPENSSL_NO_DEPRECATED_3_0
|
||||
@@ -458,57 +458,57 @@ ENGINE_VOID_FUNC(ENGINE_set_table_flags, (unsigned int flags))
|
||||
*/
|
||||
#ifndef OPENSSL_NO_DEPRECATED_3_0
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_RSA(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_register_RSA, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_register_RSA, (ENGINE *e), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 void ENGINE_unregister_RSA(ENGINE *e); */
|
||||
ENGINE_VOID_FUNC(ENGINE_unregister_RSA, (ENGINE * e))
|
||||
ENGINE_VOID_FUNC(ENGINE_unregister_RSA, (ENGINE *e))
|
||||
/* OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_RSA(void); */
|
||||
ENGINE_VOID_FUNC_NOARGS(ENGINE_register_all_RSA)
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_DSA(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_register_DSA, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_register_DSA, (ENGINE *e), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 void ENGINE_unregister_DSA(ENGINE *e); */
|
||||
ENGINE_VOID_FUNC(ENGINE_unregister_DSA, (ENGINE * e))
|
||||
ENGINE_VOID_FUNC(ENGINE_unregister_DSA, (ENGINE *e))
|
||||
/* OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_DSA(void); */
|
||||
ENGINE_VOID_FUNC_NOARGS(ENGINE_register_all_DSA)
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_EC(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_register_EC, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_register_EC, (ENGINE *e), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 void ENGINE_unregister_EC(ENGINE *e); */
|
||||
ENGINE_VOID_FUNC(ENGINE_unregister_EC, (ENGINE * e))
|
||||
ENGINE_VOID_FUNC(ENGINE_unregister_EC, (ENGINE *e))
|
||||
/* OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_EC(void); */
|
||||
ENGINE_VOID_FUNC_NOARGS(ENGINE_unregister_all_EC)
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_DH(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_register_DH, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_register_DH, (ENGINE *e), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 void ENGINE_unregister_DH(ENGINE *e); */
|
||||
ENGINE_VOID_FUNC(ENGINE_unregister_DH, (ENGINE * e))
|
||||
ENGINE_VOID_FUNC(ENGINE_unregister_DH, (ENGINE *e))
|
||||
/* OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_DH(void); */
|
||||
ENGINE_VOID_FUNC_NOARGS(ENGINE_register_all_DH)
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_RAND(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_register_RAND, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_register_RAND, (ENGINE *e), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 void ENGINE_unregister_RAND(ENGINE *e); */
|
||||
ENGINE_VOID_FUNC(ENGINE_unregister_RAND, (ENGINE * e))
|
||||
ENGINE_VOID_FUNC(ENGINE_unregister_RAND, (ENGINE *e))
|
||||
/* OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_RAND(void); */
|
||||
ENGINE_VOID_FUNC_NOARGS(ENGINE_register_all_RAND)
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_ciphers(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_register_ciphers, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_register_ciphers, (ENGINE *e), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 void ENGINE_unregister_ciphers(ENGINE *e); */
|
||||
ENGINE_VOID_FUNC(ENGINE_unregister_ciphers, (ENGINE * e))
|
||||
ENGINE_VOID_FUNC(ENGINE_unregister_ciphers, (ENGINE *e))
|
||||
/* OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_ciphers(void); */
|
||||
ENGINE_VOID_FUNC_NOARGS(ENGINE_register_all_ciphers)
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_digests(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_register_digests, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_register_digests, (ENGINE *e), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 void ENGINE_unregister_digests(ENGINE *e); */
|
||||
ENGINE_VOID_FUNC(ENGINE_unregister_digests, (ENGINE * e))
|
||||
ENGINE_VOID_FUNC(ENGINE_unregister_digests, (ENGINE *e))
|
||||
/* OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_digests(void); */
|
||||
ENGINE_VOID_FUNC_NOARGS(ENGINE_register_all_digests)
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_pkey_meths(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_register_pkey_meths, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_register_pkey_meths, (ENGINE *e), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 void ENGINE_unregister_pkey_meths(ENGINE *e); */
|
||||
ENGINE_VOID_FUNC(ENGINE_unregister_pkey_meths, (ENGINE * e))
|
||||
ENGINE_VOID_FUNC(ENGINE_unregister_pkey_meths, (ENGINE *e))
|
||||
/* OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_pkey_meths(void); */
|
||||
ENGINE_VOID_FUNC_NOARGS(ENGINE_register_all_pkey_meths)
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_pkey_asn1_meths(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_register_pkey_asn1_meths, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_register_pkey_asn1_meths, (ENGINE *e), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 void ENGINE_unregister_pkey_asn1_meths(ENGINE *e); */
|
||||
ENGINE_VOID_FUNC(ENGINE_unregister_pkey_asn1_meths, (ENGINE * e))
|
||||
ENGINE_VOID_FUNC(ENGINE_unregister_pkey_asn1_meths, (ENGINE *e))
|
||||
/* OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_pkey_asn1_meths(void); */
|
||||
ENGINE_VOID_FUNC_NOARGS(ENGINE_register_all_pkey_asn1_meths)
|
||||
#endif
|
||||
@@ -521,7 +521,7 @@ ENGINE_VOID_FUNC_NOARGS(ENGINE_register_all_pkey_asn1_meths)
|
||||
*/
|
||||
#ifndef OPENSSL_NO_DEPRECATED_3_0
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_complete(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_register_complete, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_register_complete, (ENGINE *e), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_all_complete(void); */
|
||||
ENGINE_FUNC_NOARGS(int, ENGINE_register_all_complete, 0)
|
||||
#endif
|
||||
@@ -541,7 +541,7 @@ ENGINE_FUNC_NOARGS(int, ENGINE_register_all_complete, 0)
|
||||
* OSSL_DEPRECATEDIN_3_0 int ENGINE_ctrl(ENGINE *e, int cmd, long i, void *p,
|
||||
* void (*f) (void));
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_ctrl, (ENGINE * e, int cmd, long i, void *p, void (*f)(void)), 0)
|
||||
ENGINE_FUNC(int, ENGINE_ctrl, (ENGINE *e, int cmd, long i, void *p, void (*f)(void)), 0)
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -552,7 +552,7 @@ ENGINE_FUNC(int, ENGINE_ctrl, (ENGINE * e, int cmd, long i, void *p, void (*f)(v
|
||||
*/
|
||||
#ifndef OPENSSL_NO_DEPRECATED_3_0
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_cmd_is_executable(ENGINE *e, int cmd); */
|
||||
ENGINE_FUNC(int, ENGINE_cmd_is_executable, (ENGINE * e, int cmd), 0)
|
||||
ENGINE_FUNC(int, ENGINE_cmd_is_executable, (ENGINE *e, int cmd), 0)
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -567,7 +567,7 @@ ENGINE_FUNC(int, ENGINE_cmd_is_executable, (ENGINE * e, int cmd), 0)
|
||||
* long i, void *p, void (*f) (void),
|
||||
* int cmd_optional);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_ctrl_cmd, (ENGINE * e, const char *cmd_name, long i, void *p, void (*f)(void), int cmd_optional), 0)
|
||||
ENGINE_FUNC(int, ENGINE_ctrl_cmd, (ENGINE *e, const char *cmd_name, long i, void *p, void (*f)(void), int cmd_optional), 0)
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -599,7 +599,7 @@ ENGINE_FUNC(int, ENGINE_ctrl_cmd, (ENGINE * e, const char *cmd_name, long i, voi
|
||||
* int cmd_optional);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_ctrl_cmd_string,
|
||||
(ENGINE * e, const char *cmd_name, const char *arg, int cmd_optional), 0)
|
||||
(ENGINE *e, const char *cmd_name, const char *arg, int cmd_optional), 0)
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -614,111 +614,111 @@ ENGINE_FUNC(int, ENGINE_ctrl_cmd_string,
|
||||
/* OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_new(void); */
|
||||
ENGINE_FUNC_NOARGS(ENGINE *, ENGINE_new, NULL)
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_free(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_free, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_free, (ENGINE *e), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_up_ref(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_up_ref, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_up_ref, (ENGINE *e), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_id(ENGINE *e, const char *id); */
|
||||
ENGINE_FUNC(int, ENGINE_set_id, (ENGINE * e, const char *id), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_id, (ENGINE *e, const char *id), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_name(ENGINE *e, const char *name); */
|
||||
ENGINE_FUNC(int, ENGINE_set_name, (ENGINE * e, const char *name), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_name, (ENGINE *e, const char *name), 0)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* int ENGINE_set_RSA(ENGINE *e, const RSA_METHOD *rsa_meth);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_set_RSA, (ENGINE * e, const RSA_METHOD *rsa_meth), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_RSA, (ENGINE *e, const RSA_METHOD *rsa_meth), 0)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_set_DSA, (ENGINE * e, const DSA_METHOD *dsa_meth), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_DSA, (ENGINE *e, const DSA_METHOD *dsa_meth), 0)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* int ENGINE_set_EC(ENGINE *e, const EC_KEY_METHOD *ecdsa_meth);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_set_EC, (ENGINE * e, const EC_KEY_METHOD *ecdsa_meth), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_EC, (ENGINE *e, const EC_KEY_METHOD *ecdsa_meth), 0)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* int ENGINE_set_DH(ENGINE *e, const DH_METHOD *dh_meth);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_set_DH, (ENGINE * e, const DH_METHOD *dh_meth), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_DH, (ENGINE *e, const DH_METHOD *dh_meth), 0)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* int ENGINE_set_RAND(ENGINE *e, const RAND_METHOD *rand_meth);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_set_RAND, (ENGINE * e, const RAND_METHOD *rand_meth), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_RAND, (ENGINE *e, const RAND_METHOD *rand_meth), 0)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* int ENGINE_set_destroy_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR destroy_f);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_set_destroy_function,
|
||||
(ENGINE * e, ENGINE_GEN_INT_FUNC_PTR destroy_f), 0)
|
||||
(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR destroy_f), 0)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* int ENGINE_set_init_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR init_f);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_set_init_function,
|
||||
(ENGINE * e, ENGINE_GEN_INT_FUNC_PTR init_f), 0)
|
||||
(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR init_f), 0)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* int ENGINE_set_finish_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR finish_f);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_set_finish_function,
|
||||
(ENGINE * e, ENGINE_GEN_INT_FUNC_PTR finish_f), 0)
|
||||
(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR finish_f), 0)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* int ENGINE_set_ctrl_function(ENGINE *e, ENGINE_CTRL_FUNC_PTR ctrl_f);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_set_ctrl_function,
|
||||
(ENGINE * e, ENGINE_CTRL_FUNC_PTR ctrl_f), 0)
|
||||
(ENGINE *e, ENGINE_CTRL_FUNC_PTR ctrl_f), 0)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* int ENGINE_set_load_privkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpriv_f);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_set_load_privkey_function,
|
||||
(ENGINE * e, ENGINE_LOAD_KEY_PTR loadpriv_f), 0)
|
||||
(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpriv_f), 0)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* int ENGINE_set_load_pubkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpub_f);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_set_load_pubkey_function,
|
||||
(ENGINE * e, ENGINE_LOAD_KEY_PTR loadpub_f), 0)
|
||||
(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpub_f), 0)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* int ENGINE_set_load_ssl_client_cert_function(ENGINE *e,
|
||||
* ENGINE_SSL_CLIENT_CERT_PTR loadssl_f);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_set_load_ssl_client_cert_function,
|
||||
(ENGINE * e, ENGINE_SSL_CLIENT_CERT_PTR loadssl_f), 0)
|
||||
(ENGINE *e, ENGINE_SSL_CLIENT_CERT_PTR loadssl_f), 0)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* int ENGINE_set_ciphers(ENGINE *e, ENGINE_CIPHERS_PTR f);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_set_ciphers, (ENGINE * e, ENGINE_CIPHERS_PTR f), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_ciphers, (ENGINE *e, ENGINE_CIPHERS_PTR f), 0)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* int ENGINE_set_digests(ENGINE *e, ENGINE_DIGESTS_PTR f);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_set_digests, (ENGINE * e, ENGINE_DIGESTS_PTR f), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_digests, (ENGINE *e, ENGINE_DIGESTS_PTR f), 0)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* int ENGINE_set_pkey_meths(ENGINE *e, ENGINE_PKEY_METHS_PTR f);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_set_pkey_meths, (ENGINE * e, ENGINE_PKEY_METHS_PTR f), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_pkey_meths, (ENGINE *e, ENGINE_PKEY_METHS_PTR f), 0)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* int ENGINE_set_pkey_asn1_meths(ENGINE *e, ENGINE_PKEY_ASN1_METHS_PTR f);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_set_pkey_asn1_meths, (ENGINE * e, ENGINE_PKEY_ASN1_METHS_PTR f),
|
||||
ENGINE_FUNC(int, ENGINE_set_pkey_asn1_meths, (ENGINE *e, ENGINE_PKEY_ASN1_METHS_PTR f),
|
||||
0)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_flags(ENGINE *e, int flags);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_set_flags, (ENGINE * e, int flags), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_flags, (ENGINE *e, int flags), 0)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* int ENGINE_set_cmd_defns(ENGINE *e, const ENGINE_CMD_DEFN *defns);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_set_cmd_defns, (ENGINE * e, const ENGINE_CMD_DEFN *defns), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_cmd_defns, (ENGINE *e, const ENGINE_CMD_DEFN *defns), 0)
|
||||
#endif
|
||||
/* These functions allow control over any per-structure ENGINE data. */
|
||||
#ifndef OPENSSL_ENGINE_STUBS
|
||||
@@ -732,9 +732,9 @@ ENGINE_FUNC(int, ENGINE_get_ex_new_index, (long l, void *p, CRYPTO_EX_new *newf,
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* int ENGINE_set_ex_data(ENGINE *e, int idx, void *arg);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_set_ex_data, (ENGINE * e, int idx, void *arg), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_ex_data, (ENGINE *e, int idx, void *arg), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 void *ENGINE_get_ex_data(const ENGINE *e, int idx); */
|
||||
ENGINE_FUNC(void *, ENGINE_get_ex_data, (ENGINE * e, int idx), NULL)
|
||||
ENGINE_FUNC(void *, ENGINE_get_ex_data, (ENGINE *e, int idx), NULL)
|
||||
#endif
|
||||
|
||||
#ifndef OPENSSL_NO_DEPRECATED_1_1_0
|
||||
@@ -839,39 +839,39 @@ ENGINE_FUNC(ENGINE_PKEY_ASN1_METHS_PTR, ENGINE_get_pkey_asn1_meths,
|
||||
* const EVP_CIPHER *ENGINE_get_cipher(ENGINE *e, int nid);
|
||||
*/
|
||||
ENGINE_FUNC(const EVP_CIPHER *, ENGINE_get_cipher,
|
||||
(ENGINE * e, int nid), NULL)
|
||||
(ENGINE *e, int nid), NULL)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* const EVP_MD *ENGINE_get_digest(ENGINE *e, int nid);
|
||||
*/
|
||||
ENGINE_FUNC(const EVP_MD *, ENGINE_get_digest,
|
||||
(ENGINE * e, int nid), NULL)
|
||||
(ENGINE *e, int nid), NULL)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* const EVP_PKEY_METHOD *ENGINE_get_pkey_meth(ENGINE *e, int nid);
|
||||
*/
|
||||
ENGINE_FUNC(const EVP_PKEY_METHOD *, ENGINE_get_pkey_meth,
|
||||
(ENGINE * e, int nid), NULL)
|
||||
(ENGINE *e, int nid), NULL)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth(ENGINE *e, int nid);
|
||||
*/
|
||||
ENGINE_FUNC(const EVP_PKEY_ASN1_METHOD *, ENGINE_get_pkey_asn1_meth,
|
||||
(ENGINE * e, int nid), NULL)
|
||||
(ENGINE *e, int nid), NULL)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth_str(ENGINE *e,
|
||||
* const char *str, int len);
|
||||
*/
|
||||
ENGINE_FUNC(const EVP_PKEY_ASN1_METHOD *, ENGINE_get_pkey_asn1_meth_str,
|
||||
(ENGINE * e, const char *str, int len), NULL)
|
||||
(ENGINE *e, const char *str, int len), NULL)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* const EVP_PKEY_ASN1_METHOD *ENGINE_pkey_asn1_find_str(ENGINE **pe,
|
||||
* const char *str, int len);
|
||||
*/
|
||||
ENGINE_FUNC(const EVP_PKEY_ASN1_METHOD *, ENGINE_pkey_asn1_find_str,
|
||||
(ENGINE * *pe, const char *str, int len), NULL)
|
||||
(ENGINE **pe, const char *str, int len), NULL)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* const ENGINE_CMD_DEFN *ENGINE_get_cmd_defns(const ENGINE *e);
|
||||
@@ -902,7 +902,7 @@ ENGINE_FUNC(int, ENGINE_get_flags, (const ENGINE *e), 0)
|
||||
*/
|
||||
#ifndef OPENSSL_NO_DEPRECATED_3_0
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_init(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_init, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_init, (ENGINE *e), 0)
|
||||
#endif
|
||||
/*
|
||||
* Free a functional reference to an engine type. This does not require a
|
||||
@@ -911,7 +911,7 @@ ENGINE_FUNC(int, ENGINE_init, (ENGINE * e), 0)
|
||||
*/
|
||||
#ifndef OPENSSL_NO_DEPRECATED_3_0
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_finish(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_finish, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_finish, (ENGINE *e), 0)
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -926,7 +926,7 @@ ENGINE_FUNC(int, ENGINE_finish, (ENGINE * e), 0)
|
||||
* UI_METHOD *ui_method, void *callback_data);
|
||||
*/
|
||||
ENGINE_FUNC(EVP_PKEY *, ENGINE_load_private_key,
|
||||
(ENGINE * e, const char *key_id, UI_METHOD *ui_method,
|
||||
(ENGINE *e, const char *key_id, UI_METHOD *ui_method,
|
||||
void *callback_data),
|
||||
NULL)
|
||||
/*
|
||||
@@ -935,7 +935,7 @@ ENGINE_FUNC(EVP_PKEY *, ENGINE_load_private_key,
|
||||
* UI_METHOD *ui_method, void *callback_data);
|
||||
*/
|
||||
ENGINE_FUNC(EVP_PKEY *, ENGINE_load_public_key,
|
||||
(ENGINE * e, const char *key_id, UI_METHOD *ui_method,
|
||||
(ENGINE *e, const char *key_id, UI_METHOD *ui_method,
|
||||
void *callback_data),
|
||||
NULL)
|
||||
/*
|
||||
@@ -946,7 +946,7 @@ ENGINE_FUNC(EVP_PKEY *, ENGINE_load_public_key,
|
||||
* UI_METHOD *ui_method, void *callback_data);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_load_ssl_client_cert,
|
||||
(ENGINE * e, SSL *s, STACK_OF(X509_NAME) *ca_dn, X509 **pcert,
|
||||
(ENGINE *e, SSL *s, STACK_OF(X509_NAME) *ca_dn, X509 **pcert,
|
||||
EVP_PKEY **ppkey, STACK_OF(X509) **pother, UI_METHOD *ui_method,
|
||||
void *callback_data),
|
||||
0)
|
||||
@@ -996,31 +996,31 @@ ENGINE_FUNC(ENGINE *, ENGINE_get_pkey_asn1_meth_engine, (int nid), NULL)
|
||||
*/
|
||||
#ifndef OPENSSL_NO_DEPRECATED_3_0
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_RSA(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_set_default_RSA, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_default_RSA, (ENGINE *e), 0)
|
||||
/*
|
||||
* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_string(ENGINE *e,
|
||||
* const char *def_list);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_set_default_string, (ENGINE * e, const char *def_list), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_default_string, (ENGINE *e, const char *def_list), 0)
|
||||
#endif
|
||||
/* Same for the other "methods" */
|
||||
#ifndef OPENSSL_NO_DEPRECATED_3_0
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_DSA(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_set_default_DSA, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_default_DSA, (ENGINE *e), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_EC(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_set_default_EC, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_default_EC, (ENGINE *e), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_DH(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_set_default_DH, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_default_DH, (ENGINE *e), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_RAND(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_set_default_RAND, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_default_RAND, (ENGINE *e), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_ciphers(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_set_default_ciphers, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_default_ciphers, (ENGINE *e), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_digests(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_set_default_digests, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_default_digests, (ENGINE *e), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_pkey_meths(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_set_default_pkey_meths, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_default_pkey_meths, (ENGINE *e), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_pkey_asn1_meths(ENGINE *e); */
|
||||
ENGINE_FUNC(int, ENGINE_set_default_pkey_asn1_meths, (ENGINE * e), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_default_pkey_asn1_meths, (ENGINE *e), 0)
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -1035,7 +1035,7 @@ ENGINE_FUNC(int, ENGINE_set_default_pkey_asn1_meths, (ENGINE * e), 0)
|
||||
* OSSL_DEPRECATEDIN_3_0
|
||||
* int ENGINE_set_default(ENGINE *e, unsigned int flags);
|
||||
*/
|
||||
ENGINE_FUNC(int, ENGINE_set_default, (ENGINE * e, unsigned int flags), 0)
|
||||
ENGINE_FUNC(int, ENGINE_set_default, (ENGINE *e, unsigned int flags), 0)
|
||||
/* OSSL_DEPRECATEDIN_3_0 void ENGINE_add_conf_module(void); */
|
||||
ENGINE_VOID_FUNC_NOARGS(ENGINE_add_conf_module)
|
||||
#endif
|
||||
@@ -1152,19 +1152,19 @@ ENGINE_VOID_FUNC_NOARGS(ENGINE_setup_bsd_cryptodev)
|
||||
ENGINE_FUNC_NOARGS(int, ossl_err_load_ENGINE_strings, 1)
|
||||
|
||||
/* int EVP_PKEY_set1_engine(EVP_PKEY *pkey, ENGINE *e); */
|
||||
ENGINE_FUNC(int, EVP_PKEY_set1_engine, (EVP_PKEY * pkey, ENGINE *e), 0)
|
||||
ENGINE_FUNC(int, EVP_PKEY_set1_engine, (EVP_PKEY *pkey, ENGINE *e), 0)
|
||||
|
||||
/* ENGINE *EVP_PKEY_get0_engine(const EVP_PKEY *pkey); */
|
||||
ENGINE_FUNC(ENGINE *, EVP_PKEY_get0_engine, (const EVP_PKEY *pkey), NULL)
|
||||
|
||||
/* ENGINE *DH_get0_engine(DH *d); */
|
||||
ENGINE_FUNC(ENGINE *, DH_get0_engine, (DH * d), NULL)
|
||||
ENGINE_FUNC(ENGINE *, DH_get0_engine, (DH *d), NULL)
|
||||
|
||||
/* ENGINE *RSA_get0_engine(const RSA *r); */
|
||||
ENGINE_FUNC(ENGINE *, RSA_get0_engine, (const RSA *r), NULL)
|
||||
|
||||
/* ENGINE *DSA_get0_engine(DSA *d); */
|
||||
ENGINE_FUNC(ENGINE *, DSA_get0_engine, (DSA * d), NULL)
|
||||
ENGINE_FUNC(ENGINE *, DSA_get0_engine, (DSA *d), NULL)
|
||||
|
||||
/* ENGINE *EC_KEY_get0_engine(const EC_KEY *eckey); */
|
||||
ENGINE_FUNC(ENGINE *, EC_KEY_get0_engine, (const EC_KEY *eckey), NULL)
|
||||
@@ -1174,14 +1174,14 @@ ENGINE_FUNC(const ENGINE *, OSSL_STORE_LOADER_get0_engine, (const OSSL_STORE_LOA
|
||||
NULL)
|
||||
|
||||
/* int RAND_set_rand_engine(ENGINE *engine); */
|
||||
ENGINE_FUNC(int, RAND_set_rand_engine, (ENGINE * engine), 0)
|
||||
ENGINE_FUNC(int, RAND_set_rand_engine, (ENGINE *engine), 0)
|
||||
|
||||
/*
|
||||
* int TS_CONF_set_crypto_device(CONF *conf, const char *section,
|
||||
* const char *device);
|
||||
*/
|
||||
ENGINE_FUNC(int, TS_CONF_set_crypto_device,
|
||||
(CONF * conf, const char *section, const char *device), 0)
|
||||
(CONF *conf, const char *section, const char *device), 0)
|
||||
|
||||
/* int TS_CONF_set_default_engine(const char *name); */
|
||||
ENGINE_FUNC(int, TS_CONF_set_default_engine, (const char *name), 0)
|
||||
@@ -1190,7 +1190,7 @@ ENGINE_FUNC(int, TS_CONF_set_default_engine, (const char *name), 0)
|
||||
ENGINE_FUNC_NOARGS(int, ERR_load_ENGINE_strings, 1)
|
||||
|
||||
/* int SSL_CTX_set_client_cert_engine(SSL_CTX *ctx, ENGINE *e); */
|
||||
ENGINE_FUNC(int, SSL_CTX_set_client_cert_engine, (SSL_CTX * ctx, ENGINE *e), 0)
|
||||
ENGINE_FUNC(int, SSL_CTX_set_client_cert_engine, (SSL_CTX *ctx, ENGINE *e), 0)
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user