1. openvpn
  2. Commit 38f2cedc60258d0dcb340873faa12e1de594e3c8
Browse code

ssl_verify: Change backend_x509_* functions to size_t for lengths

Fix conversion warnings without actual code changes.

Change-Id: If971006b6d3a1a93d87b29627d91dd72faf5ceb2
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1138
Message-Id: <20250922204329.23460-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg33152.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>

Frank Lichtenheld authored on 2025/09/23 05:43:23
Showing 3 changed files
src/openvpn/ssl_verify_backend.h
History View file @ 38f2ced
... ... 
@@ -123,7 +123,7 @@ struct buffer x509_get_sha256_fingerprint(openvpn_x509_cert_t *cert, struct gc_a
123 123 
  *
124 124 
  * @return              \c FAILURE, \c or SUCCESS
125 125 
  */
126 
-result_t backend_x509_get_username(char *common_name, int cn_len, char *x509_username_field,
126 
+result_t backend_x509_get_username(char *common_name, size_t cn_len, char *x509_username_field,
127 127 
                                    openvpn_x509_cert_t *peer_cert);
128 128
129 129 
 #ifdef ENABLE_X509ALTUSERNAME
src/openvpn/ssl_verify_mbedtls.c
History View file @ 38f2ced
... ... 
@@ -128,7 +128,7 @@ verify_callback(void *session_obj, mbedtls_x509_crt *cert, int cert_depth, uint3
128 128 
 #endif
129 129
130 130 
 result_t
131 
-backend_x509_get_username(char *cn, int cn_len, char *x509_username_field, mbedtls_x509_crt *cert)
131 
+backend_x509_get_username(char *cn, size_t cn_len, char *x509_username_field, mbedtls_x509_crt *cert)
132 132 
 {
133 133 
     mbedtls_x509_name *name;
134 134
src/openvpn/ssl_verify_openssl.c
History View file @ 38f2ced
... ... 
@@ -120,7 +120,7 @@ x509_username_field_ext_supported(const char *fieldname)
120 120 
 }
121 121
122 122 
 static bool
123 
-extract_x509_extension(X509 *cert, char *fieldname, char *out, int size)
123 
+extract_x509_extension(X509 *cert, char *fieldname, char *out, size_t size)
124 124 
 {
125 125 
     bool retval = false;
126 126 
     char *buf = 0;
... ... 
@@ -195,7 +195,7 @@ extract_x509_extension(X509 *cert, char *fieldname, char *out, int size)
195 195 
  * to contain result is grounds for error).
196 196 
  */
197 197 
 static result_t
198 
-extract_x509_field_ssl(X509_NAME *x509, const char *field_name, char *out, int size)
198 
+extract_x509_field_ssl(X509_NAME *x509, const char *field_name, char *out, size_t size)
199 199 
 {
200 200 
     int lastpos = -1;
201 201 
     int tmp = -1;
... ... 
@@ -252,7 +252,7 @@ extract_x509_field_ssl(X509_NAME *x509, const char *field_name, char *out, int s
252 252 
 }
253 253
254 254 
 result_t
255 
-backend_x509_get_username(char *common_name, int cn_len, char *x509_username_field, X509 *peer_cert)
255 
+backend_x509_get_username(char *common_name, size_t cn_len, char *x509_username_field, X509 *peer_cert)
256 256 
 {
257 257 
 #ifdef ENABLE_X509ALTUSERNAME
258 258 
     if (strncmp("ext:", x509_username_field, 4) == 0)