Commit 2cf976b946 for openssl.org
commit 2cf976b9465ef8b14e47b18a0e6438e1b5f737eb
Author: Pauli <paul.dale@oracle.com>
Date: Tue Sep 8 09:22:41 2026 +1000
capabilities: fix some type errors in the TLS capabilities definitions
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Mounir Idrassi <mounir.idrassi@idrix.fr>
Merge-date: Thu Sep 10 04:12:25 2026
Merged-from: https://github.com/openssl/openssl/pull/32732
diff --git a/providers/common/capabilities.c b/providers/common/capabilities.c
index 33dea6deea..1f281695f9 100644
--- a/providers/common/capabilities.c
+++ b/providers/common/capabilities.c
@@ -33,7 +33,7 @@ typedef struct tls_group_constants_st {
int maxtls; /* Maximum TLS version (or 0 for undefined) */
int mindtls; /* Minimum DTLS version, -1 unsupported */
int maxdtls; /* Maximum DTLS version (or 0 for undefined) */
- int is_kem; /* Indicates utility as KEM */
+ unsigned int is_kem; /* Indicates utility as KEM */
} TLS_GROUP_CONSTANTS;
/*
@@ -112,14 +112,14 @@ static const TLS_GROUP_CONSTANTS group_list[] = {
OSSL_PARAM_uint(OSSL_CAPABILITY_TLS_GROUP_SECURITY_BITS, \
(unsigned int *)&group_list[idx].secbits), \
OSSL_PARAM_int(OSSL_CAPABILITY_TLS_GROUP_MIN_TLS, \
- (unsigned int *)&group_list[idx].mintls), \
+ (int *)&group_list[idx].mintls), \
OSSL_PARAM_int(OSSL_CAPABILITY_TLS_GROUP_MAX_TLS, \
- (unsigned int *)&group_list[idx].maxtls), \
+ (int *)&group_list[idx].maxtls), \
OSSL_PARAM_int(OSSL_CAPABILITY_TLS_GROUP_MIN_DTLS, \
- (unsigned int *)&group_list[idx].mindtls), \
+ (int *)&group_list[idx].mindtls), \
OSSL_PARAM_int(OSSL_CAPABILITY_TLS_GROUP_MAX_DTLS, \
- (unsigned int *)&group_list[idx].maxdtls), \
- OSSL_PARAM_int(OSSL_CAPABILITY_TLS_GROUP_IS_KEM, \
+ (int *)&group_list[idx].maxdtls), \
+ OSSL_PARAM_uint(OSSL_CAPABILITY_TLS_GROUP_IS_KEM, \
(unsigned int *)&group_list[idx].is_kem), \
OSSL_PARAM_END \
}
@@ -325,13 +325,13 @@ static const TLS_SIGALG_CONSTANTS sigalg_constants_list[] = {
OSSL_PARAM_uint(OSSL_CAPABILITY_TLS_SIGALG_SECURITY_BITS, \
(unsigned int *)&sigalg_constants_list[idx].sec_bits), \
OSSL_PARAM_int(OSSL_CAPABILITY_TLS_SIGALG_MIN_TLS, \
- (unsigned int *)&sigalg_constants_list[idx].min_tls), \
+ (int *)&sigalg_constants_list[idx].min_tls), \
OSSL_PARAM_int(OSSL_CAPABILITY_TLS_SIGALG_MAX_TLS, \
- (unsigned int *)&sigalg_constants_list[idx].max_tls), \
+ (int *)&sigalg_constants_list[idx].max_tls), \
OSSL_PARAM_int(OSSL_CAPABILITY_TLS_SIGALG_MIN_DTLS, \
- (unsigned int *)&sigalg_constants_list[idx].min_dtls), \
+ (int *)&sigalg_constants_list[idx].min_dtls), \
OSSL_PARAM_int(OSSL_CAPABILITY_TLS_SIGALG_MAX_DTLS, \
- (unsigned int *)&sigalg_constants_list[idx].max_dtls), \
+ (int *)&sigalg_constants_list[idx].max_dtls), \
OSSL_PARAM_END \
}