From: Richard Levitte Date: Fri, 12 Dec 2025 15:44:45 +0000 (+0100) Subject: Redo source reformatting with the TypeNames added X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63e912b7581e85ca0eadcf950bbc70896b183b0e;p=thirdparty%2Fopenssl.git 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 Reviewed-by: Tomas Mraz Reviewed-by: Matt Caswell Reviewed-by: Neil Horman (Merged from https://github.com/openssl/openssl/pull/29383) --- diff --git a/crypto/bn/bn_dh.c b/crypto/bn/bn_dh.c index 542c33d6a8d..dcf4310637c 100644 --- a/crypto/bn/bn_dh.c +++ b/crypto/bn/bn_dh.c @@ -14,7 +14,7 @@ #include "crypto/bn_dh.h" #if BN_BITS2 == 64 -#define BN_DEF(lo, hi) (BN_ULONG) hi << 32 | lo +#define BN_DEF(lo, hi) (BN_ULONG)hi << 32 | lo #else #define BN_DEF(lo, hi) lo, hi #endif diff --git a/crypto/bn/bn_exp.c b/crypto/bn/bn_exp.c index a44b2d37129..87035b0d55a 100644 --- a/crypto/bn/bn_exp.c +++ b/crypto/bn/bn_exp.c @@ -772,16 +772,16 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, typedef int (*bn_pwr5_mont_f)(BN_ULONG *tp, const BN_ULONG *np, const BN_ULONG *n0, const void *table, int power, int bits); - int bn_pwr5_mont_t4_8(BN_ULONG * tp, const BN_ULONG *np, + int bn_pwr5_mont_t4_8(BN_ULONG *tp, const BN_ULONG *np, const BN_ULONG *n0, const void *table, int power, int bits); - int bn_pwr5_mont_t4_16(BN_ULONG * tp, const BN_ULONG *np, + int bn_pwr5_mont_t4_16(BN_ULONG *tp, const BN_ULONG *np, const BN_ULONG *n0, const void *table, int power, int bits); - int bn_pwr5_mont_t4_24(BN_ULONG * tp, const BN_ULONG *np, + int bn_pwr5_mont_t4_24(BN_ULONG *tp, const BN_ULONG *np, const BN_ULONG *n0, const void *table, int power, int bits); - int bn_pwr5_mont_t4_32(BN_ULONG * tp, const BN_ULONG *np, + int bn_pwr5_mont_t4_32(BN_ULONG *tp, const BN_ULONG *np, const BN_ULONG *n0, const void *table, int power, int bits); static const bn_pwr5_mont_f pwr5_funcs[4] = { @@ -793,15 +793,15 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, typedef int (*bn_mul_mont_f)(BN_ULONG *rp, const BN_ULONG *ap, const void *bp, const BN_ULONG *np, const BN_ULONG *n0); - int bn_mul_mont_t4_8(BN_ULONG * rp, const BN_ULONG *ap, const void *bp, + int bn_mul_mont_t4_8(BN_ULONG *rp, const BN_ULONG *ap, const void *bp, const BN_ULONG *np, const BN_ULONG *n0); - int bn_mul_mont_t4_16(BN_ULONG * rp, const BN_ULONG *ap, + int bn_mul_mont_t4_16(BN_ULONG *rp, const BN_ULONG *ap, const void *bp, const BN_ULONG *np, const BN_ULONG *n0); - int bn_mul_mont_t4_24(BN_ULONG * rp, const BN_ULONG *ap, + int bn_mul_mont_t4_24(BN_ULONG *rp, const BN_ULONG *ap, const void *bp, const BN_ULONG *np, const BN_ULONG *n0); - int bn_mul_mont_t4_32(BN_ULONG * rp, const BN_ULONG *ap, + int bn_mul_mont_t4_32(BN_ULONG *rp, const BN_ULONG *ap, const void *bp, const BN_ULONG *np, const BN_ULONG *n0); static const bn_mul_mont_f mul_funcs[4] = { @@ -810,20 +810,20 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, }; bn_mul_mont_f mul_worker = mul_funcs[top / 16 - 1]; - void bn_mul_mont_vis3(BN_ULONG * rp, const BN_ULONG *ap, + void bn_mul_mont_vis3(BN_ULONG *rp, const BN_ULONG *ap, const void *bp, const BN_ULONG *np, const BN_ULONG *n0, int num); - void bn_mul_mont_t4(BN_ULONG * rp, const BN_ULONG *ap, + void bn_mul_mont_t4(BN_ULONG *rp, const BN_ULONG *ap, const void *bp, const BN_ULONG *np, const BN_ULONG *n0, int num); - void bn_mul_mont_gather5_t4(BN_ULONG * rp, const BN_ULONG *ap, + void bn_mul_mont_gather5_t4(BN_ULONG *rp, const BN_ULONG *ap, const void *table, const BN_ULONG *np, const BN_ULONG *n0, int num, int power); void bn_flip_n_scatter5_t4(const BN_ULONG *inp, size_t num, void *table, size_t power); - void bn_gather5_t4(BN_ULONG * out, size_t num, + void bn_gather5_t4(BN_ULONG *out, size_t num, void *table, size_t power); - void bn_flip_t4(BN_ULONG * dst, BN_ULONG * src, size_t num); + void bn_flip_t4(BN_ULONG *dst, BN_ULONG *src, size_t num); BN_ULONG *np = mont->N.d, *n0 = mont->n0; int stride = 5 * (6 - (top / 16 - 1)); /* multiple of 5, but less @@ -923,13 +923,13 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, * Given those inputs, |bn_mul_mont| may not give reduced * output, but it will still produce "almost" reduced output. */ - void bn_mul_mont_gather5(BN_ULONG * rp, const BN_ULONG *ap, + void bn_mul_mont_gather5(BN_ULONG *rp, const BN_ULONG *ap, const void *table, const BN_ULONG *np, const BN_ULONG *n0, int num, int power); void bn_scatter5(const BN_ULONG *inp, size_t num, void *table, size_t power); - void bn_gather5(BN_ULONG * out, size_t num, void *table, size_t power); - void bn_power5(BN_ULONG * rp, const BN_ULONG *ap, + void bn_gather5(BN_ULONG *out, size_t num, void *table, size_t power); + void bn_power5(BN_ULONG *rp, const BN_ULONG *ap, const void *table, const BN_ULONG *np, const BN_ULONG *n0, int num, int power); int bn_get_bits5(const BN_ULONG *ap, int off); diff --git a/crypto/bn/bn_local.h b/crypto/bn/bn_local.h index 32d27cd1d3b..5dcec96c4fc 100644 --- a/crypto/bn/bn_local.h +++ b/crypto/bn/bn_local.h @@ -385,7 +385,7 @@ struct bn_gencb_st { #elif defined(__alpha) && (defined(SIXTY_FOUR_BIT_LONG) || defined(SIXTY_FOUR_BIT)) #if defined(__DECC) #include -#define BN_UMULT_HIGH(a, b) (BN_ULONG) asm("umulh %a0,%a1,%v0", (a), (b)) +#define BN_UMULT_HIGH(a, b) (BN_ULONG)asm("umulh %a0,%a1,%v0", (a), (b)) #elif defined(__GNUC__) && __GNUC__ >= 2 #define BN_UMULT_HIGH(a, b) ({ \ register BN_ULONG ret; \ diff --git a/crypto/bn/bn_ppc.c b/crypto/bn/bn_ppc.c index 049ffa50da9..5a5f9b04b1a 100644 --- a/crypto/bn/bn_ppc.c +++ b/crypto/bn/bn_ppc.c @@ -15,14 +15,14 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np, const BN_ULONG *n0, int num) { - int bn_mul_mont_int(BN_ULONG * rp, const BN_ULONG *ap, const BN_ULONG *bp, + int bn_mul_mont_int(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np, const BN_ULONG *n0, int num); - int bn_mul4x_mont_int(BN_ULONG * rp, const BN_ULONG *ap, const BN_ULONG *bp, + int bn_mul4x_mont_int(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np, const BN_ULONG *n0, int num); - int bn_mul_mont_fixed_n6(BN_ULONG * rp, const BN_ULONG *ap, + int bn_mul_mont_fixed_n6(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np, const BN_ULONG *n0, int num); - int bn_mul_mont_300_fixed_n6(BN_ULONG * rp, const BN_ULONG *ap, + int bn_mul_mont_300_fixed_n6(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np, const BN_ULONG *n0, int num); diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c index 6e911b4cbf9..cfaf0a96b3b 100644 --- a/crypto/bn/bn_prime.c +++ b/crypto/bn/bn_prime.c @@ -30,7 +30,7 @@ static int bn_is_prime_int(const BIGNUM *w, int checks, BN_CTX *ctx, #define square(x) ((BN_ULONG)(x) * (BN_ULONG)(x)) #if BN_BITS2 == 64 -#define BN_DEF(lo, hi) (BN_ULONG) hi << 32 | lo +#define BN_DEF(lo, hi) (BN_ULONG)hi << 32 | lo #else #define BN_DEF(lo, hi) lo, hi #endif diff --git a/crypto/bn/bn_rsa_fips186_5.c b/crypto/bn/bn_rsa_fips186_5.c index d483ba3ae51..635f013f732 100644 --- a/crypto/bn/bn_rsa_fips186_5.c +++ b/crypto/bn/bn_rsa_fips186_5.c @@ -29,7 +29,7 @@ #include "internal/nelem.h" #if BN_BITS2 == 64 -#define BN_DEF(lo, hi) (BN_ULONG) hi << 32 | lo +#define BN_DEF(lo, hi) (BN_ULONG)hi << 32 | lo #else #define BN_DEF(lo, hi) lo, hi #endif diff --git a/crypto/bn/bn_sparc.c b/crypto/bn/bn_sparc.c index a236e42dfae..c58b25c3da9 100644 --- a/crypto/bn/bn_sparc.c +++ b/crypto/bn/bn_sparc.c @@ -16,11 +16,11 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np, const BN_ULONG *n0, int num) { - int bn_mul_mont_vis3(BN_ULONG * rp, const BN_ULONG *ap, const BN_ULONG *bp, + int bn_mul_mont_vis3(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np, const BN_ULONG *n0, int num); - int bn_mul_mont_fpu(BN_ULONG * rp, const BN_ULONG *ap, const BN_ULONG *bp, + int bn_mul_mont_fpu(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np, const BN_ULONG *n0, int num); - int bn_mul_mont_int(BN_ULONG * rp, const BN_ULONG *ap, const BN_ULONG *bp, + int bn_mul_mont_int(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np, const BN_ULONG *n0, int num); if (!(num & 1) && num >= 6) { @@ -29,16 +29,16 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *bp, const BN_ULONG *np, const BN_ULONG *n0); - int bn_mul_mont_t4_8(BN_ULONG * rp, const BN_ULONG *ap, + int bn_mul_mont_t4_8(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np, const BN_ULONG *n0); - int bn_mul_mont_t4_16(BN_ULONG * rp, const BN_ULONG *ap, + int bn_mul_mont_t4_16(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np, const BN_ULONG *n0); - int bn_mul_mont_t4_24(BN_ULONG * rp, const BN_ULONG *ap, + int bn_mul_mont_t4_24(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np, const BN_ULONG *n0); - int bn_mul_mont_t4_32(BN_ULONG * rp, const BN_ULONG *ap, + int bn_mul_mont_t4_32(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np, const BN_ULONG *n0); static const bn_mul_mont_f funcs[4] = { diff --git a/crypto/cms/cms_local.h b/crypto/cms/cms_local.h index 24426d57477..65d3661f8a9 100644 --- a/crypto/cms/cms_local.h +++ b/crypto/cms/cms_local.h @@ -35,8 +35,7 @@ typedef struct CMS_OriginatorPublicKey_st CMS_OriginatorPublicKey; typedef struct CMS_OriginatorIdentifierOrKey_st CMS_OriginatorIdentifierOrKey; typedef struct CMS_KeyAgreeRecipientInfo_st CMS_KeyAgreeRecipientInfo; typedef struct CMS_RecipientKeyIdentifier_st CMS_RecipientKeyIdentifier; -typedef struct CMS_KeyAgreeRecipientIdentifier_st - CMS_KeyAgreeRecipientIdentifier; +typedef struct CMS_KeyAgreeRecipientIdentifier_st CMS_KeyAgreeRecipientIdentifier; typedef struct CMS_KEKIdentifier_st CMS_KEKIdentifier; typedef struct CMS_KEKRecipientInfo_st CMS_KEKRecipientInfo; typedef struct CMS_PasswordRecipientInfo_st CMS_PasswordRecipientInfo; diff --git a/crypto/x509/x_pubkey.c b/crypto/x509/x_pubkey.c index 942b113c718..301e3261ab4 100644 --- a/crypto/x509/x_pubkey.c +++ b/crypto/x509/x_pubkey.c @@ -64,8 +64,7 @@ ASN1_SEQUENCE(X509_PUBKEY_INTERNAL) = { ASN1_SIMPLE(X509_PUBKEY, public_key, ASN1_BIT_STRING) } static_ASN1_SEQUENCE_END_name(X509_PUBKEY, X509_PUBKEY_INTERNAL) -X509_PUBKEY -*ossl_d2i_X509_PUBKEY_INTERNAL(const unsigned char **pp, long len, OSSL_LIB_CTX *libctx, const char *propq) +X509_PUBKEY *ossl_d2i_X509_PUBKEY_INTERNAL(const unsigned char **pp, long len, OSSL_LIB_CTX *libctx, const char *propq) { X509_PUBKEY *xpub = OPENSSL_zalloc(sizeof(*xpub)); diff --git a/include/crypto/lms_util.h b/include/crypto/lms_util.h index 6bd6cfec81b..d56b0027193 100644 --- a/include/crypto/lms_util.h +++ b/include/crypto/lms_util.h @@ -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); diff --git a/include/crypto/sparse_array.h b/include/crypto/sparse_array.h index d2629000eea..d452bfbe06f 100644 --- a/include/crypto/sparse_array.h +++ b/include/crypto/sparse_array.h @@ -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); \ } \ diff --git a/include/internal/constant_time.h b/include/internal/constant_time.h index 34f2b78329d..c27f52a153d 100644 --- a/include/internal/constant_time.h +++ b/include/internal/constant_time.h @@ -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__) diff --git a/include/internal/time.h b/include/internal/time.h index 2a54c491f16..7d223da1f8a 100644 --- a/include/internal/time.h +++ b/include/internal/time.h @@ -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; } diff --git a/include/openssl/core_dispatch.h b/include/openssl/core_dispatch.h index acdf1543320..63383d91957 100644 --- a/include/openssl/core_dispatch.h +++ b/include/openssl/core_dispatch.h @@ -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 */ diff --git a/include/openssl/engine.h b/include/openssl/engine.h index 929aca52d0d..be4d25527b8 100644 --- a/include/openssl/engine.h +++ b/include/openssl/engine.h @@ -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 } diff --git a/providers/implementations/ciphers/cipher_aes_ocb.c b/providers/implementations/ciphers/cipher_aes_ocb.c index 64706941e0f..31ceb4b6376 100644 --- a/providers/implementations/ciphers/cipher_aes_ocb.c +++ b/providers/implementations/ciphers/cipher_aes_ocb.c @@ -28,7 +28,7 @@ #define OCB_MIN_IV_LEN 1 #define OCB_MAX_IV_LEN 15 -PROV_CIPHER_FUNC(int, ocb_cipher, (PROV_AES_OCB_CTX * ctx, const unsigned char *in, unsigned char *out, size_t nextblock)); +PROV_CIPHER_FUNC(int, ocb_cipher, (PROV_AES_OCB_CTX *ctx, const unsigned char *in, unsigned char *out, size_t nextblock)); /* forward declarations */ static OSSL_FUNC_cipher_encrypt_init_fn aes_ocb_einit; static OSSL_FUNC_cipher_decrypt_init_fn aes_ocb_dinit; diff --git a/providers/implementations/include/prov/ciphercommon_ccm.h b/providers/implementations/include/prov/ciphercommon_ccm.h index 7e775f53762..ffe25506444 100644 --- a/providers/implementations/include/prov/ciphercommon_ccm.h +++ b/providers/implementations/include/prov/ciphercommon_ccm.h @@ -48,13 +48,13 @@ typedef struct prov_ccm_st { const PROV_CCM_HW *hw; /* hardware specific methods */ } PROV_CCM_CTX; -PROV_CIPHER_FUNC(int, CCM_cipher, (PROV_CCM_CTX * ctx, unsigned char *out, size_t *padlen, const unsigned char *in, size_t len)); -PROV_CIPHER_FUNC(int, CCM_setkey, (PROV_CCM_CTX * ctx, const unsigned char *key, size_t keylen)); -PROV_CIPHER_FUNC(int, CCM_setiv, (PROV_CCM_CTX * dat, const unsigned char *iv, size_t ivlen, size_t mlen)); -PROV_CIPHER_FUNC(int, CCM_setaad, (PROV_CCM_CTX * ctx, const unsigned char *aad, size_t aadlen)); -PROV_CIPHER_FUNC(int, CCM_auth_encrypt, (PROV_CCM_CTX * ctx, const unsigned char *in, unsigned char *out, size_t len, unsigned char *tag, size_t taglen)); -PROV_CIPHER_FUNC(int, CCM_auth_decrypt, (PROV_CCM_CTX * ctx, const unsigned char *in, unsigned char *out, size_t len, unsigned char *tag, size_t taglen)); -PROV_CIPHER_FUNC(int, CCM_gettag, (PROV_CCM_CTX * ctx, unsigned char *tag, size_t taglen)); +PROV_CIPHER_FUNC(int, CCM_cipher, (PROV_CCM_CTX *ctx, unsigned char *out, size_t *padlen, const unsigned char *in, size_t len)); +PROV_CIPHER_FUNC(int, CCM_setkey, (PROV_CCM_CTX *ctx, const unsigned char *key, size_t keylen)); +PROV_CIPHER_FUNC(int, CCM_setiv, (PROV_CCM_CTX *dat, const unsigned char *iv, size_t ivlen, size_t mlen)); +PROV_CIPHER_FUNC(int, CCM_setaad, (PROV_CCM_CTX *ctx, const unsigned char *aad, size_t aadlen)); +PROV_CIPHER_FUNC(int, CCM_auth_encrypt, (PROV_CCM_CTX *ctx, const unsigned char *in, unsigned char *out, size_t len, unsigned char *tag, size_t taglen)); +PROV_CIPHER_FUNC(int, CCM_auth_decrypt, (PROV_CCM_CTX *ctx, const unsigned char *in, unsigned char *out, size_t len, unsigned char *tag, size_t taglen)); +PROV_CIPHER_FUNC(int, CCM_gettag, (PROV_CCM_CTX *ctx, unsigned char *tag, size_t taglen)); /* * CCM Mode internal method table used to handle hardware specific differences, diff --git a/providers/implementations/include/prov/ciphercommon_gcm.h b/providers/implementations/include/prov/ciphercommon_gcm.h index cdca3481a05..9763cf7b5c2 100644 --- a/providers/implementations/include/prov/ciphercommon_gcm.h +++ b/providers/implementations/include/prov/ciphercommon_gcm.h @@ -81,12 +81,12 @@ typedef struct prov_gcm_ctx_st { ctr128_f ctr; } PROV_GCM_CTX; -PROV_CIPHER_FUNC(int, GCM_setkey, (PROV_GCM_CTX * ctx, const unsigned char *key, size_t keylen)); -PROV_CIPHER_FUNC(int, GCM_setiv, (PROV_GCM_CTX * dat, const unsigned char *iv, size_t ivlen)); -PROV_CIPHER_FUNC(int, GCM_aadupdate, (PROV_GCM_CTX * ctx, const unsigned char *aad, size_t aadlen)); -PROV_CIPHER_FUNC(int, GCM_cipherupdate, (PROV_GCM_CTX * ctx, const unsigned char *in, size_t len, unsigned char *out)); -PROV_CIPHER_FUNC(int, GCM_cipherfinal, (PROV_GCM_CTX * ctx, unsigned char *tag)); -PROV_CIPHER_FUNC(int, GCM_oneshot, (PROV_GCM_CTX * ctx, unsigned char *aad, size_t aad_len, const unsigned char *in, size_t in_len, unsigned char *out, unsigned char *tag, size_t taglen)); +PROV_CIPHER_FUNC(int, GCM_setkey, (PROV_GCM_CTX *ctx, const unsigned char *key, size_t keylen)); +PROV_CIPHER_FUNC(int, GCM_setiv, (PROV_GCM_CTX *dat, const unsigned char *iv, size_t ivlen)); +PROV_CIPHER_FUNC(int, GCM_aadupdate, (PROV_GCM_CTX *ctx, const unsigned char *aad, size_t aadlen)); +PROV_CIPHER_FUNC(int, GCM_cipherupdate, (PROV_GCM_CTX *ctx, const unsigned char *in, size_t len, unsigned char *out)); +PROV_CIPHER_FUNC(int, GCM_cipherfinal, (PROV_GCM_CTX *ctx, unsigned char *tag)); +PROV_CIPHER_FUNC(int, GCM_oneshot, (PROV_GCM_CTX *ctx, unsigned char *aad, size_t aad_len, const unsigned char *in, size_t in_len, unsigned char *out, unsigned char *tag, size_t taglen)); struct prov_gcm_hw_st { OSSL_GCM_setkey_fn setkey; OSSL_GCM_setiv_fn setiv; diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 04427e24f3c..6a3b14975ce 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -4392,7 +4392,7 @@ long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp)(void)) switch (cmd) { #if !defined(OPENSSL_NO_DEPRECATED_3_0) case SSL_CTRL_SET_TMP_DH_CB: - sc->cert->dh_tmp_cb = (DH * (*)(SSL *, int, int)) fp; + sc->cert->dh_tmp_cb = (DH *(*)(SSL *, int, int))fp; ret = 1; break; #endif @@ -4663,7 +4663,7 @@ long ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void)) switch (cmd) { #if !defined(OPENSSL_NO_DEPRECATED_3_0) case SSL_CTRL_SET_TMP_DH_CB: { - ctx->cert->dh_tmp_cb = (DH * (*)(SSL *, int, int)) fp; + ctx->cert->dh_tmp_cb = (DH *(*)(SSL *, int, int))fp; } break; #endif case SSL_CTRL_SET_TLSEXT_SERVERNAME_CB: