build: use pkg-config for i18n

[exim.git] / src / src / tlscert-openssl.c

diff --git a/src/src/tlscert-openssl.c b/src/src/tlscert-openssl.c
index abe34966b120d96c1fd7c17a7a300d1fc05d7a07..d4b9de359191bdb28d9d8176535362803a67e5fa 100644 (file)
--- a/src/src/tlscert-openssl.c
+++ b/src/src/tlscert-openssl.c
@@ -2,7 +2,9 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

+/* Copyright (c) The Exim Maintainers 2022 - 2023 */

 /* Copyright (c) Jeremy Harris 2014 - 2019 */
 /* Copyright (c) Jeremy Harris 2014 - 2019 */

+/* SPDX-License-Identifier: GPL-2.0-or-later */

 
 /* This module provides TLS (aka SSL) support for Exim using the OpenSSL
 library. It is #included into the tls.c file when that library is used.
 
 /* This module provides TLS (aka SSL) support for Exim using the OpenSSL
 library. It is #included into the tls.c file when that library is used.


@@ -260,11 +262,19 @@ if (X509_print_ex(bp, (X509 *)cert, 0,
   X509_FLAG_NO_AUX) == 1)
   {
   long len = BIO_get_mem_data(bp, &cp);
   X509_FLAG_NO_AUX) == 1)
   {
   long len = BIO_get_mem_data(bp, &cp);

+  gstring * g = NULL;

 
   /* Strip leading "Signature Algorithm" line */
   while (*cp && *cp != '\n') { cp++; len--; }
 
   /* Strip leading "Signature Algorithm" line */
   while (*cp && *cp != '\n') { cp++; len--; }

+  if (*cp) { cp++; len--; }

 
 

-  cp = string_copyn(cp+1, len-1);
+  /* Strip possible leading "    Signature Value:\n" (seen with OpenSSL 3.0.5) */
+  if (Ustrncmp(cp, "    Signature Value:\n", 21) == 0) { cp += 21; len -= 21; }
+
+  /* Copy only hexchars and colon (different OpenSSL versions do different spacing) */
+  for ( ; len-- && *cp; cp++)
+    if (Ustrchr("0123456789abcdef:", *cp)) g = string_catn(g, cp, 1);
+  cp = string_from_gstring(g);

   }
 BIO_free(bp);
 return cp;
   }
 BIO_free(bp);
 return cp;


@@ -401,8 +411,9 @@ while (sk_GENERAL_NAME_num(san) > 0)
     ele = string_copyn(ele, len);
 
   if (Ustrlen(ele) == len)     /* ignore any with embedded nul */
     ele = string_copyn(ele, len);
 
   if (Ustrlen(ele) == len)     /* ignore any with embedded nul */

-    list = string_append_listele(list, osep,
-         match == -1 ? string_sprintf("%s=%s", tag, ele) : ele);
+    list = match == -1
+      ? string_append_listele_fmt(list, osep, TRUE, "%s=%s", tag, ele)
+      : string_append_listele(list, osep, ele);

   }
 
 sk_GENERAL_NAME_free(san);
   }
 
 sk_GENERAL_NAME_free(san);