diff options
| author | Dimitri Staessens <dimitri@ouroboros.rocks> | 2026-08-29 16:12:44 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander@ouroboros.rocks> | 2026-08-31 08:31:46 +0200 |
| commit | 596bb667d49ff0bc89c8d0b8011a6f7bdba26f75 (patch) | |
| tree | 2c02a17f69664171d3b1258fdaeac8e0ba684f34 /src | |
| parent | 11026b06dca0fc886d20e79eff0162b42fec3f8f (diff) | |
| download | ouroboros-596bb667d49ff0bc89c8d0b8011a6f7bdba26f75.tar.gz ouroboros-596bb667d49ff0bc89c8d0b8011a6f7bdba26f75.zip | |
lib: Fix build against OpenSSL 4.1
X509_get_subject_name() and X509_NAME_ENTRY_get_data() return const
pointers in OpenSSL >= 4.1.
ASN1_STRING_length() is deprecated in 4.1 in favour of
ASN1_STRING_get_length(), which returns size_t rather than int.
Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/config.h.in | 1 | ||||
| -rw-r--r-- | src/lib/crypt/openssl.c | 27 |
2 files changed, 22 insertions, 6 deletions
diff --git a/src/lib/config.h.in b/src/lib/config.h.in index 62925a48..38d6f768 100644 --- a/src/lib/config.h.in +++ b/src/lib/config.h.in @@ -35,6 +35,7 @@ #ifdef HAVE_OPENSSL #cmakedefine HAVE_ML #cmakedefine HAVE_SLH +#cmakedefine HAVE_OPENSSL_4_1 #define HAVE_ENCRYPTION #define SECMEM_MINSIZE @SECMEM_MINSIZE@ #endif diff --git a/src/lib/crypt/openssl.c b/src/lib/crypt/openssl.c index 8ec3b40f..1ee2318e 100644 --- a/src/lib/crypt/openssl.c +++ b/src/lib/crypt/openssl.c @@ -48,6 +48,7 @@ #include <openssl/x509_vfy.h> #include <assert.h> +#include <limits.h> #include <stdio.h> #define IS_EC_GROUP(str) (strcmp(str, "EC") == 0) @@ -1608,12 +1609,26 @@ void openssl_free_key(EVP_PKEY * key) EVP_PKEY_free(key); } +/* ASN1_STRING_length is deprecated in OpenSSL 4.1, and returns size_t */ +static int ossl_asn1_str_len(const ASN1_STRING * val) +{ +#ifdef HAVE_OPENSSL_4_1 + size_t len; + + len = ASN1_STRING_get_length(val); + + return len > INT_MAX ? -1 : (int) len; +#else + return ASN1_STRING_length(val); +#endif +} + int openssl_check_crt_name(void * crt, const char * name) { const unsigned char * cn; - ASN1_STRING * val; - X509_NAME * nm; + const ASN1_STRING * val; + const X509_NAME * nm; int idx; int len; @@ -1627,7 +1642,7 @@ int openssl_check_crt_name(void * crt, val = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(nm, idx)); cn = ASN1_STRING_get0_data(val); - len = ASN1_STRING_length(val); + len = ossl_asn1_str_len(val); if (len < 0 || (size_t) len != strlen(name)) return -1; @@ -1645,8 +1660,8 @@ int openssl_get_crt_name(void * crt, char * name) { const unsigned char * cn; - ASN1_STRING * val; - X509_NAME * nm; + const ASN1_STRING * val; + const X509_NAME * nm; int idx; int len; @@ -1660,7 +1675,7 @@ int openssl_get_crt_name(void * crt, val = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(nm, idx)); cn = ASN1_STRING_get0_data(val); - len = ASN1_STRING_length(val); + len = ossl_asn1_str_len(val); if (len < 0) return -1; |