x509: when writing fields known to be in UTF-8 form convert to NFCtmp-uninorm-everywhere

This ensures that we always write proper UTF-8 data, uniquely encoded.

1 files changed, 3 insertions, 1 deletions

diff --git a/lib/str.h b/lib/str.h
index 4e497b630a..780245b733 100644
--- a/lib/str.h
+++ b/lib/str.h
@@ -38,8 +38,10 @@
 
 #if defined(HAVE_LIBUNISTRING)
 uint8_t *_gnutls_normalize_u8_password(const uint8_t *password);
+uint8_t *_gnutls_normalize_u8_nfc(const uint8_t *str, size_t str_size);
 #else
-# define _gnutls_normalize_u8_password(password) ((uint8_t*)strdup((char*)password))
+# define _gnutls_normalize_u8_password(password) ((uint8_t*)gnutls_strdup((char*)password))
+# define _gnutls_normalize_u8_nfc(str, str_size) ((uint8_t*)gnutls_strdup((char*)str))
 #endif
 
 void _gnutls_str_cpy(char *dest, size_t dest_tot_size, const char *src);